From 1fc5877f61c9b15f5daa5f328f9deae2e8a50e84 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 02 八月 2024 17:30:52 +0800
Subject: [PATCH] 考核规则表增加apiUrl字段
---
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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..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);
+ }
}
});
@@ -94,13 +96,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 +112,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