From 4ac87bb3275667c02bc60012ebb9fc1eeab6da5b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 17:12:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
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 64e8cd4..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
* 鏇存柊鎴栨柊澧�
*/
@@ -79,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);
+ }
}
});
@@ -94,13 +97,13 @@
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
//90%鍙婁互涓婃暟鎹悎鏍煎垯姝よ溅杈嗗崱鍙ｈ澶囪瑙嗕负鎶撴媿鏁版嵁瀹屾暣
- if(result.getMainNoIntegrityPercent() <= 0.1){
+ if (result.getMainNoIntegrityPercent() <= 0.1) {
stats.integritySites++;
}
//閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬�
- if(importantIds.contains(key)){
+ if (importantIds.contains(key)) {
stats.importantTotalSites++;
- if(result.getNoIntegrityPercent() <= 0.1){
+ if (result.getNoIntegrityPercent() <= 0.1) {
stats.importantIntegritySites++;
}
}
@@ -110,7 +113,10 @@
* 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜�
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) {
- CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList);
+ CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
+ if (checkIndexCar == null) {
+ return null;
+ }
//璋冪敤璁＄畻鏂规硶
Map<String, Object> param = new HashMap<>();
param.put("totalSites", stats.totalSites);
--
Gitblit v1.8.0