From 3c0ccc88ffa8a651ec78a611ffe75775222ebf07 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 31 Jan 2024 17:05:56 +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/HistoryHourlyServiceImpl.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
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