From d7b233b6ed1793255adee6ed1e0cbe950e6c7e9f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Wed, 29 Sep 2021 13:30:28 +0800
Subject: [PATCH] 5分钟数据统计bug
---
screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
index 21083f0..1d1f3d6 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
@@ -57,6 +57,8 @@
endTimeStr+=" 23:59:59";
endTime = DateUtils.getDate(endTimeStr,"yyyy-MM-dd HH:mm:ss");
} else {
+ if(startTime!=null&&endTime!=null)
+ return false;
if (reportType.equals(Constants.HOURYLYREPORT)) {
//������������������������������������������
Date previousHour = DateUtils.getDateOfMin(new Date(), -60);
--
Gitblit v1.8.0