From aabe122f6184bf2918b51375065b6e09f23f75c4 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 06 八月 2024 15:59:00 +0800
Subject: [PATCH] 抓拍系统配置区分车辆人脸

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

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index e701f1a..f26b39c 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -3,8 +3,11 @@
 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.CrossDetailResult;
 import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
+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;
@@ -37,7 +40,7 @@
     @Autowired
     private SysConfigMapper sysConfigMapper;
     @Autowired
-    private ITMonitorService monitorService;
+    private TMonitorMapper monitorMapper;
     @Autowired
     private ICheckIndexCarService checkIndexCarService;
 
@@ -55,15 +58,14 @@
         }
 
         //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈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();
@@ -77,8 +79,8 @@
         }
 
         //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
-        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
-        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
+        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
+        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
 
         // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
         List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());

--
Gitblit v1.8.0