From d2d069b2fdb68b37c9f850b9798882d383c2fd51 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 03 九月 2024 11:42:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 27 ++++++++++++++++-----------
1 files changed, 16 insertions(+), 11 deletions(-)
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 651d501..f4b1ed6 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -23,7 +23,7 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻杞﹁締灞炴�ц瘑鍒噯纭巼銆乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ * 璁＄畻杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
* 杞﹁締鏁版嵁鎶芥鎺ュ彛
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
@@ -108,7 +108,7 @@
stats.accuracySites++;
}
//閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬�
- if (importantIds.contains(key)) {
+ if (importantIds.contains(result.getExternalIndexCode())) {
stats.importantTotalSites++;
if (vehDiff.getImportantConPercent() >= 0.9) {
stats.importantAccuracySites++;
@@ -118,25 +118,28 @@
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++;
+ if (bigUseful.getSampleCount() != 0) {
+ //鍥剧墖璁块棶姝ｅ父閲� = 鎶芥閲�-寮傚父閲�
+ 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鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
+ * 杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬с�乽rl鍙敤鎬с�佸ぇ鍥惧彲鐢ㄦ��
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
if (checkIndexCar == null) {
return null;
}
- //璋冪敤淇℃伅閲囬泦姝ｇ‘鐜囪绠楁柟娉�
+ log.info("key:{},杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬э細totalSites锛歿}锛宨mportantTotalSites:{}锛宎ccuracySites:{}锛宨mportantAccuracySites:{}",key,stats.totalSites,stats.importantTotalSites,stats.accuracySites,stats.importantAccuracySites);
+ //璋冪敤杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬ц绠楁柟娉�
Map<String, Object> accuracyParam = new HashMap<>();
accuracyParam.put("totalSites", stats.totalSites);
accuracyParam.put("importantTotalSites", stats.importantTotalSites);
@@ -144,12 +147,14 @@
accuracyParam.put("importantAccuracySites", stats.importantAccuracySites);
BigDecimal dataAccuracy = dataAccuracy(accuracyParam);
checkIndexCar.setVehicleCaptureAccuracy(dataAccuracy);
+ log.info("url鍙敤鎬�: totalSites:{},urlQualifySites:{}",stats.totalSites,stats.urlUsabilitySites);
//璋冪敤url鍙敤鎬ц绠楁柟娉�
Map<String, Object> urlParam = new HashMap<>();
urlParam.put("totalSites", stats.totalSites);
urlParam.put("urlQualifySites", stats.urlUsabilitySites);
BigDecimal urlUsability = urlUsability(urlParam);
checkIndexCar.setVehicleUrlAvailability(urlUsability);
+ log.info("澶у浘鍙敤鎬�: totalSites:{},picUsabilitySites:{}",stats.totalSites,stats.picUsabilitySites);
//璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
Map<String, Object> usabilityParam = new HashMap<>();
usabilityParam.put("totalSites", stats.totalSites);
--
Gitblit v1.8.0