From 1d5d9b98c668145a160bca8cae8a743a370c8f8a Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 05 Feb 2024 09:51:03 +0800
Subject: [PATCH] fix:断线统计补充提交
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 65 ++++++++++++++++++--------------
1 files changed, 37 insertions(+), 28 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
index c4f0ede..2d779fd 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java
@@ -746,11 +746,21 @@
}
}else {
if (flag){
- EndDates.add(start);
- flag=false;
+ Date date = new Date();
+ String dateString = DateUtils.dateToDateString(date, DateUtils.yyyy_MM_dd_HH_EN);
+ Date date1 = DateUtils.getDate(dateString, DateUtils.yyyy_MM_dd_HH_EN);
+ if (!date1.equals(start)){
+ EndDates.add(start);
+ flag=false;
+ }
}
map.put(DateUtils.dateToDateString(start),0);
}
+ start = DateUtils.getDateAddHour(start,1);
+ }
+ }else {
+ while (DateUtils.isTimeBeforE(end,start)){
+ map.put(DateUtils.dateToDateString(start),0);
start = DateUtils.getDateAddHour(start,1);
}
}
@@ -793,11 +803,8 @@
rsMap.put("tabulation",OrfList);
//���������������������
int endNumber = map.size() - dates.size();
- double number = (double) dates.size() / map.size() * 100;
- String result = String.format("%.2f", number);
rsMap.put("pieChart1",endNumber);
rsMap.put("pieChart2",dates.size());
-// rsMap.put("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+(result.equals("NaN")?"0":result));
rsMap.put("sum",map.size());
} else if (type.equals("day")){
@@ -828,7 +835,11 @@
}
map.put(DateUtils.dateToDateString(start),0);
}
-// start = DateUtils.getDateAddHour(start,24);
+ start = DateUtils.getDateOfDay(start,1);
+ }
+ }else {
+ while (DateUtils.isTimeBeforE(end,start)){
+ map.put(DateUtils.dateToDateString(start),0);
start = DateUtils.getDateOfDay(start,1);
}
}
@@ -852,12 +863,6 @@
onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nd)));
}
}
-// if (!ObjectUtils.isEmpty(StartDates)){
-// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
-// onlineRateLogsForm.setMun(Long.toString(l/nd));
-// }else {
-// onlineRateLogsForm.setMun("-");
-// }
onlineRateLogsForm.setDate("���");
OrfList.add(onlineRateLogsForm);
}
@@ -871,21 +876,24 @@
list2.add(Integer.parseInt(map.get(string).toString()));
}
-
rsMap.put("lineChart1",list1);
rsMap.put("lineChart2",list2);
rsMap.put("tabulation",OrfList);
//���������������
int endNumber = map.size() - dates.size();
- double number = (double) dates.size() / map.size() * 100;
- String result = String.format("%.2f", number);
rsMap.put("pieChart1",endNumber);
rsMap.put("pieChart2",dates.size());
-// rsMap.put("code","���"+map.size()+"������"+"������"+dates.size()+"������"+"���������"+(result.equals("NaN")?"0":result));
rsMap.put("sum",map.size());
}else {
Date start = DateUtils.getDate(startTime,DateUtils.yyyy_MM_dd_HH_mm_EN);
Date end = DateUtils.getDate(endTime, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ Date date = new Date();
+ String dateString = DateUtils.dateToDateString(date, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ Date date1 = DateUtils.getDate(dateString, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ if (end.equals(date1)){
+ String dateOfMin = DateUtils.getDateOfMin(dateString, -1, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ end = DateUtils.getDate(dateOfMin, DateUtils.yyyy_MM_dd_HH_mm_EN);
+ }
List<HistoryMinutely> historyMinutelys = historyHourlyService.getHistoryMinutely(mac, start, end);
if (!ObjectUtils.isEmpty(historyMinutelys)){
//������������
@@ -911,7 +919,11 @@
}
map.put(DateUtils.dateToDateString(start),0);
}
-// start = DateUtils.getDateAddHour(start,24);
+ start = DateUtils.getDateOfMin(start,1);
+ }
+ }else {
+ while (DateUtils.isTimeBeforE(end,start)){
+ map.put(DateUtils.dateToDateString(start),0);
start = DateUtils.getDateOfMin(start,1);
}
}
@@ -935,12 +947,6 @@
onlineRateLogsForm.setMun(Long.toString(Math.abs(l/nm)));
}
}
-// if (!ObjectUtils.isEmpty(StartDates)){
-// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
-// onlineRateLogsForm.setMun(Long.toString(l/nm));
-// }else {
-// onlineRateLogsForm.setMun("-");
-// }
onlineRateLogsForm.setDate("������");
OrfList.add(onlineRateLogsForm);
}
@@ -958,11 +964,8 @@
rsMap.put("tabulation",OrfList);
//���������������
int endNumber = map.size() - dates.size();
-// double number = (double) dates.size() / map.size() * 100;
-// String result = String.format("%.2f", number);
rsMap.put("pieChart1",endNumber);
rsMap.put("pieChart2",dates.size());
-// rsMap.put("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+(result.equals("NaN")?"0":result));
rsMap.put("sum",map.size());
}
return rsMap;
@@ -975,8 +978,14 @@
if (!ObjectUtils.isEmpty(lists)){
Map<String, List<OnlineRateVo>> collect = lists.stream().collect(Collectors.groupingBy(OnlineRateVo::getState));
int size1 = lists.size();
- int size = collect.get("0").size();
- int i = size1 - size;
+ List<OnlineRateVo> onlineRateVos = collect.get("0");
+ int i ;
+ if (!ObjectUtils.isEmpty(onlineRateVos)){
+ int size = onlineRateVos.size();
+ i = size1 - size;
+ }else {
+ i= size1;
+ }
//������
map.put("sum",lists.size());
//������
--
Gitblit v1.8.0