From a511a9684d3b928c1afcda2f95f8184419ddeb51 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Tue, 05 Sep 2023 09:39:42 +0800
Subject: [PATCH] fix:job补偿修复
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 21 ++++++---------------
screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java | 2 +-
2 files changed, 7 insertions(+), 16 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java b/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
index 1ddb7b6..a943310 100644
--- a/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
+++ b/screen-job/src/main/java/com/moral/api/service/HistoryAqiService.java
@@ -8,7 +8,7 @@
public interface HistoryAqiService extends IService<HistoryAqi> {
//aqi������������������������
- void insertHistoryAqi();
+ void insertHistoryAqi(String time1);
HistoryAqi getHistoryApiByTimeAndGuid(String guid,String time);
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 008249f..39dba10 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
@@ -77,7 +77,7 @@
//���������aqi���������������������������������������������������������API--���������������
@Override
@Transactional
- public void insertHistoryAqi() {
+ public void insertHistoryAqi(String dateTime) {
//���������������
HttpHeaders headers = new HttpHeaders();
headers.set("Authorization", "APPCODE 31b6ea8f804a4472be3b633cfee44849");
@@ -87,12 +87,13 @@
QueryWrapper<GovMonitorPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE);
//������������������������������������������
- String time1 = "2023-08-27 17:50:00";
+ String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_EN);
List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
Date time = DateUtils.dataToTimeStampTime(DateUtils.convertDate(time1), 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);
+
+ //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<>();
@@ -151,14 +152,8 @@
if (!ObjectUtils.isEmpty(o3)) {
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 {
@@ -177,7 +172,6 @@
historyAqi.setTime(DateUtils.addHours(time, -1));
//���������������
historyAqi.setValue(JSONObject.toJSONString(map));
-
historyAqis.add(historyAqi);
Map<String, Object> value = new HashMap<>();
@@ -210,11 +204,8 @@
if (!ObjectUtils.isEmpty(o3)) {
value.put(Constants.SENSOR_CODE_O3, o3);
}
-
//aqi������������redis
redisTemplate.opsForHash().put(RedisConstants.AQI_DATA, guid, value);
-// historyAqiMapper.insert(historyAqi);
-
}
}
@@ -222,7 +213,7 @@
XxlJobHelper.log("���������������");
}
//���������������
- // historyAqiMapper.insertHistoryAqi(historyAqis);
+ historyAqiMapper.insertHistoryAqi(historyAqis);
}
@Override
--
Gitblit v1.8.0