From ac670fcaf071f52ac886a4e52edb7c37d9f5d4fe Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Tue, 20 Oct 2020 13:27:24 +0800
Subject: [PATCH] 修改获取六参五分钟平均值bug
---
src/main/java/com/moral/controller/WebController.java | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index a6fe5fe..4ce9009 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -22,6 +22,7 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -256,6 +257,21 @@
parameters.put("yearAndMonth",yearAndMonth);
parameters.put("macs",macs);
List<Map<String, Object>> datas = historyMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
+
+ //������������������������������������������������������������������������������
+ if(ObjectUtils.isEmpty(datas)){
+ try {
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date date = sdf.parse(time);
+ date = DateUtil.rollMinute(date, -5);
+ time = sdf.format(date);
+ parameters.put("time",time);
+ datas = historyMinutelyService.getFiveMinutesDataByMacsAndTime(parameters);
+ } catch (ParseException e) {
+ e.printStackTrace();
+ }
+
+ }
datas = insertDeviceInfo(datas,devices);
return new ResultBean<List<Map<String, Object>>>(datas);
--
Gitblit v1.8.0