From 28923b3d67c58b032bc4ff128aa1d5e62d73dba1 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 02 Feb 2024 10:07:58 +0800
Subject: [PATCH] fix:提交实时在线率接口
---
screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java | 20 ++++++++++++++++++++
screen-api/src/main/java/com/moral/api/service/DeviceService.java | 4 ++++
screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java | 9 +++++++++
3 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java b/screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java
index c740dc3..0f52f13 100644
--- a/screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DeviceOnlineRateController.java
@@ -52,4 +52,13 @@
Map<String, Object> detail = deviceService.detail(mac, startTime, endTime, type);
return ResultMessage.ok(detail);
}
+
+
+
+ @GetMapping("state")
+ @ApiOperation("���������������")
+ public ResultMessage state(Integer organizationId){
+ Map<String, Object> start = deviceService.getStart(organizationId);
+ return ResultMessage.ok(start);
+ }
}
diff --git a/screen-api/src/main/java/com/moral/api/service/DeviceService.java b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
index a83e217..fdb62f1 100644
--- a/screen-api/src/main/java/com/moral/api/service/DeviceService.java
+++ b/screen-api/src/main/java/com/moral/api/service/DeviceService.java
@@ -87,5 +87,9 @@
Map<String,Object> detail(String mac,String startTime,String endTime, String type);
+
+ Map<String,Object> getStart(Integer organizationId);
+
+
Map<String,Object> detailV1(String mac,String startTime,String endTime, String type);
}
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 15221e1..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
@@ -969,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