From cb415813de667096290d6bd0f924f5b523104117 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期一, 10 十一月 2025 17:41:04 +0800
Subject: [PATCH] 报备工单bug修改，定时任务在线问题修改新增导出扣分明细功能
---
ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java | 68 ++++++---------------------------
1 files changed, 13 insertions(+), 55 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java
index a483526..57da735 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/FaceConsistentCalculation.java
@@ -1,87 +1,44 @@
package com.ycl.calculate;
-import com.alibaba.fastjson2.JSONArray;
import com.ycl.platform.domain.entity.CheckIndexFace;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.vo.TMonitorVO;
+import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
import com.ycl.platform.mapper.CheckIndexFaceMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexFaceService;
-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;
/**
- * 璁＄畻杞﹁締鐩綍涓�鑷寸巼
+ * 璁＄畻浜鸿劯鐩綍涓�鑷寸巼
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class FaceConsistentCalculation extends IndexCalculationServe implements CalculationStrategy<TMonitorVO> {
+@Slf4j
+public class FaceConsistentCalculation extends IndexCalculationServe<MonitorQualifyResult, FaceConsistentCalculation.AreaStats> implements CalculationStrategy<MonitorQualifyResult> {
@Autowired
private CheckIndexFaceMapper checkIndexFaceMapper;
@Autowired
- private TMonitorMapper monitorMapper;
- @Autowired
private ICheckIndexFaceService checkIndexFaceService;
- @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_Face+"")).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, FaceConsistentCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexFace> checkIndexFaceList = checkIndexFaceMapper.selectToday(DateUtils.getDate());
@@ -101,11 +58,12 @@
/**
* 绱浜鸿劯鐩綍涓�鑷寸巼
*/
- 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