From 40797b99f5ec22b7165d4c67eee5c198741d0633 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 02 八月 2024 17:22:22 +0800 Subject: [PATCH] 人脸时钟准确性 --- ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java | 2 ycl-server/src/main/java/com/ycl/task/FaceTask.java | 13 +++ ycl-common/src/main/java/constant/CalculationStrategyConstants.java | 4 + ycl-server/src/main/java/com/ycl/task/CarTask.java | 2 ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 8 +- ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java | 118 +++++++++++++++++++++++++++++++++++++++ 6 files changed, 139 insertions(+), 8 deletions(-) diff --git a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java index 3abda42..efcc0cb 100644 --- a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java +++ b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java @@ -46,5 +46,9 @@ * 浜鸿劯灞炴�х洃娴嬬粨鏋� */ public static final String Face_InfoAccuracy = "faceInfoAccuracy"; + /** + * 浜鸿劯鏃堕挓鍑嗙‘鎬� + */ + public static final String Face_ClockAccuracy = "faceClockAccuracy"; } 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 b7b793d..15ded93 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java @@ -113,10 +113,10 @@ return null; } //璋冪敤鏃堕挓鍑嗙‘鎬ц绠楁柟娉� - Map<String, Object> siteOnlineParam = new HashMap<>(); - siteOnlineParam.put("totalSites", stats.totalSites); - siteOnlineParam.put("accuracySites", stats.accuracySites); - BigDecimal clockAccuracy = clockAccuracy(siteOnlineParam); + Map<String, Object> clockAccuracyParam = new HashMap<>(); + clockAccuracyParam.put("totalSites", stats.totalSites); + clockAccuracyParam.put("accuracySites", stats.accuracySites); + BigDecimal clockAccuracy = clockAccuracy(clockAccuracyParam); checkIndexCar.setVehicleTimingAccuracy(clockAccuracy); return checkIndexCar; } diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java new file mode 100644 index 0000000..644d0b6 --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java @@ -0,0 +1,118 @@ +package com.ycl.calculate; + +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.FaceDeviceInspectionResult; +import com.ycl.platform.domain.result.HK.FaceDeviceInspectionResult; +import com.ycl.platform.mapper.CheckIndexFaceMapper; +import com.ycl.platform.service.ICheckIndexFaceService; +import com.ycl.platform.service.ITMonitorService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Component; +import org.springframework.util.CollectionUtils; +import utils.DateUtils; + +import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.stream.Collectors; + +/** + * 璁$畻浜鸿劯鏃堕挓鍑嗙‘鎬� + * 閲囩敤浜鸿劯鍏ㄦ鎺ュ彛 + * 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId + * 寰幆map璁$畻鏃堕挓鍑嗙‘鎬� + * 鏇存柊鎴栨柊澧� + */ +@Component +public class FaceClockAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<FaceDeviceInspectionResult> { + @Autowired + private CheckIndexFaceMapper CheckIndexFaceMapper; + @Autowired + private ITMonitorService monitorService; + @Autowired + private ICheckIndexFaceService checkIndexFaceService; + + //鍖哄煙杞﹁締鏃堕挓鍑嗙‘鎬х殑鍐呴儴绫� + private static class AreaStats { + int totalSites = 0; + int accuracySites = 0; + } + + @Override + public void calculate(List<FaceDeviceInspectionResult> list) { + if (CollectionUtils.isEmpty(list)) { + return; + } + + //鑾峰緱鍥芥爣鐮佷负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())); + //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚� + List<String> provinceIds = getProvince(); + + Map<String, AreaStats> areaStatsMap = new HashMap<>(); + for (FaceDeviceInspectionResult result : list) { + TMonitor monitor = monitorMap.get(result.getExternalIndexCode()); + if (monitor == null) continue; + + String deptId = monitor.getDeptId().toString(); + updateAreaStats(areaStatsMap, deptId, result); + + // 澶勭悊鐪佸巺鏁版嵁 + if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) { + String provinceKey = "Province_" + deptId; + updateAreaStats(areaStatsMap, provinceKey, result); + } + } + + // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹� + List<CheckIndexFace> checkIndexFaceList = CheckIndexFaceMapper.selectToday(DateUtils.getDate()); + List<CheckIndexFace> checkIndexFaces = new ArrayList<>(); + areaStatsMap.forEach((deptId, stats) -> { + if (stats.totalSites > 0) { + CheckIndexFace checkIndexFace = createOrUpdateCheckIndexCar(deptId, stats, checkIndexFaceList); + if (checkIndexFace != null) { + checkIndexFaces.add(checkIndexFace); + } + } + }); + + checkIndexFaceService.saveOrUpdateBatch(checkIndexFaces); + } + + /** + * 绱鏃堕挓鍚堟牸璁惧 + */ + private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, FaceDeviceInspectionResult result) { + //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value + AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); + stats.totalSites++; + //鏃堕挓鍑嗙‘鐜囧ぇ浜�90%涓哄悎鏍艰澶� + if (result.getSnapClock().getClockPercent() >= 0.9) { + stats.accuracySites++; + } + } + + /** + * 杞﹁締鏃堕挓鍑嗙‘鎬� + */ + private CheckIndexFace createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) { + CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class); + if (checkIndexFace == null) { + return null; + } + //璋冪敤鏃堕挓鍑嗙‘鎬ц绠楁柟娉� + Map<String, Object> clockAccuracyParam = new HashMap<>(); + clockAccuracyParam.put("totalSites", stats.totalSites); + clockAccuracyParam.put("accuracySites", stats.accuracySites); + BigDecimal clockAccuracy = clockAccuracy(clockAccuracyParam); + checkIndexFace.setFaceTimingAccuracy(clockAccuracy); + return checkIndexFace; + } +} diff --git a/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java b/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java index 89a4533..04ea8ea 100644 --- a/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java +++ b/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java @@ -33,7 +33,7 @@ //浜鸿劯鍥剧墖鍚堟牸銆佸ぇ鍥惧彲鐢� calculators.put(CalculationStrategyConstants.Face_DataAccuracy_PicUsability, new FaceDeviceSampleCalculation()); //浜鸿劯鏃堕挓鍑嗙‘鎬� - + calculators.put(CalculationStrategyConstants.Face_ClockAccuracy, new FaceClockAccuracyCalculation()); //TODO锛氫汉鑴哥洰褰曚竴鑷� } diff --git a/ycl-server/src/main/java/com/ycl/task/CarTask.java b/ycl-server/src/main/java/com/ycl/task/CarTask.java index ee2bbb3..27e3d98 100644 --- a/ycl-server/src/main/java/com/ycl/task/CarTask.java +++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java @@ -84,7 +84,7 @@ calculator.calculate(results); } - public void CarClockAccuracyTask() { + public void clockAccuracyTask() { Date yesterday = DateUtils.addDays(new Date(), -1); //璁$畻杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬� Query query = new Query(); diff --git a/ycl-server/src/main/java/com/ycl/task/FaceTask.java b/ycl-server/src/main/java/com/ycl/task/FaceTask.java index 8ec19f1..6ceb524 100644 --- a/ycl-server/src/main/java/com/ycl/task/FaceTask.java +++ b/ycl-server/src/main/java/com/ycl/task/FaceTask.java @@ -48,7 +48,7 @@ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_DataAccuracy_PicUsability); calculator.calculate(results); } - public void InfoAccuracyTask(){ + public void infoAccuracyTask(){ Date yesterday = DateUtils.addDays(new Date(), -1); //璁$畻浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� Query query = new Query(); @@ -69,7 +69,16 @@ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_SnapshotDelay); calculator.calculate(results); } - + public void clockAccuracyTask() { + Date yesterday = DateUtils.addDays(new Date(), -1); + //璁$畻浜鸿劯璁惧鏃堕挓鍑嗙‘鎬� + Query query = new Query(); + query.addCriteria(Criteria + .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))); + List<FaceDeviceInspectionResult> results = mongoTemplate.find(query, FaceDeviceInspectionResult.class); + CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_ClockAccuracy); + calculator.calculate(results); + } public void test() { Date yesterday = DateUtils.addDays(new Date(), -1); -- Gitblit v1.8.0