From cb7d99d810f2356096b67fbccd3fac556e638d83 Mon Sep 17 00:00:00 2001
From: 龚焕茏 <2842157468@qq.com>
Date: 星期四, 22 八月 2024 11:22:56 +0800
Subject: [PATCH] feat：查询条件优化
---
ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java | 75 +++++++++++++++++++++++++++----------
1 files changed, 54 insertions(+), 21 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 926be4b..4abbad3 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSnapshopDataCalculation.java
@@ -1,29 +1,31 @@
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.mapper.SysConfigMapper;
+import com.ycl.utils.DateUtils;
import constant.ApiConstants;
-import constant.CheckConstants;
import constant.CheckSnapCountConstants;
+import constant.CheckThreadConstants;
+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 java.math.BigDecimal;
import java.math.RoundingMode;
import java.time.LocalDate;
-import java.util.*;
+import java.time.temporal.TemporalAdjusters;
+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;
@@ -45,6 +47,8 @@
private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexCarService checkIndexCarService;
+ @Autowired
+ private RedisTemplate redisTemplate;
//鍖哄煙杞﹁締鐐逛綅鍦ㄧ嚎鎸囨爣鐨勫唴閮ㄧ被
private static class AreaStats {
@@ -67,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;
@@ -88,9 +101,9 @@
// 鏌ヨ鏄惁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, cityCountAvg, countyCountAvg, checkIndexCarList);
if (checkIndexCar != null) {
checkIndexCars.add(checkIndexCar);
}
@@ -107,11 +120,12 @@
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑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();
}
+
}
/**
@@ -133,19 +147,38 @@
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(ApiConstants.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) {
+ BigDecimal avgCount = key.startsWith(ApiConstants.Province) ? cityCountAvg : countyCountAvg;
+ Map<String, Object> viewConnectParam = new HashMap<>();
+ viewConnectParam.put("totalDataSum", stats.totalDataSum);
+ viewConnectParam.put("avgCount", avgCount);
+ 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