From 19d18187bf7f3f51e9ebdfd7eef369d1b3cb6829 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 16 八月 2024 15:34:31 +0800
Subject: [PATCH] 批量数量调整为500
---
ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 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 5a09508..8863fb4 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDataIntegrityCalculation.java
@@ -6,6 +6,7 @@
import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.HK.CrossDetailResult;
import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
+import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexCarMapper;
import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexCarService;
@@ -24,7 +25,8 @@
import java.util.stream.Collectors;
/**
- * 璁＄畻杞﹁締鏁版嵁瀹屾暣鎬�
+ * 璁＄畻杞﹁締鏁版嵁瀹屾暣鎬э紙妫�娴嬭溅鐗屽彿銆佽溅鐗岄鑹插暐鐨勫悎涓嶅悎鏍囧噯
+ * 閲囩敤鏁版嵁瀹屾暣鎬х洃娴嬫帴鍙�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
@@ -33,7 +35,7 @@
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
- private ITMonitorService monitorService;
+ private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexCarService checkIndexCarService;
@@ -51,24 +53,22 @@
return;
}
//杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
- //TODO锛歮onitor鍘绘帀浜哾eptId
- Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
- .in("serial_number", list.stream().map(DataIntegrityMonitoringResult::getExternalIndexCode).collect(Collectors.toList())))
- .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+ Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(DataIntegrityMonitoringResult::getExternalIndexCode).collect(Collectors.toList()))
+ .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
//鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
List<String> provinceIds = getProvince();
//鑾峰彇閲嶇偣鐐逛綅闆嗗悎
List<String> importantIds = getImportant();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (DataIntegrityMonitoringResult result : list) {
- TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
+ TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
if (monitor == null) continue;
String deptId = monitor.getDeptId().toString();
updateAreaStats(areaStatsMap, deptId, result, importantIds);
// 澶勭悊鐪佸巺鏁版嵁
if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = "Province_" + deptId;
+ String provinceKey = ApiConstants.Province + deptId;
updateAreaStats(areaStatsMap, provinceKey, result, importantIds);
}
}
@@ -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);
--
Gitblit v1.8.0