From 04b45b8c22594cc5535b164380738a80b0e8cbe2 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 26 五月 2025 15:27:57 +0800
Subject: [PATCH] 修改大屏录像可用率指标
---
ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
index cf0a2d3..eb34546 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorRegistrationCalculation.java
@@ -43,21 +43,25 @@
//鍏ㄥ勾鐣欏瓨鏁�
int allFiles = 0;
}
- //TODO:鏀逛负MonitorQualifyResult
@Override
public void calculate(List<MonitorQualifyResult> list) {
//鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
- Map<String, MonitorRegistrationCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ Map<String, MonitorRegistrationCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.TRUE);
if (areaStatsMap == null) return;
//鏌ユ暟鎹簱琛ュ厖鍏ㄥ勾鐣欏瓨鏁�
List<TMonitorVO> monitorVOS = monitorMapper.selectMonitorVOList();
areaStatsMap.forEach((key,areaStats)->{
if(key.startsWith(ApiConstants.Province)){
- long count = monitorVOS.stream().filter(vo -> ApiConstants.TRUE.equals(vo.getProvinceTag()))
+ long count = monitorVOS.stream().filter(TMonitorVO::getProvinceTag)
.filter(vo -> key.split("_")[1].equals(vo.getDeptId() + "")).count();
areaStats.allFiles = Integer.parseInt(count+"");
- }else {
+ }else if(key.startsWith(ApiConstants.Dept)){
+ long count = monitorVOS.stream().filter(TMonitorVO::getDeptTag)
+ .filter(vo -> key.split("_")[1].equals(vo.getDeptId() + "")).count();
+ areaStats.allFiles = Integer.parseInt(count+"");
+ }
+ else {
long count = monitorVOS.stream().filter(vo -> key.equals(vo.getDeptId() + "")).count();
areaStats.allFiles = Integer.parseInt(count+"");
}
--
Gitblit v1.8.0