From 614ff877d7dc97bf923e5782d04b222e38ae62b6 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 09 八月 2024 09:34:51 +0800
Subject: [PATCH] 图像监测接口优化

---
 ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java |   16 +++++++++-------
 1 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index cc07f33..633223a 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -3,8 +3,11 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.ycl.platform.domain.entity.CheckIndexFace;
 import com.ycl.platform.domain.entity.TMonitor;
+import com.ycl.platform.domain.result.HK.MonitoringDetailResult;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+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;
@@ -40,7 +43,7 @@
     @Autowired
     private SysConfigMapper sysConfigMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
 
     //鍖哄煙浜鸿劯鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
     private static class AreaStats {
@@ -55,16 +58,15 @@
             return;
         }
         //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
-                        .in("serial_number", list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
-                .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
+                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
         //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
         List<String> provinceIds = getProvince();
 
         Map<String, AreaStats> areaStatsMap = new HashMap<>();
 
         for (SnapshotDataMonitorResult result : list) {
-            TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+            TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
             if (monitor == null) continue;
 
             String deptId = monitor.getDeptId().toString();
@@ -78,8 +80,8 @@
         }
 
         //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
-        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
-        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
+        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Face_City);
+        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Face_County);
 
         // 鏌ヨ浠婃棩鏁版嵁
         List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());

--
Gitblit v1.8.0