From fc4f8786cbc684bda0937fa54fbb3db569b537fc Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Fri, 13 Oct 2023 11:53:47 +0800
Subject: [PATCH] fix:秒级数据调整补充提交
---
screen-common/src/main/java/com/moral/util/DateUtils.java | 2 +-
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/screen-common/src/main/java/com/moral/util/DateUtils.java b/screen-common/src/main/java/com/moral/util/DateUtils.java
index 5a51ae9..9ebd49a 100644
--- a/screen-common/src/main/java/com/moral/util/DateUtils.java
+++ b/screen-common/src/main/java/com/moral/util/DateUtils.java
@@ -291,7 +291,7 @@
}
/**
- * ������dateTimeStr���Date������
+ * ������dateTimeStr���Date������ ������������
*
* @param dateTimeStr
* @return
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 39dba10..11d1d99 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
@@ -90,11 +90,12 @@
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);
+ Date time = DateUtils.dataToTimeStampTime(DateUtils.getDate(time1, DateUtils.yyyy_MM_dd_HH_EN),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<>();
for (GovMonitorPoint govMonitorPoint : govMonitorPoints) {
--
Gitblit v1.8.0