From 9c2530bafbd5f502fd9bdc9abaa7c357d6f91e86 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期二, 06 八月 2024 17:46:00 +0800 Subject: [PATCH] 点位导入导出 --- ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java index 15ded93..df47586 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java @@ -3,9 +3,12 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ycl.platform.domain.entity.CheckIndexCar; import com.ycl.platform.domain.entity.TMonitor; +import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult; import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult; +import com.ycl.platform.domain.vo.TMonitorVO; import com.ycl.platform.mapper.CheckIndexCarMapper; +import com.ycl.platform.mapper.TMonitorMapper; import com.ycl.platform.service.ICheckIndexCarService; import com.ycl.platform.service.ITMonitorService; import com.ycl.system.mapper.SysConfigMapper; @@ -38,7 +41,7 @@ @Autowired private CheckIndexCarMapper checkIndexCarMapper; @Autowired - private ITMonitorService monitorService; + private TMonitorMapper monitorMapper; @Autowired private ICheckIndexCarService checkIndexCarService; @@ -54,16 +57,15 @@ return; } - //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap - Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>() - .in("serial_number", list.stream().map(VehicleDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList()))) - .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity())); + //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap + Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(VehicleDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList())) + .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity())); //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚� List<String> provinceIds = getProvince(); Map<String, AreaStats> areaStatsMap = new HashMap<>(); for (VehicleDeviceInspectionResult 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