From 1aa2a59a237dbc4c58a5e3d09be2bfeaf1535c8b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 31 八月 2024 21:26:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 27 ++++++++++++++++++++-------
1 files changed, 20 insertions(+), 7 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
index b169a11..592a0e8 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -49,6 +49,8 @@
int usabilitySites = 0;
int importantSites = 0;
int importantUsabilitySites = 0;
+ int deptSite =0;
+ int depteUsabilitySites = 0;
}
@Override
@@ -65,19 +67,19 @@
List<String> provinceIds = getProvince();
//閲嶇偣鐐逛綅闆嗗悎
List<String> important = getImportant();
-
+ List<String> deptTag = getDeptTag();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (RecordMetaDSumResult result : list) {
TMonitorVO monitor = monitorMap.get(result.getDeviceId());
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result, important);
+ updateAreaStats(areaStatsMap, deptId, result, important,deptTag);
// 澶勭悊鐪佸巺鏁版嵁
if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, important);
+ updateAreaStats(areaStatsMap, provinceKey, result, important,deptTag);
}
}
@@ -99,18 +101,23 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result, List<String> important) {
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result, List<String> important,List<String> deptTag) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- boolean flag = important.contains(result.getDeviceId());
- if(flag){
+ if(important.contains(result.getDeviceId())){
stats.importantSites++;
+ }
+ if(deptTag.contains(result.getDeviceId())){
+ stats.deptSite++;
}
if (ApiConstants.UY_RecordStatus_Integrity.equals(result.getRecordStatus())){
stats.usabilitySites++;
- if(flag){
+ if(important.contains(result.getDeviceId())){
stats.importantUsabilitySites++;
+ }
+ if(deptTag.contains(result.getDeviceId())){
+ stats.depteUsabilitySites++;
}
}
}
@@ -135,6 +142,12 @@
importantParam.put("usabilitySites", stats.importantUsabilitySites);
BigDecimal importantVideoUsability = videoUsability(importantParam);
checkIndexVideo.setKeyVideoAvailable(importantVideoUsability);
+ //璋冪敤褰曞儚鍙敤鐜囪绠楁柟娉� 璁＄畻閮ㄧ骇褰曞儚鍙敤鐜�
+ Map<String, Object> deptParam = new HashMap<>();
+ deptParam.put("totalSites", stats.deptSite);
+ deptParam.put("usabilitySites", stats.depteUsabilitySites);
+ BigDecimal deptUseability = videoUsability(deptParam);
+ checkIndexVideo.setMinistryVideoAvailable(deptUseability);
return checkIndexVideo;
}
}
--
Gitblit v1.8.0