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/VideoOnlineCalculation.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
index 1fbc17b..2135fba 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOnlineCalculation.java
@@ -29,7 +29,7 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻瑙嗛璁惧鐐逛綅鍦ㄧ嚎鐜囥�侀噸鐐圭偣浣嶅湪绾跨巼銆侀噸鐐规寚鎸ュ浘鍍忓湪绾跨巼
+ * 璁＄畻瑙嗛璁惧鐐逛綅鍦ㄧ嚎鐜囥�侀噸鐐圭偣浣嶅湪绾跨巼銆侀噸鐐规寚鎸ュ浘鍍忓湪绾跨巼銆侀儴绾х偣浣嶅湪绾跨巼
* 鍥惧儚鐩戞祴璇婃柇缁撴灉
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鏁版嵁涓婁紶鍙婃椂鎬�
@@ -53,6 +53,8 @@
int importantOnlineSites = 0;
int commandSites = 0;
int commandOnlineSites =0;
+ int deptSites = 0;
+ int deptOnlineSites = 0;
}
@Override
@@ -71,6 +73,8 @@
List<String> important = getImportant();
//閲嶇偣鎸囨尌鍥惧儚闆嗗悎
List<String> commandImage = getCommandImage();
+ //鑾峰彇閮ㄧ骇鐐逛綅闆嗗悎
+ List<String> deptTag = getDeptTag();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (VideoOnlineResult result : list) {
@@ -78,12 +82,12 @@
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result, important,commandImage);
+ updateAreaStats(areaStatsMap, deptId, result, important,commandImage,deptTag);
// 澶勭悊鐪佸巺鏁版嵁
if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, important,commandImage);
+ updateAreaStats(areaStatsMap, provinceKey, result, important,commandImage,deptTag);
}
}
@@ -105,7 +109,7 @@
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟銆佹寚鎸ュ浘鍍忔暟銆佹寚鎸ュ浘鍍忓湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VideoOnlineResult result, List<String> important, List<String> commandImage) {
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VideoOnlineResult result, List<String> important, List<String> commandImage,List<String> deptTag) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
@@ -117,6 +121,9 @@
if(commandImage.contains(result.getDeviceId())){
stats.commandSites++;
}
+ if(deptTag.contains(result.getDeviceId())){
+ stats.deptSites++;
+ }
if (ApiConstants.UY_OnlineSite_Online.equals(result.getStatus())){
stats.onlineSites++;
if(important.contains(result.getDeviceId())){
@@ -124,6 +131,9 @@
}
if(commandImage.contains(result.getDeviceId())){
stats.commandOnlineSites++;
+ }
+ if(deptTag.contains(result.getDeviceId())){
+ stats.deptOnlineSites++;
}
}
}
@@ -172,6 +182,16 @@
}else {
log.info("鎸囨尌鍥惧儚鐐逛綅鏁颁负0");
}
+ //璋冪敤鐐逛綅鍦ㄧ嚎鐜囪绠楁柟娉� 璁＄畻閮ㄧ骇鐐逛綅鍦ㄧ嚎鐜�
+ if(stats.deptSites!=0) {
+ Map<String, Object> deptParam = new HashMap<>();
+ deptParam.put("totalSites", stats.deptSites);
+ deptParam.put("onlineSites", stats.deptOnlineSites);
+ BigDecimal deptOnline = siteOnline(deptParam);
+ checkIndexVideo.setMinistrySiteOnline(deptOnline);
+ }else {
+ log.info("閮ㄧ骇鐐逛綅鏁颁负0");
+ }
return checkIndexVideo;
}
}
--
Gitblit v1.8.0