From dbf1793b62b69f824a401242cfd5430dd4992fa8 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期一, 18 十一月 2024 12:01:14 +0800 Subject: [PATCH] 运行监控导出 --- ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java | 38 +++++++++----------------------------- 1 files changed, 9 insertions(+), 29 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java index 5999ad9..4e030ee 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java @@ -12,6 +12,7 @@ import com.ycl.platform.service.ICheckIndexFaceService; 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; @@ -33,46 +34,24 @@ * 鏇存柊鎴栨柊澧� */ @Component -public class FaceClockAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<FaceDeviceInspectionResult> { +@Slf4j +public class FaceClockAccuracyCalculation extends IndexCalculationServe<FaceDeviceInspectionResult, FaceClockAccuracyCalculation.AreaStats> implements CalculationStrategy<FaceDeviceInspectionResult> { @Autowired private CheckIndexFaceMapper CheckIndexFaceMapper; - @Autowired - private TMonitorMapper monitorMapper; @Autowired private ICheckIndexFaceService checkIndexFaceService; //鍖哄煙杞﹁締鏃堕挓鍑嗙‘鎬х殑鍐呴儴绫� - private static class AreaStats { + protected static class AreaStats { int totalSites = 0; int accuracySites = 0; } @Override public void calculate(List<FaceDeviceInspectionResult> list) { - if (CollectionUtils.isEmpty(list)) { - return; - } - - //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap - Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(FaceDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList())) - .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity())); - //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚� - List<String> provinceIds = getProvince(); - - Map<String, AreaStats> areaStatsMap = new HashMap<>(); - for (FaceDeviceInspectionResult result : list) { - TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode()); - 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, FaceClockAccuracyCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE); + if (areaStatsMap == null) return; // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹� List<CheckIndexFace> checkIndexFaceList = CheckIndexFaceMapper.selectToday(DateUtils.getDate()); @@ -92,7 +71,8 @@ /** * 绱鏃堕挓鍚堟牸璁惧 */ - private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, FaceDeviceInspectionResult result) { + @Override + public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, FaceDeviceInspectionResult result) { //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); stats.totalSites++; -- Gitblit v1.8.0