From f3452e172e49eb8b588bec6c81a7e08b458fc4bd Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 22 Apr 2022 09:44:36 +0800
Subject: [PATCH] 企业整顿清单
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 34 +++++++++++++++++++++++++++++++---
1 files changed, 31 insertions(+), 3 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
index 2a0e2c1..2cb03bc 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java
@@ -25,6 +25,7 @@
import org.springframework.util.ObjectUtils;
import org.springframework.web.client.RestTemplate;
+import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -54,6 +55,8 @@
@Autowired
private RedisTemplate redisTemplate;
+
+ //���������aqi���������������������������������������������������������API--���������������
@Override
@Transactional
public void insertHistoryAqi() {
@@ -69,7 +72,11 @@
List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
+
+ List<HistoryAqi> historyAqis = new ArrayList<>();
+
for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
+ HistoryAqi historyAqi = new HistoryAqi();
String guid = govMonitorPoint.getGuid();
ResponseEntity<String> response;
try {
@@ -84,12 +91,12 @@
if (ObjectUtils.isEmpty(map)) {
continue;
}
- HistoryAqi historyAqi = new HistoryAqi();
historyAqi.setGuid(guid);
- historyAqi.setTime(time);
+ historyAqi.setTime(DateUtils.addHours(time, -1));
//���������������
historyAqi.setValue(JSONObject.toJSONString(map));
- historyAqiMapper.insert(historyAqi);
+
+ historyAqis.add(historyAqi);
Map<String, Object> value = new HashMap<>();
Object pm2_5 = map.get("pm2_5");
@@ -125,5 +132,26 @@
//aqi������������redis
redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
}
+ //���������������
+ historyAqiMapper.insertHistoryAqi(historyAqis);
+ }
+
+ @Override
+ public HistoryAqi getHistoryApiByTimeAndGuid(String guid, String time) {
+ QueryWrapper<HistoryAqi> wrapper_historyAqi = new QueryWrapper<>();
+ wrapper_historyAqi.eq("guid", guid).eq("time", time);
+ HistoryAqi historyAqi = new HistoryAqi();
+ if (historyAqiMapper.selectCount(wrapper_historyAqi) == 1) {
+ historyAqi = historyAqiMapper.selectOne(wrapper_historyAqi);
+ }
+ return historyAqi;
+ }
+
+ @Override
+ public List<HistoryAqi> getHistoryAqi() {
+ String time = DateUtils.getDateStringOfHour(-1, DateUtils.yyyy_MM_dd_HH_EN) + ":00:00";
+ QueryWrapper<HistoryAqi> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("time", time);
+ return historyAqiMapper.selectList(queryWrapper);
}
}
--
Gitblit v1.8.0