From 7006d2e6e6c0281e4effc7fc70719af91b0c4982 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 30 九月 2024 12:23:46 +0800
Subject: [PATCH] 工单取图片优化
---
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 73 +++++++-----------------------------
1 files changed, 14 insertions(+), 59 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
index fbf7d2a..46361a1 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -2,34 +2,29 @@
import com.ycl.platform.domain.entity.CheckIndexCar;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
-import com.ycl.platform.domain.vo.TMonitorVO;
import com.ycl.platform.mapper.CheckIndexCarMapper;
-import com.ycl.platform.mapper.TMonitorMapper;
import com.ycl.platform.service.ICheckIndexCarService;
import com.ycl.system.entity.SysDictData;
-import com.ycl.system.mapper.SysConfigMapper;
-import com.ycl.system.mapper.SysDeptMapper;
import com.ycl.system.mapper.SysDictDataMapper;
-import com.ycl.system.mapper.SysDictTypeMapper;
import com.ycl.utils.DateUtils;
-import constant.*;
+import constant.ApiConstants;
+import constant.CheckConstants;
+import constant.CheckThreadConstants;
+import constant.RedisConstant;
import enumeration.general.AreaDeptEnum;
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 java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
/**
- * 璁＄畻杞﹁締鐐逛綅鍦ㄧ嚎鐜囥�佽鍥惧簱瀵规帴绋冲畾鎬�
+ * 璁＄畻杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭��
* 鎶撴媿鏁版嵁閲忕洃娴嬬粨鏋滄帴鍙ｆ暟鎹�
* 鑾峰彇鍒嗙渷鍘呫�佸尯鍩熺殑map<k,v> k涓篸eptId鎴栬�匬rovince_deptId
* 寰幆map璁＄畻鐐逛綅鍦ㄧ嚎鐜�
@@ -37,40 +32,27 @@
*/
@Component
@Slf4j
-public class CarSnapshopDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
+public class CarSnapshopDataCalculation extends IndexCalculationServe<SnapshotDataMonitorResult, CarSnapshopDataCalculation.AreaStats> implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
- @Autowired
- private SysConfigMapper sysConfigMapper;
- @Autowired
- private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexCarService checkIndexCarService;
@Autowired
private RedisTemplate redisTemplate;
@Autowired
private SysDictDataMapper dictDataMapper;
- //鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
- private static class AreaStats {
+ //鍖哄煙杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭�х殑鍐呴儴绫�
+ protected static class AreaStats {
int totalSites = 0;
- int onlineSites = 0;
int totalDataSum = 0;
}
@Override
public void calculate(List<SnapshotDataMonitorResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- log.info("鏁版嵁涓虹┖");
- return;
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, CarSnapshopDataCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ if (areaStatsMap == null) return;
- //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈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, AreaStats> areaStatsMap = new HashMap<>();
// 鑾峰彇褰撳墠鏃ユ湡
LocalDate today = LocalDate.now();
// 鑾峰彇鏈湀鐨勭涓�澶�
@@ -80,23 +62,6 @@
// 濡傛灉鏄紝鍒欐竻闄edis涓褰曚腑鏂鏁扮殑鏁版嵁
redisTemplate.delete(RedisConstant.Check_Car_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.Car_City);
-// BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
//浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺
List<SysDictData> carSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_CAR_SNAP);
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
@@ -117,20 +82,20 @@
/**
* 绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
*/
- 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++;
if (ApiConstants.HK_SnapCount_ResultType_Null != result.getResultType()) {
- stats.onlineSites++;
stats.totalDataSum += result.getDataCount();
}
}
/**
- * 杞﹁締鐐逛綅鍦ㄧ嚎鐜囧拰瑙嗗浘搴撳鎺ョǔ瀹氭��
+ * 杞﹁締瑙嗗浘搴撳鎺ョǔ瀹氭��
*/
private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList,List<SysDictData> carSnap) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
@@ -138,16 +103,6 @@
return null;
}
- //璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
- if (stats.totalSites >= CheckThreadConstants.Check_Car_SiteOnline) {
- Map<String, Object> siteOnlineParam = new HashMap<>();
- siteOnlineParam.put("totalSites", stats.totalSites);
- siteOnlineParam.put("onlineSites", stats.onlineSites);
- BigDecimal siteOnline = siteOnline(siteOnlineParam);
- checkIndexCar.setSiteOnline(siteOnline.min(BigDecimal.ONE));
- } else {
- checkIndexCar.setSiteOnline(BigDecimal.ZERO);
- }
//瑙嗗浘搴撳鎺ョǔ瀹氭��
//Redis璁板綍璇ュ尯鍘垮綋鏈堟棤鏁版嵁涓婁紶娆℃暟
Integer noDateCount = (Integer) redisTemplate.opsForHash().get(RedisConstant.Check_Car_ViewConnect, key);
--
Gitblit v1.8.0