From 4f90163c268bdeb3f8233326f16cf21fe17a24c0 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Tue, 23 Jan 2024 15:55:29 +0800
Subject: [PATCH] chore:疾控中心修改时间问题提交
---
screen-job/src/main/java/com/moral/api/controller/PubController.java | 12 ++++++------
screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java | 8 ++++----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/screen-job/src/main/java/com/moral/api/controller/PubController.java b/screen-job/src/main/java/com/moral/api/controller/PubController.java
index 8e734be..59d40d1 100644
--- a/screen-job/src/main/java/com/moral/api/controller/PubController.java
+++ b/screen-job/src/main/java/com/moral/api/controller/PubController.java
@@ -69,13 +69,13 @@
}
@GetMapping("dateInsertHistoryHourlyJKAvg")
- @ApiOperation(value = "������������", notes = "������������")
- public ResultMessage dateInsertHistoryHourlyJKAvg(String start, String end) {
- String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
-// String start ="2023-11-19 09:00";
+ @ApiOperation(value = "������������������������", notes = "������������������������")
+ public ResultMessage dateInsertHistoryHourlyJKAvg(String start,String end) {
+// String format = DateUtils.yyyy_MM_dd_HH_mm_EN;
+// String start ="2023-11-19 09:00"
// String end ="2023-11-19 10:00";
-// Date start = DateUtils.getDate(s,format);
-// Date end = DateUtils.getDate(s1,format);
+// Date start1 = DateUtils.getDate(start,format);
+// Date end1 = DateUtils.getDate(end,format);
historyHourlyService.dateInsertHistoryHourlyJKAvg(start, end);
return new ResultMessage();
}
diff --git a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
index c508bfa..fb88eaf 100644
--- a/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
+++ b/screen-job/src/main/java/com/moral/api/service/impl/HistoryHourlyServiceImpl.java
@@ -626,9 +626,9 @@
}
//������������������������������
Map<String, Object> params = new HashMap<>();
- Date startTime=null;
- Date endTime=null;
- if (!ObjectUtils.isEmpty(start) || !ObjectUtils.isEmpty(end)){
+ Date startTime;
+ Date endTime;
+ if (!ObjectUtils.isEmpty(start) && !ObjectUtils.isEmpty(end)){
startTime = DateUtils.getDate(start, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
endTime = DateUtils.getDate(end, DateUtils.yyyy_MM_dd_HH_mm_ss_EN);
}else {
@@ -665,7 +665,7 @@
data.forEach((key, value) -> {
Map<String, Object> historyHourly = new HashMap<>();
historyHourly.put("mac", key);
- historyHourly.put("time",start);
+ historyHourly.put("time",startTime);
Map<String, Object> jsonMap = new HashMap<>();
Map<String, Object> map = new HashMap<>();
--
Gitblit v1.8.0