From ab8c0e45bc0de2a8aa882051e2fa29d016a6cdd4 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Wed, 26 Jul 2023 21:33:33 +0800
Subject: [PATCH] chore:测试提交
---
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..e092f70 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;
@@ -72,6 +73,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(DateUtils.addHours(time, -1), 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,9 +194,14 @@
//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