From 73a30f7dd65af02bf37b516cc6689ca453fcc2ca Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 02 八月 2024 16:29:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java | 6
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 7 +
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 10 ++
ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java | 7 +
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 73 +++++++++++++----
ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java | 7 +
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java | 7 +
ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java | 7 +
ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java | 10 ++
ycl-server/src/main/java/com/ycl/task/CarTask.java | 47 ++++++-----
ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 7 +
ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java | 20 ++++
12 files changed, 154 insertions(+), 54 deletions(-)
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 82ab3e2..0da2576 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
@@ -81,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);
+ }
}
});
@@ -106,6 +108,9 @@
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+ if (checkIndexCar == null) {
+ return null;
+ }
//璋冪敤鏃堕挓鍑嗙‘鎬ц绠楁柟娉�
Map<String, Object> siteOnlineParam = new HashMap<>();
siteOnlineParam.put("totalSites", stats.totalSites);
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 5a09508..e1f565f 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -79,7 +79,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
- checkIndexCars.add(checkIndexCar);
+ if (checkIndexCar != null) {
+ checkIndexCars.add(checkIndexCar);
+ }
}
});
@@ -111,6 +113,9 @@
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+ if (checkIndexCar == null) {
+ return null;
+ }
//璋冪敤璁＄畻鏂规硶
Map<String, Object> param = new HashMap<>();
param.put("totalSites", stats.totalSites);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarAttrRecognitionCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
similarity index 60%
rename from ycl-server/src/main/java/com/ycl/calculate/CarAttrRecognitionCalculation.java
rename to ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index 71911f4..4f275ab 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarAttrRecognitionCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -14,6 +14,7 @@
import utils.DateUtils;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -22,13 +23,13 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻杞﹁締灞炴�ц瘑鍒噯纭巼
- * 閲囩敤杞﹁締鎶芥鎸囨爣鎺ュ彛鏁版嵁
+ * 杞﹁締鏁版嵁鎶芥鎺ュ彛
+ * 璁＄畻杞﹁締灞炴�ц瘑鍒噯纭巼銆乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class CarAttrRecognitionCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceSamplingResult> {
+public class CarDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceSamplingResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
@@ -36,12 +37,18 @@
@Autowired
private ICheckIndexCarService checkIndexCarService;
- //鍖哄煙杞﹁締灞炴�ц瘑鍒噯纭巼
+ //鍖哄煙杞﹁締鎶芥鎸囨爣
private static class AreaStats {
int totalSites = 0;
int importantTotalSites = 0;
+ //灞炴�ц瘑鍒噯纭殑鐐逛綅鏁�
int accuracySites = 0;
- int importantAccuracySitesSites = 0;
+ //灞炴�ц瘑鍒噯纭殑閲嶇偣鐐逛綅鏁�
+ int importantAccuracySites = 0;
+ //url鍙闂殑鐐逛綅鏁�
+ int urlUsabilitySites = 0;
+ //鍥剧墖鍙敤鐨勭偣浣嶆暟
+ int picUsabilitySites = 0;
}
@Override
@@ -78,7 +85,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
- checkIndexCars.add(checkIndexCar);
+ if (checkIndexCar != null) {
+ checkIndexCars.add(checkIndexCar);
+ }
}
});
@@ -92,33 +101,61 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
VehicleDeviceSamplingResult.VehicleDifference vehDiff = result.getVehDiff();
+ VehicleDeviceSamplingResult.BigUsefulness bigUseful = result.getBigUseful();
stats.totalSites++;
//90%鍙婁互涓婃暟鎹悎鏍煎垯姝よ溅杈嗗崱鍙ｈ澶囪瑙嗕负鎶撴媿鏁版嵁鍑嗙‘
- if(vehDiff.getMajorConPercent() >= 0.9){
+ if (vehDiff.getMajorConPercent() >= 0.9) {
stats.accuracySites++;
}
//閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬�
- if(importantIds.contains(key)){
+ if (importantIds.contains(key)) {
stats.importantTotalSites++;
- if(vehDiff.getImportantConPercent() >= 0.9){
- stats.importantAccuracySitesSites++;
+ if (vehDiff.getImportantConPercent() >= 0.9) {
+ stats.importantAccuracySites++;
}
+ }
+ //澶у浘鍙敤鐜囧ぇ浜�90%瑙嗕负鍚堟牸
+ if (bigUseful.getBigUsefulPercent() >= 0.9) {
+ stats.picUsabilitySites++;
+ }
+ //鍥剧墖璁块棶姝ｅ父閲� = 鎶芥閲�-寮傚父閲�
+ BigDecimal picNormalCount = new BigDecimal(bigUseful.getSampleCount() - bigUseful.getBigPicExpCount());
+ //鍥剧墖鎶芥閲�
+ BigDecimal sampleCount = new BigDecimal(bigUseful.getSampleCount());
+ //鍥剧墖璁块棶鐜�>=90% 瑙嗕负鍚堟牸
+ if (picNormalCount.divide(sampleCount, 4, RoundingMode.HALF_UP).compareTo(new BigDecimal("0.9")) >= 0) {
+ stats.urlUsabilitySites++;
}
}
/**
- * 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜�
+ * 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜囥�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
- //璋冪敤璁＄畻鏂规硶
- 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);
+ if (checkIndexCar == null) {
+ return null;
+ }
+ //璋冪敤淇℃伅閲囬泦姝ｇ‘鐜囪绠楁柟娉�
+ Map<String, Object> accuracyParam = new HashMap<>();
+ accuracyParam.put("totalSites", stats.totalSites);
+ accuracyParam.put("importantTotalSites", stats.importantTotalSites);
+ accuracyParam.put("accuracySites", stats.accuracySites);
+ accuracyParam.put("importantAccuracySites", stats.importantAccuracySites);
+ BigDecimal dataAccuracy = dataAccuracy(accuracyParam);
checkIndexCar.setVehicleCaptureAccuracy(dataAccuracy);
+ //璋冪敤url鍙敤鎬ц绠楁柟娉�
+ Map<String, Object> urlParam = new HashMap<>();
+ urlParam.put("totalSites", stats.totalSites);
+ urlParam.put("urlQualifySites", stats.urlUsabilitySites);
+ BigDecimal urlUsability = urlUsability(urlParam);
+ checkIndexCar.setVehicleUrlAvailability(urlUsability);
+ //璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
+ Map<String, Object> usabilityParam = new HashMap<>();
+ urlParam.put("totalSites", stats.totalSites);
+ urlParam.put("picUsabilitySites", stats.picUsabilitySites);
+ BigDecimal picUsability = picUsability(usabilityParam);
+ checkIndexCar.setVehiclePictureAvailability(picUsability);
return checkIndexCar;
}
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 a2f4942..df2bf79 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarInFoAccuracyCalculation.java
@@ -80,7 +80,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
- checkIndexCars.add(checkIndexCar);
+ if (checkIndexCar != null) {
+ checkIndexCars.add(checkIndexCar);
+ }
}
});
@@ -105,6 +107,9 @@
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+ if (checkIndexCar == null) {
+ return null;
+ }
//璋冪敤璁＄畻鏂规硶
Map<String, Object> param = new HashMap<>();
param.put("totalSites", stats.totalSites);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
similarity index 94%
rename from ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java
rename to ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index 79d5619..3322699 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -24,13 +24,14 @@
import java.util.stream.Collectors;
/**
+ * 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
* 璁＄畻杞﹁締銆佷汉鑴哥偣浣嶅湪绾跨巼銆佽鍥惧簱瀵规帴绋冲畾鎬�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class CarSiteOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
+public class CarSnapshopDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
@@ -85,7 +86,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, cityCountAvg, countyCountAvg, checkIndexCarList);
- checkIndexCars.add(checkIndexCar);
+ if (checkIndexCar != null) {
+ checkIndexCars.add(checkIndexCar);
+ }
}
});
@@ -122,6 +125,9 @@
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+ if (checkIndexCar == null) {
+ return null;
+ }
//璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
Map<String, Object> siteOnlineParam = new HashMap<>();
siteOnlineParam.put("totalSites", stats.totalSites);
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 4beb222..dd8fcca 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java
@@ -84,7 +84,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalCount > 0) {
CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, checkIndexCarList);
- checkIndexCars.add(checkIndexCar);
+ if (checkIndexCar != null) {
+ checkIndexCars.add(checkIndexCar);
+ }
}
});
@@ -109,6 +111,9 @@
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+ if (checkIndexCar == null) {
+ return null;
+ }
//璋冪敤鎶撴媿涓婁紶鍙婃椂鎬ц绠楁柟娉�
Map<String, Object> param = new HashMap<>();
param.put("totalCount", stats.totalCount);
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 8587818..50a9e50 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
@@ -77,7 +77,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList);
- checkIndexFaces.add(checkIndexFace);
+ if (checkIndexFace != null) {
+ checkIndexFaces.add(checkIndexFace);
+ }
}
});
@@ -102,6 +104,9 @@
*/
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> param = new HashMap<>();
param.put("totalSites", stats.totalSites);
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
similarity index 93%
rename from ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.java
rename to ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index ab10c5a..28778f7 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSiteOnlineCalculation.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
-public class FaceSiteOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
+public class FaceSnapshotDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@Autowired
@@ -85,7 +86,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, cityCountAvg, countyCountAvg, checkIndexFaceList);
- checkIndexFaces.add(checkIndexFace);
+ if (checkIndexFace != null) {
+ checkIndexFaces.add(checkIndexFace);
+ }
}
});
@@ -116,6 +119,9 @@
//杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexFace> checkIndexFaceList) {
CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class);
+ if (checkIndexFace == null) {
+ return null;
+ }
//璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
Map<String, Object> siteOnlineParam = new HashMap<>();
siteOnlineParam.put("totalSites", stats.totalSites);
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 0623f92..49ad0e3 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java
@@ -79,7 +79,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalCount > 0) {
CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList);
- checkIndexFaces.add(checkIndexFace);
+ if (checkIndexFace != null) {
+ checkIndexFaces.add(checkIndexFace);
+ }
}
});
@@ -104,6 +106,9 @@
*/
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> param = new HashMap<>();
param.put("totalCount", stats.totalCount);
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 58ff734..1005050 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java
@@ -8,6 +8,7 @@
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
import com.ycl.platform.service.ITMonitorService;
import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.stereotype.Service;
@@ -22,6 +23,7 @@
* 璁＄畻鍏紡
*/
@Component
+@Slf4j
public class IndexCalculationServe {
//鐐逛綅鍦ㄧ嚎鐜�
@@ -88,6 +90,21 @@
return accuracySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
}
+ //url鍙敤鎬�
+ public BigDecimal urlUsability(Map<String, Object> param) {
+ BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
+ BigDecimal urlQualifySites = new BigDecimal((Integer) param.get("urlQualifySites"));
+ return urlQualifySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ }
+
+ //澶у浘鍙敤鎬�
+ public BigDecimal picUsability(Map<String, Object> param) {
+ BigDecimal totalSitesCount = new BigDecimal((Integer) param.get("totalSites"));
+ BigDecimal picUsabilitySites = new BigDecimal((Integer) param.get("picUsabilitySites"));
+ return picUsabilitySites.divide(totalSitesCount, 4, RoundingMode.HALF_UP);
+ }
+
+
//杩斿洖鐪佸巺鍥芥爣鐮侀泦鍚�
public List<String> getProvince() {
// TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
@@ -122,7 +139,8 @@
checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
checkIndex.setCreateTime(new Date());
} catch (Exception e) {
- throw new RuntimeException("鏃犳硶鍒涘缓 CheckIndexCar 瀹炰緥", e);
+ checkIndex = null;
+ log.error("鏃犳硶鍒涘缓 checkIndex 瀹炰緥", e);
}
}
return checkIndex;
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 aaa0676..109d644 100644
--- a/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
+++ b/ycl-server/src/main/java/com/ycl/factory/IndexCalculationFactory.java
@@ -11,8 +11,8 @@
static {
//鐐逛綅鍦ㄧ嚎銆佽鍥惧簱瀵规帴绋冲畾鎬�
- calculators.put(CalculationStrategyConstants.Car_SiteOnline_ViewStability, new CarSiteOnlineCalculation());
- calculators.put(CalculationStrategyConstants.Face_SiteOnline_ViewStability, new FaceSiteOnlineCalculation());
+ 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());
@@ -22,7 +22,7 @@
//杞﹁締鏁版嵁鎶撴媿瀹屾暣鎬�
calculators.put(CalculationStrategyConstants.Car_DataIntegrity,new CarDataIntegrityCalculation());
//杞﹁締鏁版嵁鎶撴媿鍑嗙‘鎬�
- calculators.put(CalculationStrategyConstants.Car_DataAccuracy,new CarAttrRecognitionCalculation());
+ calculators.put(CalculationStrategyConstants.Car_DataAccuracy,new CarDeviceSampleCalculation());
//杞﹁締鏃堕挓鍑嗙‘鎬�
calculators.put(CalculationStrategyConstants.Car_ClockAccuracy,new CarClockAccuracyCalculation());
}
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 56ac5b5..1c5ed20 100644
--- a/ycl-server/src/main/java/com/ycl/task/CarTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CarTask.java
@@ -29,7 +29,7 @@
public void siteOnlineTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
- //鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
+ //璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
Query query = new Query();
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday))
@@ -38,7 +38,19 @@
CalculationStrategy<SnapshotDataMonitorResult> calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_SiteOnline_ViewStability);
calculator.calculate(results);
}
- public void infoAccuracyTask(){
+
+ public void deviceSampleTask() {
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ //璁＄畻杞﹁締鍗″彛璁惧鎶撴媿鏁版嵁鍑嗙‘鎬с�乽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);
+ calculator.calculate(results);
+ }
+
+ public void infoAccuracyTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
//璁＄畻杞﹁締鍗″彛淇℃伅閲囬泦鍑嗙‘鐜�
Query query = new Query();
@@ -48,9 +60,10 @@
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_InfoAccuracy);
calculator.calculate(results);
}
- public void snapShopDelay(){
+
+ 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))
@@ -59,7 +72,8 @@
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_SnapshotDelay);
calculator.calculate(results);
}
- public void snapShopDataIntegrity(){
+
+ public void snapShopDataIntegrity() {
Date yesterday = DateUtils.addDays(new Date(), -1);
//璁＄畻杞﹁締鏁版嵁鎶撴媿瀹屾暣鎬�
Query query = new Query();
@@ -70,23 +84,7 @@
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);
- }
-
- public void CarClockAccuracyTask(){
+ public void CarClockAccuracyTask() {
Date yesterday = DateUtils.addDays(new Date(), -1);
//璁＄畻杞﹁締鍗″彛璁惧鏃堕挓鍑嗙‘鎬�
Query query = new Query();
@@ -96,4 +94,9 @@
CalculationStrategy calculator = IndexCalculationFactory.getCalculator(CalculationStrategyConstants.Car_ClockAccuracy);
calculator.calculate(results);
}
+
+ public void test() {
+ Date yesterday = DateUtils.addDays(new Date(), -1);
+ //TODO锛氫竴鏈轰竴妗� 鑱旂綉鍗″彛璁惧鐩綍涓�鑷寸巼 鍙杛edis
+ }
}
--
Gitblit v1.8.0