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/CarInFoAccuracyCalculation.java | 46 ++++++++++++++++------------------------------
1 files changed, 16 insertions(+), 30 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
index c46d4d3..e567bac 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
@@ -5,6 +5,8 @@
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.result.HK.VehicleDeviceSamplingResult;
+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;
@@ -27,6 +29,7 @@
/**
* 璁＄畻杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� 璁惧缂栫爜銆佽鏀垮尯鍒掍唬鐮併�佸畨瑁呬綅缃�佸潗鏍囩粡绾害淇℃伅瀹屾暣鍑嗙‘
+ * 閲囩敤鍗″彛灞炴�х洃娴嬫帴鍙�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
@@ -34,10 +37,6 @@
public class CarInFoAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<CrossDetailResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
- @Autowired
- private SysConfigMapper sysConfigMapper;
- @Autowired
- private ITMonitorService monitorService;
@Autowired
private TMonitorMapper monitorMapper;
@Autowired
@@ -55,16 +54,14 @@
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
- //TODO锛歮onitor鍘绘帀浜哾eptId
- Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
- .in("serial_number", list.stream().map(CrossDetailResult::getExternalIndexCode).collect(Collectors.toList())))
- .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+ Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(CrossDetailResult::getExternalIndexCode).collect(Collectors.toList()))
+ .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
//鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
List<String> provinceIds = getProvince();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (CrossDetailResult result : list) {
- TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+ TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
@@ -84,7 +81,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
- checkIndexCars.add(checkIndexCar);
+ if (checkIndexCar != null) {
+ checkIndexCars.add(checkIndexCar);
+ }
}
});
@@ -108,28 +107,15 @@
* 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜�
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
- CheckIndexCar checkIndexCar;
-
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
- Optional<CheckIndexCar> existingCar = checkIndexCarList.stream()
- .filter(car -> key.equals(car.getDeptId().toString()) &&
- (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(car.getExamineTag())
- : CheckConstants.Examine_Tag_County.equals(car.getExamineTag())))
- .findFirst();
-
- if (existingCar.isPresent()) {
- checkIndexCar = existingCar.get();
- } else {
- checkIndexCar = new CheckIndexCar();
- checkIndexCar.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
- checkIndexCar.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
- checkIndexCar.setCreateTime(new Date());
+ CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+ if (checkIndexCar == null) {
+ return null;
}
//璋冪敤璁＄畻鏂规硶
- Map<String, Object> siteOnlineParam = new HashMap<>();
- siteOnlineParam.put("totalSites", stats.totalSites);
- siteOnlineParam.put("qualifySite", stats.qualifySite);
- BigDecimal infoAccuracy = InfoAccuracy(siteOnlineParam);
+ Map<String, Object> param = new HashMap<>();
+ param.put("totalSites", stats.totalSites);
+ param.put("qualifySite", stats.qualifySite);
+ BigDecimal infoAccuracy = infoAccuracy(param);
checkIndexCar.setVehicleInformationCollectionAccuracy(infoAccuracy);
return checkIndexCar;
}
--
Gitblit v1.8.0