From f8889f7364adae89e45a5ec3fcf4b38e430cf389 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 10 九月 2024 10:41:18 +0800 Subject: [PATCH] 工单详情 --- ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java | 55 +++++++++++++------------------------------------------ 1 files changed, 13 insertions(+), 42 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java index 1514d8b..fa1db09 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java @@ -1,28 +1,20 @@ package com.ycl.calculate; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ycl.platform.domain.entity.CheckIndexCar; import com.ycl.platform.domain.entity.CheckIndexFace; -import com.ycl.platform.domain.entity.TMonitor; -import com.ycl.platform.domain.result.HK.FaceDeviceSamplingResult; import com.ycl.platform.domain.result.HK.MonitoringDetailResult; -import com.ycl.platform.domain.vo.TMonitorVO; import com.ycl.platform.mapper.CheckIndexFaceMapper; -import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.service.ICheckIndexFaceService; -import com.ycl.platform.service.ITMonitorService; -import com.ycl.system.mapper.SysConfigMapper; import constant.ApiConstants; -import constant.CheckConstants; +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.util.*; -import java.util.function.Function; -import java.util.stream.Collectors; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� 璁惧缂栫爜銆佽鏀垮尯鍒掍唬鐮併�佸畨瑁呬綅缃�佸潗鏍囩粡绾害淇℃伅瀹屾暣鍑嗙‘ @@ -31,46 +23,24 @@ * 鏇存柊鎴栨柊澧� */ @Component -public class FaceInFoAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<MonitoringDetailResult> { +@Slf4j +public class FaceInFoAccuracyCalculation extends IndexCalculationServe<MonitoringDetailResult, FaceInFoAccuracyCalculation.AreaStats> implements CalculationStrategy<MonitoringDetailResult> { @Autowired private CheckIndexFaceMapper checkIndexFaceMapper; @Autowired private ICheckIndexFaceService checkIndexFaceService; - @Autowired - private TMonitorMapper monitorMapper; //鍖哄煙杞﹁締淇℃伅閲囬泦鍑嗙‘鐜囩殑鍐呴儴绫� - private static class AreaStats { + protected static class AreaStats { int totalSites = 0; int qualifySite = 0; } @Override public void calculate(List<MonitoringDetailResult> list) { - if (CollectionUtils.isEmpty(list)) { - return; - } - //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap - Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(MonitoringDetailResult::getExternalIndexCode).collect(Collectors.toList())) - .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity())); - //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚� - List<String> provinceIds = getProvince(); - Map<String, AreaStats> areaStatsMap = new HashMap<>(); - - for (MonitoringDetailResult 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, FaceInFoAccuracyCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list); + if (areaStatsMap == null) return; // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹� List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate()); @@ -91,7 +61,8 @@ /** * 绱鎬荤偣浣嶆暟銆佹爣娉ㄥ紓甯哥偣浣嶆暟 */ - private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitoringDetailResult result) { + @Override + public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitoringDetailResult result) { //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); stats.totalSites++; -- Gitblit v1.8.0