From 2eb6984d4decf5079350a7d5d49dd138a16dff82 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期五, 02 八月 2024 11:26:18 +0800
Subject: [PATCH] 车辆数据抓拍准确性
---
ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java | 48 ++++++++++++++++++------------------------------
1 files changed, 18 insertions(+), 30 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java
index 9cf047a..f4bdbf2 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarSiteOnlineCalculation.java
@@ -18,6 +18,7 @@
import java.math.BigDecimal;
import java.math.RoundingMode;
+import java.time.LocalDate;
import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
@@ -29,7 +30,7 @@
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class CarSiteOnlineCalculation implements CalculationStrategy<SnapshotDataMonitorResult> {
+public class CarSiteOnlineCalculation extends IndexCalculationServe implements CalculationStrategy<SnapshotDataMonitorResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
@@ -51,14 +52,15 @@
if (CollectionUtils.isEmpty(list)) {
return;
}
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
+
+ //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
.in("serial_number", list.stream().map(SnapshotDataMonitorResult::getExternalIndexCode).collect(Collectors.toList())))
.stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
+ //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
+ List<String> provinceIds = getProvince();
- // TODO: 鍒嗙渷鍘呭競灞� 闇�瑕佽ˉ鍏呴泦鍚堟暟鎹�
- List<String> provinceIds = new ArrayList<>(); // 杩欓噷闇�瑕佹牴鎹偣浣嶈ˉ鍏�
-
+ Map<String, AreaStats> areaStatsMap = new HashMap<>();
for (SnapshotDataMonitorResult result : list) {
TMonitor monitor = monitorMap.get(result.getExternalIndexCode());
if (monitor == null) continue;
@@ -77,7 +79,7 @@
BigDecimal cityCountAvg = getAverageCount(CheckSnapCountConstants.City);
BigDecimal countyCountAvg = getAverageCount(CheckSnapCountConstants.County);
- // 鏌ヨ浠婃棩鏁版嵁
+ // 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
List<CheckIndexCar> checkIndexCars = new ArrayList<>();
areaStatsMap.forEach((deptId, stats) -> {
@@ -90,7 +92,7 @@
checkIndexCarService.saveOrUpdateBatch(checkIndexCars);
}
- //绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺
+ /** 绱鎬荤偣浣嶆暟銆佺绾挎暟銆佹�绘姄鎷嶉噺 */
private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, SnapshotDataMonitorResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
@@ -102,44 +104,30 @@
}
}
- //鑾峰彇2022鍚屾湡鎶撴媿骞冲潎鍊�
+ /** 鑾峰彇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), 0, RoundingMode.HALF_UP);
+ 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) {
- CheckIndexCar checkIndexCar;
-
- // 妫�鏌ユ槸鍚﹀凡瀛樺湪浠婃棩鏁版嵁
- Optional<CheckIndexCar> existingCar = checkIndexCarList.stream()
- .filter(car -> key.equals(car.getDeptId().toString()) &&
- (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(car.getExamineTag())
- : CheckConstants.Examine_Tag_County.equals(car.getExamineTag())))
- .findFirst();
-
- if (existingCar.isPresent()) {
- checkIndexCar = existingCar.get();
- } else {
- checkIndexCar = new CheckIndexCar();
- checkIndexCar.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
- checkIndexCar.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
- checkIndexCar.setCreateTime(new Date());
- }
+ CheckIndexCar checkIndexCar = getCheckIndex(key, checkIndexCarList);
//璋冪敤鐐逛綅鍦ㄧ嚎璁＄畻鏂规硶
Map<String, Object> siteOnlineParam = new HashMap<>();
siteOnlineParam.put("totalSites", stats.totalSites);
siteOnlineParam.put("offlineSites", stats.offlineSites);
- BigDecimal siteOnline = IndexCalculationUtils.siteOnline(siteOnlineParam);
+ BigDecimal siteOnline = siteOnline(siteOnlineParam);
checkIndexCar.setSiteOnline(siteOnline);
//瑙嗗浘搴撳鎺ョǔ瀹氭��
BigDecimal avgCount = key.startsWith("Province_") ? cityCountAvg : countyCountAvg;
Map<String, Object> viewConnectParam = new HashMap<>();
viewConnectParam.put("totalDataSum", stats.totalDataSum);
viewConnectParam.put("avgCount", avgCount);
- BigDecimal viewConnectStability = IndexCalculationUtils.viewConnectStability(viewConnectParam);
+ BigDecimal viewConnectStability = viewConnectStability(viewConnectParam);
checkIndexCar.setViewConnectStability(viewConnectStability);
return checkIndexCar;
}
--
Gitblit v1.8.0