From a390bf9b486fcb038c3c034ae7685461958b636f Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期五, 02 八月 2024 17:03:01 +0800 Subject: [PATCH] 数据中心controller --- ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java | 26 ++++++-------------------- 1 files changed, 6 insertions(+), 20 deletions(-) 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 f58e3e9..dd8fcca 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshotDelayCalculation.java @@ -35,8 +35,6 @@ @Autowired private CheckIndexCarMapper checkIndexCarMapper; @Autowired - private SysConfigMapper sysConfigMapper; - @Autowired private ITMonitorService monitorService; @Autowired private ICheckIndexCarService checkIndexCarService; @@ -86,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); + } } }); @@ -110,24 +110,10 @@ * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� */ private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList) { - CheckIndexCar checkIndexCar; - - // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁 - Optional<CheckIndexCar> existingCar = checkIndexCarList.stream() - .filter(car -> key.equals(car.getDeptId().toString()) && - (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(car.getExamineTag()) - : CheckConstants.Examine_Tag_County.equals(car.getExamineTag()))) - .findFirst(); - - if (existingCar.isPresent()) { - checkIndexCar = existingCar.get(); - } else { - checkIndexCar = new CheckIndexCar(); - checkIndexCar.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key)); - checkIndexCar.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County); - checkIndexCar.setCreateTime(new Date()); + CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class); + if (checkIndexCar == null) { + return null; } - //璋冪敤鎶撴媿涓婁紶鍙婃椂鎬ц绠楁柟娉� Map<String, Object> param = new HashMap<>(); param.put("totalCount", stats.totalCount); -- Gitblit v1.8.0