From c83101eb62f5d4906b9c01ceea6b21a37f9e84d8 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 18 十一月 2025 09:24:53 +0800
Subject: [PATCH] bug修复
---
ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java | 90 ++++++---------------------------------------
1 files changed, 12 insertions(+), 78 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
index b8e8747..336ee79 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoOsdCalculation.java
@@ -2,27 +2,19 @@
import com.ycl.platform.domain.entity.CheckIndexVideo;
import com.ycl.platform.domain.result.UY.OsdCheckResult;
-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;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
* 璁＄畻瑙嗛璁惧Osd鏍囨敞淇℃伅銆佹椂闂村噯纭俊鎭�
@@ -31,20 +23,15 @@
*/
@Component
@Slf4j
-public class VideoOsdCalculation extends IndexCalculationServe implements CalculationStrategy<OsdCheckResult> {
+public class VideoOsdCalculation extends IndexCalculationServe<OsdCheckResult, VideoOsdCalculation.AreaStats> implements CalculationStrategy<OsdCheckResult> {
@Autowired
private CheckIndexVideoMapper checkIndexVideoMapper;
- @Autowired
- private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexVideoService checkIndexVideoService;
//鍖哄煙瑙嗛鍦ㄧ嚎鐜囩殑鍐呴儴绫�
- private static class AreaStats {
+ protected static class AreaStats {
int totalSites = 0;
- int osdAccuracySites = 0;
- int timeAccuracySites = 0;
-
int importantTotalSites = 0;
int importantOsdAccuracySites = 0;
int importantTimeAccuracySites = 0;
@@ -52,33 +39,9 @@
@Override
public void calculate(List<OsdCheckResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- log.info("鏁版嵁涓虹┖");
- return;
- }
-
- //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(OsdCheckResult::getDeviceNo).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 (OsdCheckResult result : list) {
- TMonitorVO monitor = monitorMap.get(result.getDeviceNo());
- 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, VideoOsdCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.TRUE);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexVideo> checkIndexVideoList = checkIndexVideoMapper.selectToday(DateUtils.getDate());
@@ -98,40 +61,22 @@
/**
* 绱osd鍚堟牸鏁般�佹椂闂村亸宸悎鏍兼暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, OsdCheckResult result, List<String> important) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, OsdCheckResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
- //鏍￠獙osd
- if (checkOsd(result)) {
- stats.osdAccuracySites++;
- }
- //鏍￠獙鏃堕棿鍋忓樊
- if (checkTime(result)) {
- stats.timeAccuracySites++;
- }
+
//閲嶇偣鐐逛綅
- if (important.contains(result.getDeviceNo())) {
+ if (result.getImportantTag()) {
stats.importantTotalSites++;
- if (checkOsd(result)) {
+ if (OsdCheckResult.checkOsd(result)) {
stats.importantOsdAccuracySites++;
}
- if (checkTime(result)) {
+ if (OsdCheckResult.checkTime(result)) {
stats.importantTimeAccuracySites++;
}
}
- }
-
- private Boolean checkOsd(OsdCheckResult result) {
- return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdNameCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdProvinceCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdCityCorrect()) &&
- ApiConstants.OSD_Correct.equals(result.getOsdPartCorrect());
- }
-
- private Boolean checkTime(OsdCheckResult result) {
- return ApiConstants.OSD_Correct.equals(result.getOsdTimeCorrect());
}
/**
@@ -142,12 +87,7 @@
if (checkIndexVideo == null) {
return null;
}
- //璋冪敤osd鏍囨敞璁＄畻鏂规硶
- Map<String, Object> param = new HashMap<>();
- param.put("totalSites", stats.totalSites);
- param.put("osdAccuracySites", stats.osdAccuracySites);
- BigDecimal osdAccuracy = osdAccuracy(param);
- checkIndexVideo.setAnnotationAccuracy(osdAccuracy);
+
//璋冪敤osd鏍囨敞璁＄畻鏂规硶 璁＄畻閲嶇偣osd鏍囨敞
Map<String, Object> importantParam = new HashMap<>();
importantParam.put("totalSites", stats.importantTotalSites);
@@ -155,12 +95,6 @@
BigDecimal imOsdAccuracy = osdAccuracy(importantParam);
checkIndexVideo.setKeyAnnotationAccuracy(imOsdAccuracy);
- //璋冪敤osd鏃堕棿鍑嗙‘鐜�
- Map<String, Object> timeParam = new HashMap<>();
- timeParam.put("totalSites", stats.totalSites);
- timeParam.put("timeAccuracySites", stats.timeAccuracySites);
- BigDecimal osdTimeAccuracy = osdTimeAccuracy(timeParam);
- checkIndexVideo.setTimingAccuracy(osdTimeAccuracy);
//璋冪敤osd鏃堕棿鍑嗙‘鐜�,璁＄畻閲嶇偣
Map<String, Object> importantTimeParam = new HashMap<>();
importantTimeParam.put("totalSites", stats.importantTotalSites);
--
Gitblit v1.8.0