From b14531e3b850fe6d2fa916ba7b88b3e2bd2ff30a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 11 九月 2024 16:47:48 +0800
Subject: [PATCH] OSD加标签

---
 ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java |   71 +++++++----------------------------
 1 files changed, 14 insertions(+), 57 deletions(-)

diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java
index 3b216a4..fefa01e 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarConsistentCalculation.java
@@ -1,30 +1,19 @@
 package com.ycl.calculate;
 
-import com.alibaba.fastjson2.JSONArray;
 import com.ycl.platform.domain.entity.CheckIndexCar;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.result.HK.DataIntegrityMonitoringResult;
-import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
 import com.ycl.platform.mapper.CheckIndexCarMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
 import com.ycl.platform.service.ICheckIndexCarService;
-import constant.ApiConstants;
-import constant.CheckConstants;
-import constant.RedisConstant;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.util.CollectionUtils;
 import utils.DateUtils;
-import utils.StringUtils;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * 璁＄畻杞﹁締鐩綍涓�鑷寸巼
@@ -32,57 +21,24 @@
  * 鏇存柊鎴栨柊澧�
  */
 @Component
-public class CarConsistentCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
+@Slf4j
+public class CarConsistentCalculation extends IndexCalculationServe<MonitorQualifyResult, CarConsistentCalculation.AreaStats> implements CalculationStrategy<MonitorQualifyResult> {
     @Autowired
     private CheckIndexCarMapper checkIndexCarMapper;
     @Autowired
-    private TMonitorMapper monitorMapper;
-    @Autowired
     private ICheckIndexCarService checkIndexCarService;
-    @Autowired
-    private RedisTemplate redisTemplate;
 
-    //鍖哄煙杞﹁締淇℃伅閲囬泦鍑嗙‘鐜囩殑鍐呴儴绫�
-    private static class AreaStats {
+    //鍖哄煙杞﹁締鐩綍涓�鑷寸巼鐨勫唴閮ㄧ被
+    protected static class AreaStats {
         int totalSites = 0;
         int newSites = 0;
     }
 
     @Override
-    public void calculate(List<TMonitorVO> list) {
-        if (CollectionUtils.isEmpty(list)) {
-            return;
-        }
-        //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
-        Map<String, TMonitorVO> monitorMap = new HashMap<>();
-        if(!CollectionUtils.isEmpty(list)){
-            monitorMap = list.stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
-        }
-        //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
-        List<String> provinceIds = getProvince();
-        //鏈敞鍐岃溅杈嗚澶�
-        Map<String,TMonitor> newMonitorMap = new HashMap<>();
-        //Mongo涓�鏈轰竴妗ｅ悓姝ysql鏃舵斁鍏edis 绛涢�夊嚭杞﹁締妗ｆ
-        String json = (String) redisTemplate.opsForValue().get(RedisConstant.New_Monitor_Set);
-        if (!StringUtils.isEmpty(json)) {
-            List<TMonitor> newMonitors = JSONArray.parseArray(json, TMonitor.class);
-            if(!CollectionUtils.isEmpty(newMonitors)){
-                newMonitorMap = newMonitors.stream().filter(tMonitor -> tMonitor.getCameraFunType().contains(CheckConstants.Rule_Category_Car+"")).collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
-            }
-        }
-        Map<String, AreaStats> areaStatsMap = new HashMap<>();
-        for (TMonitorVO result : list) {
-            TMonitorVO monitor = monitorMap.get(result.getSerialNumber());
-            if (monitor == null) continue;
-            String deptId = monitor.getDeptId().toString();
-            updateAreaStats(areaStatsMap, deptId, result,newMonitorMap);
-
-            // 澶勭悊鐪佸巺鏁版嵁
-            if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
-                String provinceKey = ApiConstants.Province + deptId;
-                updateAreaStats(areaStatsMap, provinceKey, result,newMonitorMap);
-            }
-        }
+    public void calculate(List<MonitorQualifyResult> list) {
+        //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+        Map<String, AreaStats> areaStatsMap = getAreaStatsMap(list);
+        if (areaStatsMap == null) return;
 
         // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
         List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
@@ -95,18 +51,19 @@
                 }
             }
         });
-
         checkIndexCarService.saveOrUpdateBatch(checkIndexCars);
     }
+
 
     /**
      * 绱杞﹁締鐩綍涓�鑷寸巼
      */
-    private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, TMonitorVO result,Map<String,TMonitor> newMonitorMap) {
+    @Override
+    public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, MonitorQualifyResult result) {
         //杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
         AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
         stats.totalSites++;
-        if(newMonitorMap.containsKey(result.getSerialNumber())){
+        if(result.getNewDevice()!=null && result.getNewDevice()){
             stats.newSites++;
         }
     }

--
Gitblit v1.8.0