From 9b55891e6dd57bc244e6c5654434b32e05c83496 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 25 九月 2024 15:10:25 +0800
Subject: [PATCH] 异常监控排除已经审核过的工单作为状态
---
ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java | 92 ++++++++++++---------------------------------
1 files changed, 25 insertions(+), 67 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
index 0cdabf8..fa1db09 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceInFoAccuracyCalculation.java
@@ -1,78 +1,46 @@
package com.ycl.calculate;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.domain.entity.CheckIndexFace;
-import com.ycl.platform.domain.entity.TMonitor;
import com.ycl.platform.domain.result.HK.MonitoringDetailResult;
import com.ycl.platform.mapper.CheckIndexFaceMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexFaceService;
-import com.ycl.platform.service.ITMonitorService;
-import com.ycl.system.mapper.SysConfigMapper;
import constant.ApiConstants;
-import constant.CheckConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
import utils.DateUtils;
import java.math.BigDecimal;
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
/**
* 浜鸿劯鍗″彛淇℃伅閲囬泦鍑嗙‘鐜� 璁惧缂栫爜銆佽鏀垮尯鍒掍唬鐮併�佸畨瑁呬綅缃�佸潗鏍囩粡绾害淇℃伅瀹屾暣鍑嗙‘
+ * 閲囬泦璁惧灞炴�х洃娴嬫帴鍙�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class FaceInFoAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<MonitoringDetailResult> {
+@Slf4j
+public class FaceInFoAccuracyCalculation extends IndexCalculationServe<MonitoringDetailResult, FaceInFoAccuracyCalculation.AreaStats> implements CalculationStrategy<MonitoringDetailResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@Autowired
private ICheckIndexFaceService checkIndexFaceService;
- @Autowired
- private SysConfigMapper sysConfigMapper;
- @Autowired
- private ITMonitorService monitorService;
- @Autowired
- private TMonitorMapper monitorMapper;
//鍖哄煙杞﹁締淇℃伅閲囬泦鍑嗙‘鐜囩殑鍐呴儴绫�
- private static class AreaStats {
+ protected static class AreaStats {
int totalSites = 0;
int qualifySite = 0;
}
@Override
public void calculate(List<MonitoringDetailResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- return;
- }
- //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
- //TODO锛歮onitor鍘绘帀浜哾eptId
- Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
- .in("serial_number", list.stream().map(MonitoringDetailResult::getExternalIndexCode).collect(Collectors.toList())))
- .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
-
- for (MonitoringDetailResult result : list) {
- TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
- if (monitor == null) continue;
-
- String deptId = monitor.getDeptId().toString();
-
- updateAreaStats(areaStatsMap, deptId, result);
-
- // 澶勭悊鐪佸巺鏁版嵁
- if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = "Province_" + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result);
- }
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, FaceInFoAccuracyCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());
@@ -80,7 +48,9 @@
areaStatsMap.forEach((deptId, stats) -> {
if (stats.totalSites > 0) {
CheckIndexFace checkIndexFace = createOrUpdateCheckIndexFace(deptId, stats, checkIndexFaceList);
- checkIndexFaces.add(checkIndexFace);
+ if (checkIndexFace != null) {
+ checkIndexFaces.add(checkIndexFace);
+ }
}
});
@@ -91,7 +61,8 @@
/**
* 绱鎬荤偣浣嶆暟銆佹爣娉ㄥ紓甯哥偣浣嶆暟
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitoringDetailResult result) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitoringDetailResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
@@ -101,31 +72,18 @@
}
/**
- * 杞﹁締淇℃伅閲囬泦姝ｇ‘鐜�
+ * 浜鸿劯淇℃伅閲囬泦姝ｇ‘鐜�
*/
private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList) {
- CheckIndexFace checkIndexFace;
-
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
- Optional<CheckIndexFace> existingFace = checkIndexFaceList.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 (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> siteOnlineParam = new HashMap<>();
- siteOnlineParam.put("totalSites", stats.totalSites);
- siteOnlineParam.put("qualifySite", stats.qualifySite);
- BigDecimal infoAccuracy = InfoAccuracy(siteOnlineParam);
+ Map<String, Object> param = new HashMap<>();
+ param.put("totalSites", stats.totalSites);
+ param.put("qualifySite", stats.qualifySite);
+ BigDecimal infoAccuracy = infoAccuracy(param);
checkIndexFace.setFaceInformationCollectionAccuracy(infoAccuracy);
return checkIndexFace;
}
--
Gitblit v1.8.0