From 6b29bd596f8b48485d3506bfba4a1e0ea6c7df99 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期二, 14 四月 2026 22:45:40 +0800
Subject: [PATCH] feat: 优化统计及告急处理
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleMileageStatsServiceImpl.java | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleMileageStatsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleMileageStatsServiceImpl.java
index 8ff2c77..78c4c21 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleMileageStatsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/VehicleMileageStatsServiceImpl.java
@@ -123,7 +123,7 @@
List<VehicleGps> gpsList = vehicleGpsMapper.selectGpsDataByTimeRange(vehicleId, dayStartStr, dayEndStr);
if (gpsList == null || gpsList.isEmpty()) {
- logger.info("---> 杞﹁締ID:{} 鍦ㄦ棩鏈�:{} 鏃燝PS鏁版嵁", vehicleId, statDate);
+// logger.info("---> 杞﹁締ID:{} 鍦ㄦ棩鏈�:{} 鏃燝PS鏁版嵁", vehicleId, statDate);
return null;
}
// logger.info("---> 杞﹁締ID:{} GPS鏁版嵁鏉℃暟:{}", vehicleId, gpsList.size());
@@ -476,17 +476,17 @@
// logger.info("杞﹁締ID: {} 鍦ㄦ棩鏈�: {} 鏈� {} 涓换鍔�", vehicleId, statDate, taskCount);
List<VehicleGpsSegmentMileage> mileages = this.getTaskDistanceMileage(vehicleId, dayStart, dayEnd).stream().filter(e -> e.getSegmentDistance() != null && e.getSegmentDistance().compareTo(BigDecimal.ZERO) > 0).collect(Collectors.toList());
// logger.info("杞﹁締ID: {} 鍦ㄦ棩鏈�: {} 鏈� {} 涓垎娈甸噷绋嬫暟鎹�", vehicleId, statDate, mileages.size());
- Integer totalGpsPoints = mileages != null ? mileages.stream()
- .filter(segment -> segment.getGpsPointCount() != null)
- .mapToInt(VehicleGpsSegmentMileage::getGpsPointCount)
- .sum() : 0;
+ Integer totalGpsPoints = mileages.stream()
+ .filter(segment -> segment.getGpsPointCount() != null)
+ .mapToInt(VehicleGpsSegmentMileage::getGpsPointCount)
+ .sum();
BigDecimal taskDistance = getTaskDistance(taskIntervals, mileages);
BigDecimal totalDistance = calculateTotalMileage(segments);
BigDecimal nonTaskDistance = totalDistance.subtract(taskDistance);
// 闃叉闄ら浂閿欒
BigDecimal taskRatio = BigDecimal.ZERO;
- if (totalDistance != null && totalDistance.compareTo(BigDecimal.ZERO) > 0) {
+ if (totalDistance.compareTo(BigDecimal.ZERO) > 0) {
taskRatio = taskDistance.divide(totalDistance, 4, RoundingMode.HALF_UP);
}
// 3. 姹囨�婚噷绋嬫暟鎹�
@@ -533,8 +533,8 @@
}
// logger.info("杞﹁締ID: {} 鏃ユ湡: {} 浠庡垎娈垫眹鎬诲畬鎴� - 鎬婚噷绋�: {}km, 浠诲姟閲岀▼: {}km, 闈炰换鍔￠噷绋�: {}km, 鍒嗘鏁�: {}",
-// vehicleId, statDate, totalMileage, taskMileage, nonTaskMileage, segments.size());
-
+// vehicleId, statDate, stats.getTotalMileage(), stats.getTaskMileage(),stats.getNonTaskMileage(), segments.size());
+
return stats;
} catch (Exception e) {
--
Gitblit v1.9.1