From d5c2dc44df6e6442b3bb5033cd9ca116777aecbc Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 09 九月 2024 17:47:08 +0800
Subject: [PATCH] 考核指标代码调整
---
ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java | 42 +++++++++++-------------------------------
1 files changed, 11 insertions(+), 31 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
index f4b1ed6..32c1e2f 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/CarDeviceSampleCalculation.java
@@ -30,7 +30,7 @@
*/
@Component
@Slf4j
-public class CarDeviceSampleCalculation extends IndexCalculationServe implements CalculationStrategy<VehicleDeviceSamplingResult> {
+public class CarDeviceSampleCalculation extends IndexCalculationServe<VehicleDeviceSamplingResult, CarDeviceSampleCalculation.AreaStats> implements CalculationStrategy<VehicleDeviceSamplingResult> {
@Autowired
private CheckIndexCarMapper checkIndexCarMapper;
@Autowired
@@ -39,7 +39,7 @@
private ICheckIndexCarService checkIndexCarService;
//鍖哄煙杞﹁締鎶芥鎸囨爣
- private static class AreaStats {
+ protected static class AreaStats {
int totalSites = 0;
int importantTotalSites = 0;
//灞炴�ц瘑鍒噯纭殑鐐逛綅鏁�
@@ -54,30 +54,9 @@
@Override
public void calculate(List<VehicleDeviceSamplingResult> list) {
- if (CollectionUtils.isEmpty(list)) {
- log.info("鏁版嵁涓虹┖");
- return;
- }
- //杩斿洖浠ュ浗鏍囩爜涓簁ey鐨勮澶噈ap
- Map<String, TMonitorVO> monitorMap = monitorMapper.selectListByIds(list.stream().map(VehicleDeviceSamplingResult::getExternalIndexCode).collect(Collectors.toList()))
- .stream().collect(Collectors.toMap(TMonitorVO::getSerialNumber, Function.identity()));
- //鑾峰彇鐪佸巺鍥芥爣鐮侀泦鍚�
- List<String> provinceIds = getProvince();
- //鑾峰彇閲嶇偣鐐逛綅闆嗗悎
- List<String> importantIds = getImportant();
- Map<String, AreaStats> areaStatsMap = new HashMap<>();
- for (VehicleDeviceSamplingResult result : list) {
- TMonitorVO monitor = monitorMap.get(result.getExternalIndexCode());
- if (monitor == null) continue;
- String deptId = monitor.getDeptId().toString();
- updateAreaStats(areaStatsMap, deptId, result, importantIds);
-
- // 澶勭悊鐪佸巺鏁版嵁
- if (!CollectionUtils.isEmpty(provinceIds) && provinceIds.contains(monitor.getSerialNumber())) {
- String provinceKey = ApiConstants.Province + deptId;
- updateAreaStats(areaStatsMap, provinceKey, result, importantIds);
- }
- }
+ //鑾峰彇鍒嗗尯鍩熺殑鎸囨爣鏁伴噺
+ Map<String, CarDeviceSampleCalculation.AreaStats> areaStatsMap = getAreaStatsMap(list);
+ if (areaStatsMap == null) return;
// 鏌ヨ鏄惁index琛ㄥ凡缁忓瓨鍦ㄤ粖鏃ユ暟鎹�
List<CheckIndexCar> checkIndexCarList = checkIndexCarMapper.selectToday(DateUtils.getDate());
@@ -97,7 +76,8 @@
/**
* 绱鎶撴媿鏁版嵁鍑嗙‘璁惧鏁板拰璁惧鎬绘暟锛屽尯鍒嗛噸鐐圭偣浣�
*/
- private void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VehicleDeviceSamplingResult result, List<String> importantIds) {
+ @Override
+ public void updateAreaStats(Map<String, AreaStats> areaStatsMap, String key, VehicleDeviceSamplingResult result) {
//杩斿洖瀵硅薄鐨勫紩鐢紝濡傛灉涓嶅瓨鍦ㄤ細鏀惧叆鏂扮殑key,value
AreaStats stats = areaStatsMap.computeIfAbsent(key, k -> new AreaStats());
VehicleDeviceSamplingResult.VehicleDifference vehDiff = result.getVehDiff();
@@ -108,7 +88,7 @@
stats.accuracySites++;
}
//閲嶇偣鐐逛綅涓哄叚椤瑰睘鎬�
- if (importantIds.contains(result.getExternalIndexCode())) {
+ if (result.getImportantTag() != null && result.getImportantTag()) {
stats.importantTotalSites++;
if (vehDiff.getImportantConPercent() >= 0.9) {
stats.importantAccuracySites++;
@@ -138,7 +118,7 @@
if (checkIndexCar == null) {
return null;
}
- log.info("key:{},杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬э細totalSites锛歿}锛宨mportantTotalSites:{}锛宎ccuracySites:{}锛宨mportantAccuracySites:{}",key,stats.totalSites,stats.importantTotalSites,stats.accuracySites,stats.importantAccuracySites);
+ log.info("key:{},杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬э細totalSites锛歿}锛宨mportantTotalSites:{}锛宎ccuracySites:{}锛宨mportantAccuracySites:{}", key, stats.totalSites, stats.importantTotalSites, stats.accuracySites, stats.importantAccuracySites);
//璋冪敤杞﹁締鎶撴媿鏁版嵁鍑嗙‘鎬ц绠楁柟娉�
Map<String, Object> accuracyParam = new HashMap<>();
accuracyParam.put("totalSites", stats.totalSites);
@@ -147,14 +127,14 @@
accuracyParam.put("importantAccuracySites", stats.importantAccuracySites);
BigDecimal dataAccuracy = dataAccuracy(accuracyParam);
checkIndexCar.setVehicleCaptureAccuracy(dataAccuracy);
- log.info("url鍙敤鎬�: totalSites:{},urlQualifySites:{}",stats.totalSites,stats.urlUsabilitySites);
+ log.info("url鍙敤鎬�: totalSites:{},urlQualifySites:{}", stats.totalSites, stats.urlUsabilitySites);
//璋冪敤url鍙敤鎬ц绠楁柟娉�
Map<String, Object> urlParam = new HashMap<>();
urlParam.put("totalSites", stats.totalSites);
urlParam.put("urlQualifySites", stats.urlUsabilitySites);
BigDecimal urlUsability = urlUsability(urlParam);
checkIndexCar.setVehicleUrlAvailability(urlUsability);
- log.info("澶у浘鍙敤鎬�: totalSites:{},picUsabilitySites:{}",stats.totalSites,stats.picUsabilitySites);
+ log.info("澶у浘鍙敤鎬�: totalSites:{},picUsabilitySites:{}", stats.totalSites, stats.picUsabilitySites);
//璋冪敤澶у浘鍙敤鎬ц绠楁柟娉�
Map<String, Object> usabilityParam = new HashMap<>();
usabilityParam.put("totalSites", stats.totalSites);
--
Gitblit v1.8.0