From cd24a045bd9ee29505ddc9760d25f5d4037f4f0c Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 05 九月 2024 21:55:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 110 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 71 insertions(+), 39 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 f26b39c..fbf7d2a 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -1,27 +1,29 @@
package com.ycl.calculate;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.ycl.platform.domain.entity.CheckIndexCar;
-import com.ycl.platform.domain.entity.TMonitor;
-import com.ycl.platform.domain.result.HK.CrossDetailResult;
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.platform.service.ITMonitorService;
+import com.ycl.system.entity.SysDictData;
import com.ycl.system.mapper.SysConfigMapper;
-import constant.ApiConstants;
-import constant.CheckConstants;
-import constant.CheckSnapCountConstants;
+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 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 utils.DateUtils;
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;
@@ -34,6 +36,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
+@Slf4j
public class CarSnapshopDataCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@@ -43,7 +46,10 @@
private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexCarService checkIndexCarService;
-
+ @Autowired
+ private RedisTemplate redisTemplate;
+ @Autowired
+ private SysDictDataMapper dictDataMapper;
//鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
private static class AreaStats {
int totalSites = 0;
@@ -54,6 +60,7 @@
@Override
public void calculate(List<SnapshotDataMonitorResult> list) {
if (CollectionUtils.isEmpty(list)) {
+ log.info("鏁版嵁涓虹┖");
return;
}
@@ -64,6 +71,15 @@
List<String> provinceIds = getProvince();
Map<String, AreaStats> areaStatsMap = new HashMap<>();
+ // 鑾峰彇褰撳墠鏃ユ湡
+ LocalDate today = LocalDate.now();
+ // 鑾峰彇鏈湀鐨勭涓�澶�
+ LocalDate firstDayOfMonth = today.with(TemporalAdjusters.firstDayOfMonth());
+ // 鍒ゆ柇浠婂ぉ鏄惁鏄湰鏈堢殑绗竴澶�
+ if (today.equals(firstDayOfMonth)) {
+ // 濡傛灉鏄紝鍒欐竻闄edis涓褰曚腑鏂鏁扮殑鏁版嵁
+ redisTemplate.delete(RedisConstant.Check_Car_ViewConnect);
+ }
for (SnapshotDataMonitorResult result : list) {
TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
if (monitor == null) continue;
@@ -73,21 +89,22 @@
// 澶勭悊鐪佸巺鏁版嵁
if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = "Province_" + deptId;
+ String provinceKey = ApiConstants.Province + deptId;
updateAreaStats(areaStatsMap, provinceKey, result);
}
}
- //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
- BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
- BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
-
+// //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊� 鐪佸巺銆佸競灞�
+// BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.Car_City);
+// BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.Car_County);
+ //浠庡瓧鍏歌幏鍙栧悓鏈熸姄鎷嶉噺
+ List<SysDictData> carSnap = dictDataMapper.selectDictDataByType(CheckConstants.DICT_CAR_SNAP);
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
List<CheckIndexCar> checkIndexCars = new ArrayList<>();
- areaStatsMap.forEach((deptId, stats) -> {
+ areaStatsMap.forEach((key, stats) -> {
if (stats.totalSites > 0) {
- CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(deptId, stats, cityCountAvg, countyCountAvg, checkIndexCarList);
+ CheckIndexCar checkIndexCar = createOrUpdateCheckIndexCar(key, stats, checkIndexCarList,carSnap);
if (checkIndexCar != null) {
checkIndexCars.add(checkIndexCar);
}
@@ -104,45 +121,60 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
+
if (ApiConstants.HK_SnapCount_ResultType_Null != result.getResultType()) {
stats.onlineSites++;
- } else {
stats.totalDataSum += result.getDataCount();
}
- }
- /**
- * 鑾峰彇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 CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, BigDecimal cityCountAvg, BigDecimal countyCountAvg, List<CheckIndexCar> checkIndexCarList) {
+ private CheckIndexCar createOrUpdateCheckIndexCar(String key, AreaStats stats, List<CheckIndexCar> checkIndexCarList,List<SysDictData> carSnap) {
CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList, CheckIndexCar.class);
if (checkIndexCar == null) {
return null;
}
+
//璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
- Map<String, Object> siteOnlineParam = new HashMap<>();
- siteOnlineParam.put("totalSites", stats.totalSites);
- siteOnlineParam.put("onlineSites", stats.onlineSites);
- BigDecimal siteOnline = siteOnline(siteOnlineParam);
- checkIndexCar.setSiteOnline(siteOnline);
+ 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);
+ }
//瑙嗗浘搴撳鎺ョǔ瀹氭��
- BigDecimal avgCount = key.startsWith("Province_") ? cityCountAvg : countyCountAvg;
- Map<String, Object> viewConnectParam = new HashMap<>();
- viewConnectParam.put("totalDataSum", stats.totalDataSum);
- viewConnectParam.put("avgCount", avgCount);
- BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
- checkIndexCar.setViewConnectStability(viewConnectStability);
+ //Redis璁板綍璇ュ尯鍘垮綋鏈堟棤鏁版嵁涓婁紶娆℃暟
+ Integer noDateCount = (Integer) redisTemplate.opsForHash().get(RedisConstant.Check_Car_ViewConnect, key);
+ // 濡傛灉鍊间负null锛屽垯鍒濆鍖栦负0
+ if (noDateCount == null) {
+ noDateCount = 0;
+ }
+ Double deductScore = 0.1 * noDateCount;
+
+ 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();
+ Optional<SysDictData> first = carSnap.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);
+ checkIndexCar.setViewConnectStability(viewConnectStability);
+ }
+ } else {
+ noDateCount++;
+ }
+ // 灏嗘柊鐨勫�兼斁鍥濰ash涓�
+ redisTemplate.opsForHash().put(RedisConstant.Check_Car_ViewConnect, key, noDateCount);
return checkIndexCar;
}
}
--
Gitblit v1.8.0