From 1b45197a985684d930ee2ca58635d89bae6b6da8 Mon Sep 17 00:00:00 2001
From: cjl <chenjl@deyt.cn>
Date: Sat, 08 Jul 2023 20:05:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into cjl
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 6 +++---
1 files changed, 3 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 5287e1c..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
@@ -72,8 +72,8 @@
//������������������������������������������
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);
+ 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<>();
@@ -199,10 +199,10 @@
}
}
- //���������������
if (ObjectUtils.isEmpty(historyAqis)){
XxlJobHelper.log("���������������");
}
+ //���������������
historyAqiMapper.insertHistoryAqi(historyAqis);
}
--
Gitblit v1.8.0