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/FaceSnapshotDelayCalculation.java | 26 ++++++-------------------- 1 files changed, 6 insertions(+), 20 deletions(-) diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java index 8013800..49ad0e3 100644 --- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java +++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDelayCalculation.java @@ -30,8 +30,6 @@ @Autowired private CheckIndexFaceMapper checkIndexFaceMapper; @Autowired - private SysConfigMapper sysConfigMapper; - @Autowired private ITMonitorService monitorService; @Autowired private ICheckIndexFaceService checkIndexFaceService; @@ -81,7 +79,9 @@ areaStatsMap.forEach((deptId, stats) -> { if (stats.totalCount > 0) { CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList); - checkIndexFaces.add(checkIndexFace); + if (checkIndexFace != null) { + checkIndexFaces.add(checkIndexFace); + } } }); @@ -105,24 +105,10 @@ * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭�� */ private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) { - CheckIndexFace checkIndexFace; - - // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁 - Optional<CheckIndexFace> existingFace = checkIndexFaceList.stream() - .filter(face -> key.equals(face.getDeptId().toString()) && - (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(face.getExamineTag()) - : CheckConstants.Examine_Tag_County.equals(face.getExamineTag()))) - .findFirst(); - - if (existingFace.isPresent()) { - checkIndexFace = existingFace.get(); - } else { - checkIndexFace = new CheckIndexFace(); - checkIndexFace.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key)); - checkIndexFace.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County); - checkIndexFace.setCreateTime(new Date()); + CheckIndexFace checkIndexFace = getCheckIndex(key, checkIndexFaceList, CheckIndexFace.class); + if (checkIndexFace == null) { + return null; } - //璋冪敤鎶撴媿涓婁紶鍙婃椂鎬ц绠楁柟娉� Map<String, Object> param = new HashMap<>(); param.put("totalCount", stats.totalCount); -- Gitblit v1.8.0