From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 71 +++++++++++++----------------------
1 files changed, 26 insertions(+), 45 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..d2428b6 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -1,21 +1,14 @@
package com.ycl.calculate;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.domain.entity.CheckIndexVideo;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
-import com.ycl.platform.domain.result.UY.QueryVqdResult;
import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
-import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexVideoMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexVideoService;
-import com.ycl.platform.service.ITMonitorService;
import constant.ApiConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
import utils.DateUtils;
import java.math.BigDecimal;
@@ -23,8 +16,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 璁＄畻瑙嗛璁惧褰曞儚鍙敤鐜�
@@ -35,7 +26,7 @@
*/
@Component
@Slf4j
-public class VideoUsabilityCalculation extends IndexCalculationServe implements CalculationStrategy<RecordMetaDSumResult> {
+public class VideoUsabilityCalculation extends IndexCalculationServe<RecordMetaDSumResult, VideoUsabilityCalculation.AreaStats> implements CalculationStrategy<RecordMetaDSumResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
@Autowired
@@ -43,43 +34,21 @@
@Autowired
private ICheckIndexVideoService checkIndexVideoService;
- //鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
- private static class AreaStats {
+ //鍖哄煙褰曞儚鍙敤鐜囩殑鍐呴儴绫�
+ protected static class AreaStats {
int totalSites = 0;
int usabilitySites = 0;
int importantSites = 0;
int importantUsabilitySites = 0;
+ int deptSite =0;
+ int depteUsabilitySites = 0;
}
@Override
public void calculate(List<RecordMetaDSumResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- log.info("鏁版嵁涓虹┖");
- return;
- }
-
- //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(RecordMetaDSumResult::getDeviceId).collect(Collectors.toList()))
- .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
- //閲嶇偣鐐逛綅闆嗗悎
- List<String> important = getImportant();
-
- 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);
-
- // 澶勭悊鐪佸巺鏁版嵁
- if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, important);
- }
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, VideoUsabilityCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.TRUE);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexVideo> checkIndexVideoList = checkIndexVideoMapper.selectToday(DateUtils.getDate());
@@ -92,31 +61,37 @@
}
}
});
-
+ log.error("鐢熸垚浠婃棩褰曞儚鎸囨爣鏁版嵁{}",checkIndexVideos);
checkIndexVideoService.saveOrUpdateBatch(checkIndexVideos);
}
/**
* 绱鎬荤偣浣嶆暟銆佸湪绾跨偣浣嶆暟銆侀噸鐐圭偣浣嶆暟銆侀噸鐐圭偣浣嶅湪绾挎暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result, List<String> important) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, RecordMetaDSumResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- boolean flag = important.contains(result.getDeviceId());
- if(flag){
+ if(result.getImportantTag()!=null && result.getImportantTag()){
stats.importantSites++;
+ }
+ if(result.getDeptTag()!=null && result.getDeptTag()){
+ stats.deptSite++;
}
if (ApiConstants.UY_RecordStatus_Integrity.equals(result.getRecordStatus())){
stats.usabilitySites++;
- if(flag){
+ if(result.getImportantTag()!=null && result.getImportantTag()){
stats.importantUsabilitySites++;
+ }
+ if(result.getDeptTag()!=null && result.getDeptTag()){
+ stats.depteUsabilitySites++;
}
}
}
/**
- * 瑙嗛鐐逛綅鍦ㄧ嚎鐜�
+ * 瑙嗛褰曞儚鍙敤鐜�
*/
private CheckIndexVideo createOrUpdateCheckIndexVideo(String key, AreaStats stats, List<CheckIndexVideo> checkIndexVideoList) {
CheckIndexVideo checkIndexVideo = getCheckIndex(key, checkIndexVideoList, CheckIndexVideo.class);
@@ -135,6 +110,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