From 168346cebced28d8bcf39e5817c7367e9976424c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 02 八月 2024 17:30:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 3
document/海康api.docx | 0
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 2
ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java | 3
ycl-server/src/main/java/com/ycl/task/CarTask.java | 8
ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java | 131 ++++++++++++++++++
ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 9
ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java | 30 ++-
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 2
ycl-server/src/main/java/com/ycl/task/FaceTask.java | 36 ++++-
ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java | 3
ycl-common/src/main/java/constant/CalculationStrategyConstants.java | 18 ++
ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java | 1
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java | 8
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 3
ycl-server/src/main/java/com/ycl/calculate/FaceClockAccuracyCalculation.java | 118 ++++++++++++++++
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 6
17 files changed, 342 insertions(+), 39 deletions(-)
diff --git "a/document/\346\265\267\345\272\267api.docx" "b/document/\346\265\267\345\272\267api.docx"
index b071fb3..de51927 100644
--- "a/document/\346\265\267\345\272\267api.docx"
+++ "b/document/\346\265\267\345\272\267api.docx"
Binary files differ
diff --git a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
index 3c2a027..efcc0cb 100644
--- a/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
+++ b/ycl-common/src/main/java/constant/CalculationStrategyConstants.java
@@ -9,6 +9,10 @@
*/
public static final String Car_SiteOnline_ViewStability = "carSiteOnlineViewStability";
/**
+ * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl銆佸ぇ鍥惧彲鐢ㄦ��
+ */
+ public static final String Car_DataAccuracy_Url_PicUsability = "carDataAccuracyUrlPicUsability";
+ /**
* 杞﹁締鍗″彛灞炴�х洃娴嬬粨鏋�
*/
public static final String Car_InfoAccuracy = "carInfoAccuracy";
@@ -21,13 +25,10 @@
*/
public static final String Car_DataIntegrity = "carDataIntegrity";
/**
- * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬�
- */
- public static final String Car_DataAccuracy = "carDataAccuracy";
- /**
* 杞﹁締鏃堕挓鍑嗙‘鎬�
*/
public static final String Car_ClockAccuracy = "carClockAccuracy";
+
/**
* 浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�
@@ -38,7 +39,16 @@
*/
public static final String Face_SiteOnline_ViewStability = "faceSiteOnlineViewStability";
/**
+ * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl銆佸ぇ鍥惧彲鐢ㄦ��
+ */
+ public static final String Face_DataAccuracy_PicUsability = "faceDataAccuracyPicUsability";
+ /**
* 浜鸿劯灞炴�х洃娴嬬粨鏋�
*/
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 0da2576..15ded93 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
@@ -28,6 +28,7 @@
/**
* 璁＄畻杞﹁締鏃堕挓鍑嗙‘鎬�
+ * 閲囩敤杞﹁締鍏ㄦ鎺ュ彛
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鏃堕挓鍑嗙‘鎬�
* 鏇存柊鎴栨柊澧�
@@ -112,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/CarDataIntegrityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
index e1f565f..42c1c5d 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -24,7 +24,8 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻杞﹁締鏁版嵁瀹屾暣鎬�
+ * 璁＄畻杞﹁締鏁版嵁瀹屾暣鎬э紙妫�娴嬭溅鐗屽彿銆佽溅鐗岄鑹插暐鐨勫悎涓嶅悎鏍囧噯
+ * 閲囩敤鏁版嵁瀹屾暣鎬х洃娴嬫帴鍙�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index 4f275ab..7222299 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -23,8 +23,8 @@
import java.util.stream.Collectors;
/**
- * 杞﹁締鏁版嵁鎶芥鎺ュ彛
* 璁＄畻杞﹁締灞炴�ц瘑鍒噯纭巼銆乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ * 杞﹁締鏁版嵁鎶芥鎺ュ彛
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
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 df2bf79..f764ffe 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
@@ -27,6 +27,7 @@
/**
* 璁＄畻杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� 璁惧缂栫爜銆佽鏀垮尯鍒掍唬鐮併�佸畨瑁呬綅缃�佸潗鏍囩粡绾害淇℃伅瀹屾暣鍑嗙‘
+ * 閲囩敤鍗″彛灞炴�х洃娴嬫帴鍙�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
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 3322699..c3276a8 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -24,8 +24,8 @@
import java.util.stream.Collectors;
/**
+ * 璁＄畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
* 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
- * 璁＄畻杞﹁締銆佷汉鑴哥偣浣嶅湪绾跨巼銆佽鍥惧簱瀵规帴绋冲畾鎬�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
* 鏇存柊鎴栨柊澧�
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
index dd8fcca..4f52380 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
@@ -26,6 +26,7 @@
/**
* 璁＄畻杞﹁締澶囨姄鎷嶆暟鎹笂浼犲強鏃舵��
+ * 鎶撴媿鏁版嵁鏃跺欢鐩戞祴鎺ュ彛
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鏁版嵁涓婁紶鍙婃椂鎬�
* 鏇存柊鎴栨柊澧�
@@ -94,7 +95,7 @@
}
/**
- * 绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
+ * 绱鎬绘暟鎹噺銆佸欢杩熸暟鎹噺
*/
private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDelayMonitorResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
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/calculate/FaceDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
new file mode 100644
index 0000000..feddb69
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceDeviceSampleCalculation.java
@@ -0,0 +1,131 @@
+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.FaceDeviceSamplingResult;
+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
+ * 鏇存柊鎴栨柊澧�
+ */
+@Component
+public class FaceDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<FaceDeviceSamplingResult> {
+ @Autowired
+ private CheckIndexFaceMapper checkIndexFaceMapper;
+ @Autowired
+ private ITMonitorService monitorService;
+ @Autowired
+ private ICheckIndexFaceService checkIndexFaceService;
+
+ //鍖哄煙杞﹁締鎶芥鎸囨爣
+ private static class AreaStats {
+ int totalSites = 0;
+ //鍥剧墖鍚堟牸鐨勭偣浣嶆暟
+ int picQualifySites = 0;
+ //鍥剧墖鍙敤鐨勭偣浣嶆暟
+ int picUsabilitySites = 0;
+ }
+
+ @Override
+ public void calculate(List<FaceDeviceSamplingResult> 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(FaceDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList())))
+ .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+ //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
+ List<String> provinceIds = getProvince();
+ Map<String, AreaStats> areaStatsMap = new HashMap<>();
+ for (FaceDeviceSamplingResult 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 = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList);
+ if (checkIndexFace != null) {
+ checkIndexFaces.add(checkIndexFace);
+ }
+ }
+ });
+
+ checkIndexFaceService.saveOrUpdateBatch(checkIndexFaces);
+ }
+
+ /**
+ * 绱鎶撴媿鏁版嵁鍑嗙‘璁惧鏁板拰璁惧鎬绘暟
+ */
+ private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, FaceDeviceSamplingResult result) {
+ //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
+ AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
+ FaceDeviceSamplingResult.BigUsefulness bigUseful = result.getBigUseful();
+ FaceDeviceSamplingResult.FaceEligibility faceElig = result.getFaceElig();
+ stats.totalSites++;
+ //90%鍙婁互涓婃暟鎹悎鏍煎垯姝や汉鑴歌澶囪瑙嗕负鍥剧墖鍚堟牸
+ if (faceElig.getFaceEligPercent() >= 0.9) {
+ stats.picQualifySites++;
+ }
+ //澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸
+ if (bigUseful.getBigUsefulPercent() >= 0.9) {
+ stats.picUsabilitySites++;
+ }
+ }
+
+ /**
+ * 浜鸿劯鍥剧墖鍚堟牸鐜囥�佸ぇ鍥惧彲鐢ㄦ��
+ */
+ private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) {
+ CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class);
+ if (checkIndexFace == null) {
+ return null;
+ }
+ //璋冪敤鍥剧墖鍚堟牸鐜囪绠楁柟娉�
+ Map<String, Object> qualifyParam = new HashMap<>();
+ qualifyParam.put("totalSites", stats.totalSites);
+ qualifyParam.put("picQualifySites", stats.picQualifySites);
+ BigDecimal dataQualify = dataQualify(qualifyParam);
+ checkIndexFace.setFacePictureQualification(dataQualify);
+ //璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
+ Map<String, Object> usabilityParam = new HashMap<>();
+ usabilityParam.put("totalSites", stats.totalSites);
+ usabilityParam.put("picUsabilitySites", stats.picUsabilitySites);
+ BigDecimal picUsability = picUsability(usabilityParam);
+ checkIndexFace.setFacePictureAvailability(picUsability);
+ return checkIndexFace;
+ }
+
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
index 50a9e50..8282744 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
@@ -24,6 +24,7 @@
/**
* 浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� 璁惧缂栫爜銆佽鏀垮尯鍒掍唬鐮併�佸畨瑁呬綅缃�佸潗鏍囩粡绾害淇℃伅瀹屾暣鍑嗙‘
+ * 閲囬泦璁惧灞炴�х洃娴嬫帴鍙�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
@@ -100,7 +101,7 @@
}
/**
- * 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜�
+ * 浜鸿劯淇℃伅閲囬泦姝ｇ‘鐜�
*/
private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) {
CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class);
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 28778f7..ced2623 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -24,13 +24,14 @@
import java.util.stream.Collectors;
/**
- * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
* 璁＄畻浜鸿劯鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
+ * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
* 鏇存柊鎴栨柊澧�
*/
@Component
+//TODD:绯荤粺閰嶇疆閲岀殑鍖哄垎浜鸿劯鍜岃溅杈嗐�佺疮鍔犳鏁扮殑姒傚康銆佸尯鍘夸笉灏戜簬40璺紝涓嶈揪鏍囧競宸炵殑褰撴湀璇ラ」鎴愮哗涓嶈兘寰楀垎銆�
public class FaceSnapshotDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
index 49ad0e3..beb1800 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
@@ -21,6 +21,7 @@
/**
* 璁＄畻浜鸿劯璁惧鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
+ * 鎶撴媿鏁版嵁鏃跺欢鐩戞祴鎺ュ彛
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鏁版嵁涓婁紶鍙婃椂鎬�
* 鏇存柊鎴栨柊澧�
@@ -34,7 +35,7 @@
@Autowired
private ICheckIndexFaceService checkIndexFaceService;
- //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
+ //鍖哄煙浜鸿劯鏁版嵁涓婁紶寤惰繜鎸囨爣鐨勫唴閮ㄧ被
private static class AreaStats {
int totalCount = 0;
//0-180s
@@ -89,7 +90,7 @@
}
/**
- * 绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
+ * 绱鎬绘暟鎹噺銆佸欢杩熸暟鎹噺
*/
private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDelayMonitorResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
@@ -100,9 +101,8 @@
stats.delayCount3 += result.getDataDelayCount3();
}
-
/**
- * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
+ * 浜鸿劯鏁版嵁涓婁紶鍙婃椂鎬�
*/
private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) {
CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class);
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 1005050..aa33b57 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -104,6 +104,12 @@
return picUsabilitySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
+ //鍥剧墖鍚堟牸鐜�
+ public BigDecimal dataQualify(Map<String, Object> param) {
+ BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
+ BigDecimal picQualifySites = new BigDecimal((Integer) param.get("picQualifySites"));
+ return picQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ }
//杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
public List<String> getProvince() {
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 109d644..04ea8ea 100644
--- a/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
+++ b/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
@@ -10,21 +10,31 @@
private static final Map<String, CalculationStrategy> calculators = new HashMap<>();
static {
- //鐐逛綅鍦ㄧ嚎銆佽鍥惧簱瀵规帴绋冲畾鎬�
+ //杞﹁締鐐逛綅鍦ㄧ嚎銆佽鍥惧簱瀵规帴绋冲畾鎬�
calculators.put(CalculationStrategyConstants.Car_SiteOnline_ViewStability, new CarSnapshopDataCalculation());
- calculators.put(CalculationStrategyConstants.Face_SiteOnline_ViewStability, new FaceSnapshotDataCalculation());
- //淇℃伅鍑嗙‘鐜�
+ //杞﹁締淇℃伅鍑嗙‘鐜�
calculators.put(CalculationStrategyConstants.Car_InfoAccuracy, new CarInFoAccuracyCalculation());
- calculators.put(CalculationStrategyConstants.Face_InfoAccuracy, new FaceInFoAccuracyCalculation());
- //鎶撴媿鏁版嵁涓婁紶寤惰繜
+ //杞﹁締鎶撴媿鏁版嵁涓婁紶寤惰繜
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 CarDeviceSampleCalculation());
+ calculators.put(CalculationStrategyConstants.Car_DataIntegrity, new CarDataIntegrityCalculation());
+ //杞﹁締鏁版嵁鎶撴媿鍑嗙‘鎬с�乽rl銆佸ぇ鍥惧彲鐢�
+ calculators.put(CalculationStrategyConstants.Car_DataAccuracy_Url_PicUsability, new CarDeviceSampleCalculation());
//杞﹁締鏃堕挓鍑嗙‘鎬�
- calculators.put(CalculationStrategyConstants.Car_ClockAccuracy,new CarClockAccuracyCalculation());
+ calculators.put(CalculationStrategyConstants.Car_ClockAccuracy, new CarClockAccuracyCalculation());
+ //TODO锛氳溅杈嗙洰褰曚竴鑷�
+
+ //浜鸿劯鐐逛綅鍦ㄧ嚎銆佽鍥惧簱瀵规帴绋冲畾
+ calculators.put(CalculationStrategyConstants.Face_SiteOnline_ViewStability, new FaceSnapshotDataCalculation());
+ //浜鸿劯淇℃伅鍑嗙‘鐜�
+ calculators.put(CalculationStrategyConstants.Face_InfoAccuracy, new FaceInFoAccuracyCalculation());
+ //浜鸿劯鎶撴媿鏁版嵁寤惰繜
+ calculators.put(CalculationStrategyConstants.Face_SnapshotDelay, new FaceSnapshotDelayCalculation());
+ //浜鸿劯鍥剧墖鍚堟牸銆佸ぇ鍥惧彲鐢�
+ calculators.put(CalculationStrategyConstants.Face_DataAccuracy_PicUsability, new FaceDeviceSampleCalculation());
+ //浜鸿劯鏃堕挓鍑嗙‘鎬�
+ calculators.put(CalculationStrategyConstants.Face_ClockAccuracy, new FaceClockAccuracyCalculation());
+ //TODO锛氫汉鑴哥洰褰曚竴鑷�
}
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 1c5ed20..27e3d98 100644
--- a/ycl-server/src/main/java/com/ycl/task/CarTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java
@@ -41,12 +41,12 @@
public void deviceSampleTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
- //璁＄畻杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ //璁＄畻杞﹁締鍗″彛璁惧鏁版嵁璇嗗埆鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
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);
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_DataAccuracy_Url_PicUsability);
calculator.calculate(results);
}
@@ -63,7 +63,7 @@
public void snapShopDelay() {
Date yesterday = DateUtils.addDays(new Date(), -1);
- //璁＄畻杞﹁締鎶撴媿鏁版嵁涓婁紶寤惰繜
+ //璁＄畻杞﹁締鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))
@@ -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 f258b5a..6ceb524 100644
--- a/ycl-server/src/main/java/com/ycl/task/FaceTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/FaceTask.java
@@ -3,10 +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.MonitoringDetailResult;
-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;
@@ -41,9 +38,19 @@
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_SiteOnline_ViewStability);
calculator.calculate(results);
}
- public void InfoAccuracyTask(){
+ public void deviceSampleTask() {
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<FaceDeviceSamplingResult> results = mongoTemplate.find(query, FaceDeviceSamplingResult.class);
+ CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Face_DataAccuracy_PicUsability);
+ calculator.calculate(results);
+ }
+ public void infoAccuracyTask(){
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ //璁＄畻浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
@@ -53,7 +60,7 @@
}
public void snapShopDelay(){
Date yesterday = DateUtils.addDays(new Date(), -1);
- //璁＄畻杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
+ //璁＄畻浜鸿劯鎶撴媿鏁版嵁涓婁紶鍙婃椂鎬�
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))
@@ -62,4 +69,19 @@
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);
+ //TODO锛氫竴鏈轰竴妗� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 鍙杛edis
+ }
}
--
Gitblit v1.8.0