From 373c036205c6d8ac3871857da7b3c7a44e384086 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 30 Aug 2023 16:22:13 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-job/src/main/java/com/moral/api/service/impl/HistoryAqiServiceImpl.java | 6 ++++--
1 files changed, 4 insertions(+), 2 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 911ba63..008249f 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
@@ -87,8 +87,10 @@
QueryWrapper<GovMonitorPoint> queryWrapper = new QueryWrapper<>();
queryWrapper.select("guid").eq("is_delete", Constants.NOT_DELETE);
//������������������������������������������
+ String time1 = "2023-08-27 17:50:00";
+
List<GovMonitorPoint> govMonitorPoints = govMonitorPointService.list(queryWrapper);
- Date time = DateUtils.dataToTimeStampTime(new Date(), DateUtils.yyyy_MM_dd_HH_EN);
+ 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);
@@ -220,7 +222,7 @@
XxlJobHelper.log("���������������");
}
//���������������
- historyAqiMapper.insertHistoryAqi(historyAqis);
+ // historyAqiMapper.insertHistoryAqi(historyAqis);
}
@Override
--
Gitblit v1.8.0