From 9de954bafc2cfe186eaefc0e99fa5fc292a8d45b Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 09 九月 2024 18:13:04 +0800
Subject: [PATCH] 一机一档注册率档案考核比优化

---
 ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java |   64 ++++++++-----------------------
 1 files changed, 17 insertions(+), 47 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
index 743c65a..2640919 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceSnapshotDataCalculation.java
@@ -39,7 +39,7 @@
  */
 @Component
 @Slf4j
-public class FaceSnapshotDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
+public class FaceSnapshotDataCalculation extends IndexCalculationServe<SnapshotDataMonitorResult, FaceSnapshotDataCalculation.AreaStats> implements CalculationStrategy<SnapshotDataMonitorResult> {
     @Autowired
     private CheckIndexFaceMapper checkIndexFaceMapper;
     @Autowired
@@ -53,7 +53,7 @@
     @Autowired
     private SysDictDataMapper dictDataMapper;
     //鍖哄煙浜鸿劯鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
-    private static class AreaStats {
+    protected static class AreaStats {
         int totalSites = 0;
         int onlineSites = 0;
         int totalDataSum = 0;
@@ -61,17 +61,10 @@
 
     @Override
     public void calculate(List<SnapshotDataMonitorResult> list) {
-        if (CollectionUtils.isEmpty(list)) {
-            log.info("鏁版嵁涓虹┖");
-            return;
-        }
-        //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList()))
-                .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
-        //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
-        List<String> provinceIds = getProvince();
+        //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+        Map<String, FaceSnapshotDataCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+        if (areaStatsMap == null) return;
 
-        Map<String, AreaStats> areaStatsMap = new HashMap<>();
         // 鑾峰彇褰撳墠鏃ユ湡
         LocalDate today = LocalDate.now();
         // 鑾峰彇鏈湀鐨勭涓�澶�
@@ -81,23 +74,6 @@
             // 濡傛灉鏄紝鍒欐竻闄edis涓褰曚腑鏂鏁扮殑鏁版嵁
             redisTemplate.delete(RedisConstant.Check_Face_ViewConnect);
         }
-        for (SnapshotDataMonitorResult result : list) {
-            TMonitorVO 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 = ApiConstants.Province + deptId;
-                updateAreaStats(areaStatsMap, provinceKey, result);
-            }
-        }
-
-//        //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
-//        BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Face_City);
-//        BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Face_County);
         //浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺
         List<SysDictData> faceSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_FACE_SNAP);
         // 鏌ヨ浠婃棩鏁版嵁
@@ -116,7 +92,8 @@
     }
 
     //绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
-    private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) {
+    @Override
+    public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) {
         //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
         AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
         stats.totalSites++;
@@ -126,14 +103,6 @@
         }
     }
 
-//    //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊�
-//    private BigDecimal getAverageCount(String configKey) {
-//        String count = sysConfigMapper.checkConfigKeyUnique(configKey).getConfigValue();
-//        return new BigDecimal(count)
-//                .multiply(new BigDecimal(CheckSnapCountConstants.Multiply))
-//                .divide(new BigDecimal(CheckSnapCountConstants.CountyNum), 10, RoundingMode.HALF_UP)
-//                .divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP);
-//    }
 
     //杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
     private CheckIndexFace createOrUpdateCheckIndexFace(String key, AreaStats stats, List<CheckIndexFace> checkIndexFaceList,List<SysDictData> faceSnap) {
@@ -163,15 +132,16 @@
         if (stats.totalDataSum != 0) {
             Integer deptId = key.startsWith(ApiConstants.Province) ? Integer.parseInt(key.split("_")[1]) : Integer.parseInt(key);
             String dictKey = key.startsWith(ApiConstants.Province) ? ApiConstants.Province+ AreaDeptEnum.fromDept(deptId).getCode() : ApiConstants.County+AreaDeptEnum.fromDept(deptId).getCode();
-            String value = faceSnap.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(dictKey)).findFirst().get().getDictValue();
-
-
-            Map<String, Object> viewConnectParam = new HashMap<>();
-            viewConnectParam.put("totalDataSum", stats.totalDataSum);
-            viewConnectParam.put("avgCount", new BigDecimal(value).multiply(new BigDecimal(CheckConstants.MultiplyNum)).divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP));
-            BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
-            viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE);
-            checkIndexFace.setViewConnectStability(viewConnectStability);
+            Optional<SysDictData> first = faceSnap.stream().filter(sysDictData -> sysDictData.getDictLabel().equals(dictKey)).findFirst();
+            if(first.isPresent()) {
+                String value = first.get().getDictValue();
+                Map<String, Object> viewConnectParam = new HashMap<>();
+                viewConnectParam.put("totalDataSum", stats.totalDataSum);
+                viewConnectParam.put("avgCount", new BigDecimal(value).multiply(new BigDecimal(CheckConstants.MultiplyNum)).divide(new BigDecimal(LocalDate.now().getDayOfMonth()), 0, RoundingMode.HALF_UP));
+                BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
+                viewConnectStability = viewConnectStability.subtract(new BigDecimal(deductScore)).max(BigDecimal.ZERO).min(BigDecimal.ONE);
+                checkIndexFace.setViewConnectStability(viewConnectStability);
+            }
         } else {
             noDateCount++;
         }

--
Gitblit v1.8.0