From b8e97933ddcffb65754a82b9993e3a37097cc2d2 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 29 Feb 2024 10:02:27 +0800
Subject: [PATCH] fix:手持设备接口提交
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 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 d6c68c8..c4f0ede 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
@@ -560,7 +560,7 @@
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<>();
@@ -685,7 +685,9 @@
}
});
}*/
-
+ if (!ObjectUtils.isEmpty(OnlineRateVoList)){
+ collectList = OnlineRateVoList.stream().collect(Collectors.groupingBy(OnlineRateVo::getHourState));
+ }
return ObjectUtils.isEmpty(onlineRatePageCond.getHourState())?OnlineRateVoList:collectList.get(onlineRatePageCond.getHourState());
}
@@ -967,6 +969,26 @@
}
@Override
+ public Map<String,Object> getStart(Integer organizationId) {
+ HashMap<String, Object> map = new HashMap<>();
+ List<OnlineRateVo> lists = deviceMapper.getLists(organizationId, null);
+ 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;
+ //������
+ map.put("sum",lists.size());
+ //������
+ map.put("online",i);
+ double number = (double) i / size1 * 100;
+ String result = String.format("%.2f", number);
+ map.put("onlineRate",result);
+ }
+ return map;
+ }
+
+ @Override
public Map<String, Object> detailV1(String mac, String startTime, String endTime, String type) {
HashMap<String, Object> rsMap = new HashMap<>();
Map<String, Object> map = new TreeMap<>(
--
Gitblit v1.8.0