From 6992aaf0587c09f7c511c1afd12e1519d91363d3 Mon Sep 17 00:00:00 2001
From: cjl <276999030@qq.com>
Date: Thu, 14 Dec 2023 15:38:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/cjl' into qa
---
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 11d1d99..e05a362 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
@@ -86,16 +86,16 @@
QueryWrapper<GovMonitorPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE);
+ /*//
+ queryWrapper.eq("guid","d0955320-4632-4276-b9e2-959e5ace49b3");*/
//������������������������������������������
- String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_EN);
+ String time1 = StringUtils.isNotEmpty(dateTime)?dateTime:DateUtils.dateToDateString(new Date(),DateUtils.yyyy_MM_dd_HH_EN);
List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
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