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/MonitorQualifyCalculation.java | 68 +++++-----------------------------
1 files changed, 10 insertions(+), 58 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
index 484ae15..0ccc36b 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/MonitorQualifyCalculation.java
@@ -2,15 +2,11 @@
import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
-import com.ycl.platform.domain.result.UY.QueryVqdResult;
-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 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;
@@ -18,8 +14,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 璁＄畻涓�鏈轰竴妗ｅ悎鏍肩巼
@@ -28,16 +22,15 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class MonitorQualifyCalculation extends IndexCalculationServe implements CalculationStrategy<MonitorQualifyResult> {
+@Slf4j
+public class MonitorQualifyCalculation extends IndexCalculationServe<MonitorQualifyResult, MonitorQualifyCalculation.AreaStats> implements CalculationStrategy<MonitorQualifyResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
- @Autowired
- private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexVideoService checkIndexVideoService;
//鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
- private static class AreaStats {
+ protected static class AreaStats {
//鎬绘。妗堟暟
int totalMonitors = 0;
//鍚堟牸妗ｆ鏁�
@@ -46,30 +39,9 @@
@Override
public void calculate(List<MonitorQualifyResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- return;
- }
-
- //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(result -> result.getSerialNumber().getValue()).collect(Collectors.toList()))
- .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
-
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
- for (MonitorQualifyResult result : list) {
- TMonitorVO monitor = monitorMap.get(result.getSerialNumber().getValue());
- if (monitor == null) continue;
-
- String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result);
-
- // 澶勭悊鐪佸巺鏁版嵁
- if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result);
- }
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, MonitorQualifyCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.TRUE);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexVideo> checkIndexVideoList = checkIndexVideoMapper.selectToday(DateUtils.getDate());
@@ -89,34 +61,14 @@
/**
* 绱鎬绘。妗堟暟鍜屽悎鏍兼。妗堟暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitorQualifyResult result) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitorQualifyResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalMonitors++;
- if (result != null && correct(result)){
+ if (result != null && MonitorQualifyResult.correct(result)){
stats.qualifyMonitor++;
}
- }
- //鍏ㄥ杩攖ure
- private boolean correct(MonitorQualifyResult result) {
- return checkError(result.getName()) &&
- checkError(result.getCivilCode()) &&
- checkError(result.getIp()) &&
- checkError(result.getSerialNumber()) &&
- checkError(result.getMacdz()) &&
- checkError(result.getLatitude()) &&
- checkError(result.getLongitude()) &&
- checkError(result.getSbzt()) &&
- checkError(result.getSxjcjqy()) &&
- checkError(result.getSxjgnlx()) &&
- checkError(result.getJkdwlx()) &&
- checkError(result.getIntegrated_device())
- ;
- }
-
- //妫�鏌ユ寚鏍囷紝姝ｅ父杩斿洖true
- private boolean checkError(MonitorQualifyResult.QualifyResult result) {
- return result.getError() != null && !result.getError();
}
/**
--
Gitblit v1.8.0