From 661e56eb85e3bd0e35e94fca2d2ec59e77772da5 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 01 Feb 2024 15:30:57 +0800
Subject: [PATCH] fix:补充提交
---
screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java | 2 +
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 53 ++++++++++++++++----------
screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java | 8 +++-
3 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java b/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java
index c3666fd..84bee9b 100644
--- a/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java
+++ b/screen-api/src/main/java/com/moral/api/dto/OnlineRatePageCond.java
@@ -38,6 +38,8 @@
private String endTime;
@ApiModelProperty(value = "������")
private Integer state;
+ @ApiModelProperty(value = "������������")
+ private String hourState;
}
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 f1ae4d1..d6c68c8 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
@@ -557,13 +557,16 @@
long diff = end.getTime() - start.getTime(); //������������
long hour = (diff / nh)+1; //������������������������
-
+ Map<String, List<OnlineRateVo>> collectList=new HashMap<>();
List<OnlineRateVo> OnlineRateVoList = deviceMapper.getLists(onlineRatePageCond.getOrganizationId(),onlineRatePageCond.getState());
if (!ObjectUtils.isEmpty(OnlineRateVoList)){
+ collectList = OnlineRateVoList.stream().collect(Collectors.groupingBy(OnlineRateVo::getHourState));
for (OnlineRateVo onlineRateVo : OnlineRateVoList) {
List<HistoryHourly> valueByMacAndTime = historyHourlyService.getValueByMacAndTime(onlineRateVo.getMac(), start, end);
ArrayList<Date> dates = new ArrayList<>();
+ //������������
ArrayList<Date> dates1 = new ArrayList<>();
+ //������������
ArrayList<Date> dates2 = new ArrayList<>();
ArrayList<Integer> list = new ArrayList<>();
Date start1 = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_HH_EN);
@@ -601,18 +604,30 @@
}
start1 = DateUtils.getDateAddHour(start1,1);
}
- if (!ObjectUtils.isEmpty(dates2)){
- onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
- }
if (!ObjectUtils.isEmpty(dates1)){
- onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+ if (dates1.size()>dates2.size()){
+ onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+ onlineRateVo.setStartTime("-");
+ onlineRateVo.setHourState("0");
+ }else {
+ onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
+ onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+ onlineRateVo.setHourState("1");
+ }
+ }else {
+ onlineRateVo.setHourState("1");
}
-// it.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+// if (!ObjectUtils.isEmpty(dates2)){
+// onlineRateVo.setStartTime(DateUtils.dateToDateString(dates2.get(dates2.size()-1)));
+// }
+// if (!ObjectUtils.isEmpty(dates1)){
+// onlineRateVo.setEndTime(DateUtils.dateToDateString(dates1.get(dates1.size()-1)));
+// }
onlineRateVo.setNum(dates1.size()+"");
onlineRateVo.setOnlineTime(collects.size());
double number = (double) collects.size() / hour * 100;
String result = String.format("%.2f", number);
- onlineRateVo.setOnlineRate(result+"%");
+ onlineRateVo.setOnlineRate(result);
}
}
@@ -670,7 +685,8 @@
}
});
}*/
- return OnlineRateVoList;
+
+ return ObjectUtils.isEmpty(onlineRatePageCond.getHourState())?OnlineRateVoList:collectList.get(onlineRatePageCond.getHourState());
}
/**
@@ -757,13 +773,7 @@
}
}
-// if (!ObjectUtils.isEmpty(StartDates)){
-// long l = EndDates.get(i).getTime() - StartDates.get(i).getTime();
-// onlineRateLogsForm.setMun(Long.toString(l/nh));
-// StartDates.remove(i);
-// }else {
-// onlineRateLogsForm.setMun("-");
-// }
+
onlineRateLogsForm.setDate("������");
OrfList.add(onlineRateLogsForm);
}
@@ -785,7 +795,8 @@
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("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+(result.equals("NaN")?"0":result));
+ rsMap.put("sum",map.size());
} else if (type.equals("day")){
Date start = DateUtils.getDate(startTime, DateUtils.yyyy_MM_dd_EN);
@@ -868,7 +879,8 @@
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("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);
@@ -944,11 +956,12 @@
rsMap.put("tabulation",OrfList);
//���������������
int endNumber = map.size() - dates.size();
- double number = (double) dates.size() / map.size() * 100;
- String result = String.format("%.2f", number);
+// 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("code","���"+map.size()+"���������"+"������"+dates.size()+"���������"+"���������"+(result.equals("NaN")?"0":result));
+ rsMap.put("sum",map.size());
}
return rsMap;
}
diff --git a/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java b/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java
index 71bf08d..679e941 100644
--- a/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java
+++ b/screen-api/src/main/java/com/moral/api/vo/OnlineRateVo.java
@@ -41,9 +41,13 @@
@ApiModelProperty(value = "������")
private String state;
+ private String hourState;
+
private String mac;
-
+ public String getHourState(){
+ return Objects.isNull(this.hourState)?"0":this.hourState;
+ }
public String getEndTime(){
return Objects.isNull(this.endTime)?"-":this.endTime;
@@ -57,7 +61,7 @@
}
public String getOnlineRate(){
- return Objects.isNull(this.onlineRate)?"0%":this.onlineRate;
+ return Objects.isNull(this.onlineRate)?"0":this.onlineRate;
}
public Integer getOnlineTime(){
--
Gitblit v1.8.0