From 0d243e7f5dc593cdc6e0608bb52cd635f8fc6982 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 19 九月 2025 11:59:44 +0800
Subject: [PATCH] 新需求
---
ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java | 63 +++++++++----------------------
1 files changed, 19 insertions(+), 44 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
index 0da2576..8c2dd89 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarClockAccuracyCalculation.java
@@ -2,78 +2,52 @@
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.SnapshotDataMonitorResult;
+import com.ycl.platform.domain.entity.YwPoint;
import com.ycl.platform.domain.result.HK.VehicleDeviceInspectionResult;
import com.ycl.platform.mapper.CheckIndexCarMapper;
+import com.ycl.platform.mapper.TMonitorMapper;
+import com.ycl.platform.mapper.YwPointMapper;
import com.ycl.platform.service.ICheckIndexCarService;
-import com.ycl.platform.service.ITMonitorService;
-import com.ycl.system.mapper.SysConfigMapper;
-import constant.ApiConstants;
-import constant.CheckSnapCountConstants;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
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.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
* 寰幆map璁＄畻鏃堕挓鍑嗙‘鎬�
* 鏇存柊鎴栨柊澧�
*/
@Component
-public class CarClockAccuracyCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceInspectionResult> {
+@Slf4j
+public class CarClockAccuracyCalculation extends IndexCalculationServe<VehicleDeviceInspectionResult, CarClockAccuracyCalculation.AreaStats> implements CalculationStrategy<VehicleDeviceInspectionResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
- private ITMonitorService monitorService;
+ private TMonitorMapper monitorMapper;
@Autowired
private ICheckIndexCarService checkIndexCarService;
//鍖哄煙杞﹁締鏃堕挓鍑嗙‘鎬х殑鍐呴儴绫�
- private static class AreaStats {
+ protected static class AreaStats {
int totalSites = 0;
int accuracySites = 0;
}
@Override
public void calculate(List<VehicleDeviceInspectionResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- return;
- }
-
- //鑾峰緱鍥芥爣鐮佷负key鐨勮澶噈ap
- Map<String, TMonitor> monitorMap = monitorService.list(new QueryWrapper<TMonitor>()
- .in("serial_number", list.stream().map(VehicleDeviceInspectionResult::getExternalIndexCode).collect(Collectors.toList())))
- .stream().collect(Collectors.toMap(TMonitor::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
-
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
- for (VehicleDeviceInspectionResult result : list) {
- TMonitor 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 = "Province_" + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result);
- }
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, AreaStats> areaStatsMap = getAreaStatsMap(list,Boolean.FALSE);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
@@ -93,12 +67,13 @@
/**
* 绱鏃堕挓鍚堟牸璁惧
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VehicleDeviceInspectionResult result) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VehicleDeviceInspectionResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
stats.totalSites++;
//鏃堕挓鍑嗙‘鐜囧ぇ浜�90%涓哄悎鏍艰澶�
- if (result.getSnapClock().getClockPercent() >= 0.9) {
+ if (result.getSnapClock()!=null && result.getSnapClock().getClockPercent()!=null && result.getSnapClock().getClockPercent() >= 0.9) {
stats.accuracySites++;
}
}
@@ -112,10 +87,10 @@
return null;
}
//璋冪敤鏃堕挓鍑嗙‘鎬ц绠楁柟娉�
- Map<String, Object> siteOnlineParam = new HashMap<>();
- siteOnlineParam.put("totalSites", stats.totalSites);
- siteOnlineParam.put("accuracySites", stats.accuracySites);
- BigDecimal clockAccuracy = clockAccuracy(siteOnlineParam);
+ Map<String, Object> clockAccuracyParam = new HashMap<>();
+ clockAccuracyParam.put("totalSites", stats.totalSites);
+ clockAccuracyParam.put("accuracySites", stats.accuracySites);
+ BigDecimal clockAccuracy = clockAccuracy(clockAccuracyParam);
checkIndexCar.setVehicleTimingAccuracy(clockAccuracy);
return checkIndexCar;
}
--
Gitblit v1.8.0