From 908d89859f2f3cc6adafe2f9982b6c269bacb6ca Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 22 Dec 2022 13:37:15 +0800
Subject: [PATCH] 国控站数据维护问题
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 17 ++++++++++++++---
1 files changed, 14 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 e65bd32..b027508 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
@@ -11,6 +11,7 @@
import com.moral.constant.Constants;
import com.moral.constant.RedisConstants;
import com.moral.util.DateUtils;
+import com.xxl.job.core.context.XxlJobHelper;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -71,6 +72,7 @@
//������������������������������������������
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);
String timeStr = DateUtils.dateToDateString(time, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
List<HistoryAqi> historyAqis = new ArrayList<>();
@@ -96,8 +98,7 @@
historyAqi.setGuid(guid);
historyAqi.setTime(DateUtils.addHours(time, -1));
//���������������
-// historyAqi.setValue(JSONObject.toJSONString(map));
- historyAqi.setJson(JSONObject.toJSONString(map));
+ historyAqi.setValue(JSONObject.toJSONString(map));
historyAqis.add(historyAqi);
@@ -132,8 +133,13 @@
value.put(Constants.SENSOR_CODE_O3, o3);
}
+
//aqi������������redis
redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
+
+// historyAqiMapper.insert(historyAqi);
+
+
}else {
ResponseEntity<String> response;
try {
@@ -151,7 +157,7 @@
historyAqi.setGuid(guid);
historyAqi.setTime(DateUtils.addHours(time, -1));
//���������������
- historyAqi.setJson(JSONObject.toJSONString(map));
+ historyAqi.setValue(JSONObject.toJSONString(map));
historyAqis.add(historyAqi);
@@ -188,10 +194,15 @@
//aqi������������redis
redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
+// historyAqiMapper.insert(historyAqi);
+
}
}
//���������������
+ if (ObjectUtils.isEmpty(historyAqis)){
+ XxlJobHelper.log("���������������");
+ }
historyAqiMapper.insertHistoryAqi(historyAqis);
}
--
Gitblit v1.8.0