From 2eb6984d4decf5079350a7d5d49dd138a16dff82 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 02 八月 2024 11:26:18 +0800 Subject: [PATCH] 车辆数据抓拍准确性 --- ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java | 4 + ycl-common/src/main/java/constant/CalculationStrategyConstants.java | 27 ++++-- ycl-server/src/main/java/com/ycl/task/CarTask.java | 28 ++++++ ycl-server/src/main/java/com/ycl/calculate/CarAttrRecognitionCalculation.java | 126 +++++++++++++++++++++++++++++++ ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 12 ++ 5 files changed, 184 insertions(+), 13 deletions(-) diff --git a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java index 667e3d1..acc2226 100644 --- a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java +++ b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java @@ -4,29 +4,38 @@ * 鑰冩牳璁$畻绛栫暐甯搁噺 */ public class CalculationStrategyConstants { - /** * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� */ public static final String Car_SiteOnline_ViewStability = "carSiteOnlineViewStability"; /** - * 浜鸿劯鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� - */ - public static final String Face_SiteOnline_ViewStability = "faceSiteOnlineViewStability"; - /** * 杞﹁締鍗″彛灞炴�х洃娴嬬粨鏋� */ public static final String Car_InfoAccuracy = "carInfoAccuracy"; - /** - * 浜鸿劯灞炴�х洃娴嬬粨鏋� - */ - public static final String Face_InfoAccuracy = "faceInfoAccuracy"; /** * 杞﹁締鏁版嵁涓婁紶鍙婃椂鎬� */ public static final String Car_SnapshotDelay = "carSnapshotDelay"; /** + * 杞﹁締鎶撴媿鏁版嵁瀹屾暣鎬� + */ + public static final String Car_DataIntegrity = "carDataIntegrity"; + /** + * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬� + */ + public static final String Car_DataAccuracy = "carDataAccuracy"; + + + /** * 浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬� */ public static final String Face_SnapshotDelay = "faceSnapshotDelay"; + /** + * 浜鸿劯鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� + */ + public static final String Face_SiteOnline_ViewStability = "faceSiteOnlineViewStability"; + /** + * 浜鸿劯灞炴�х洃娴嬬粨鏋� + */ + public static final String Face_InfoAccuracy = "faceInfoAccuracy"; } diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarAttrRecognitionCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarAttrRecognitionCalculation.java new file mode 100644 index 0000000..c374e8c --- /dev/null +++ b/ycl-server/src/main/java/com/ycl/calculate/CarAttrRecognitionCalculation.java @@ -0,0 +1,126 @@ +package com.ycl.calculate; + +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.VehicleDeviceSamplingResult; +import com.ycl.platform.mapper.CheckIndexCarMapper; +import com.ycl.platform.service.ICheckIndexCarService; +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 + * 鏇存柊鎴栨柊澧� + */ +@Component +public class CarAttrRecognitionCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceSamplingResult> { + @Autowired + private CheckIndexCarMapper checkIndexCarMapper; + @Autowired + private ITMonitorService monitorService; + @Autowired + private ICheckIndexCarService checkIndexCarService; + + //鍖哄煙杞﹁締灞炴�ц瘑鍒噯纭巼 + private static class AreaStats { + int totalSites = 0; + int importantTotalSites = 0; + int accuracySites = 0; + int importantAccuracySitesSites = 0; + } + + @Override + public void calculate(List<VehicleDeviceSamplingResult> list) { + if (CollectionUtils.isEmpty(list)) { + return; + } + //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap + //TODO锛歮onitor鍘绘帀浜哾eptId + Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>() + .in("serial_number", list.stream().map(VehicleDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList()))) + .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity())); + //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚� + List<String> provinceIds = getProvince(); + //鑾峰彇閲嶇偣鐐逛綅闆嗗悎 + List<String> importantIds = getImportant(); + Map<String, AreaStats> areaStatsMap = new HashMap<>(); + for (VehicleDeviceSamplingResult result : list) { + TMonitor monitor = monitorMap.get(result.getExternalIndexCode()); + if (monitor == null) continue; + String deptId = monitor.getDeptId().toString(); + updateAreaStats(areaStatsMap, deptId, result, importantIds); + + // 澶勭悊鐪佸巺鏁版嵁 + if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) { + String provinceKey = "Province_" + deptId; + updateAreaStats(areaStatsMap, provinceKey, result, importantIds); + } + } + + // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹� + List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate()); + List<CheckIndexCar> checkIndexCars = new ArrayList<>(); + areaStatsMap.forEach((deptId, stats) -> { + if (stats.totalSites > 0) { + CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList); + checkIndexCars.add(checkIndexCar); + } + }); + + checkIndexCarService.saveOrUpdateBatch(checkIndexCars); + } + + /** + * 绱鎶撴媿鏁版嵁鍑嗙‘璁惧鏁板拰璁惧鎬绘暟锛屽尯鍒嗛噸鐐圭偣浣� + */ + private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VehicleDeviceSamplingResult result, List<String> importantIds) { + //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value + AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats()); + VehicleDeviceSamplingResult.VehicleDifference vehDiff = result.getVehDiff(); + stats.totalSites++; + //90%鍙婁互涓婃暟鎹悎鏍煎垯姝よ溅杈嗗崱鍙h澶囪瑙嗕负鎶撴媿鏁版嵁鍑嗙‘ + if(vehDiff.getMajorConPercent() >= 0.9){ + stats.accuracySites++; + } + //閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬� + if(importantIds.contains(key)){ + stats.importantTotalSites++; + if(vehDiff.getImportantConPercent() >= 0.9){ + stats.importantAccuracySitesSites++; + } + } + } + + /** + * 杞﹁締淇℃伅閲囬泦姝g‘鐜� + */ + private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) { + CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList); + //璋冪敤璁$畻鏂规硶 + Map<String, Object> param = new HashMap<>(); + param.put("totalSites", stats.totalSites); + param.put("importantTotalSites", stats.importantTotalSites); + param.put("accuracySites", stats.accuracySites); + param.put("importantAccuracySites", stats.importantAccuracySitesSites); + BigDecimal dataAccuracy = dataAccuracy(param); + checkIndexCar.setVehicleCaptureAccuracy(dataAccuracy); + return checkIndexCar; + } + + +} diff --git a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java index cdd439c..e8c5f19 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java +++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java @@ -59,7 +59,7 @@ return result.setScale(4, RoundingMode.HALF_UP); } - //鏁版嵁瀹屾暣鎬� + //杞﹁締鏁版嵁瀹屾暣鎬� public BigDecimal dataIntegrity(Map<String, Object> param){ BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites")); @@ -70,6 +70,16 @@ return result.setScale(4, RoundingMode.HALF_UP); } + //杞﹁締鏁版嵁瀹屾暣鎬� + public BigDecimal dataAccuracy(Map<String, Object> param){ + BigDecimal totalSites = new BigDecimal((Integer) param.get("totalSites")); + BigDecimal importantTotalSites = new BigDecimal((Integer) param.get("importantTotalSites")); + BigDecimal accuracySites = new BigDecimal((Integer) param.get("accuracySites")); + BigDecimal importantAccuracySites = new BigDecimal((Integer) param.get("importantAccuracySites")); + BigDecimal result = accuracySites.divide(totalSites, 10, RoundingMode.HALF_UP) + .add(importantAccuracySites.divide(importantTotalSites, 10, RoundingMode.HALF_UP)); + return result.setScale(4, RoundingMode.HALF_UP); + } //杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚� public List<String> getProvince() { // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹� 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 fc6b814..f047930 100644 --- a/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java +++ b/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java @@ -19,6 +19,10 @@ //鎶撴媿鏁版嵁涓婁紶寤惰繜 calculators.put(CalculationStrategyConstants.Car_SnapshotDelay, new CarSnapshotDelayCalculation()); calculators.put(CalculationStrategyConstants.Face_SnapshotDelay, new FaceSnapshotDelayCalculation()); + //杞﹁締鏁版嵁鎶撴媿瀹屾暣鎬� + calculators.put(CalculationStrategyConstants.Car_DataIntegrity,new CarDataIntegrityCalculation()); + //杞﹁締鏁版嵁鎶撴媿鍑嗙‘鎬� + calculators.put(CalculationStrategyConstants.Car_DataAccuracy,new CarAttrRecognitionCalculation()); } public static CalculationStrategy getCalculator(String indexName) { 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 5608389..816eef8 100644 --- a/ycl-server/src/main/java/com/ycl/task/CarTask.java +++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java @@ -3,9 +3,7 @@ import com.ycl.calculate.CalculationStrategy; import com.ycl.factory.IndexCalculationFactory; -import com.ycl.platform.domain.result.HK.CrossDetailResult; -import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult; -import com.ycl.platform.domain.result.HK.SnapshotDelayMonitorResult; +import com.ycl.platform.domain.result.HK.*; import com.ycl.utils.DateUtils; import constant.ApiConstants; import constant.CalculationStrategyConstants; @@ -61,6 +59,30 @@ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_SnapshotDelay); calculator.calculate(results); } + public void snapShopDataIntegrity(){ + 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<DataIntegrityMonitoringResult> results = mongoTemplate.find(query, DataIntegrityMonitoringResult.class); + CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_DataIntegrity); + calculator.calculate(results); + } + public void test(){ + Date yesterday = DateUtils.addDays(new Date(), -1); + //鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 + } + public void AttrRecognitionMonitorTask(){ + 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<VehicleDeviceSamplingResult> results = mongoTemplate.find(query, VehicleDeviceSamplingResult.class); + CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_DataIntegrity); + calculator.calculate(results); + } } -- Gitblit v1.8.0