From a2a2209f983a2bb736b59c9217790740930e7017 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 06 八月 2024 15:13:45 +0800 Subject: [PATCH] Monitor结构更新 --- ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java | 12 +++++++----- 1 files changed, 7 insertions(+), 5 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 644d0b6..2da526d 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java @@ -5,7 +5,10 @@ import com.ycl.platform.domain.entity.TMonitor; import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult; import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult; +import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult; +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 org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +36,7 @@ @Autowired private CheckIndexFaceMapper CheckIndexFaceMapper; @Autowired - private ITMonitorService monitorService; + private TMonitorMapper monitorMapper; @Autowired private ICheckIndexFaceService checkIndexFaceService; @@ -50,15 +53,14 @@ } //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap - Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>() - .in("serial_number", list.stream().map(FaceDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList()))) - .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity())); + 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) { - TMonitor monitor = monitorMap.get(result.getExternalIndexCode()); + TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode()); if (monitor == null) continue; String deptId = monitor.getDeptId().toString(); -- Gitblit v1.8.0