From caf56217dc2bf898b63b0e1f31a7098202c32825 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 15 十一月 2025 16:50:17 +0800
Subject: [PATCH] Merge branch 'feature_gps'

---
 ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleMileageStatsMapper.java |   41 ++++++++++++++++++++++++++---------------
 1 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleMileageStatsMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleMileageStatsMapper.java
index ad784f7..328dbe8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleMileageStatsMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/VehicleMileageStatsMapper.java
@@ -2,24 +2,22 @@
 
 import java.util.Date;
 import java.util.List;
-import com.ruoyi.system.domain.VehicleMileageStats;
 import org.apache.ibatis.annotations.Param;
+import com.ruoyi.system.domain.VehicleMileageStats;
+import com.ruoyi.system.domain.TaskTimeInterval;
 
 /**
  * 杞﹁締閲岀▼缁熻Mapper鎺ュ彛
- * 
- * @author ruoyi
- * @date 2025-01-15
  */
-public interface VehicleMileageStatsMapper 
-{
+public interface VehicleMileageStatsMapper {
+    
     /**
      * 鏌ヨ杞﹁締閲岀▼缁熻
      * 
-     * @param statsId 杞﹁締閲岀▼缁熻涓婚敭
+     * @param statsId 缁熻ID
      * @return 杞﹁締閲岀▼缁熻
      */
-    public VehicleMileageStats selectVehicleMileageStatsByStatsId(Long statsId);
+    public VehicleMileageStats selectVehicleMileageStatsById(Long statsId);
 
     /**
      * 鏌ヨ杞﹁締閲岀▼缁熻鍒楄〃
@@ -48,25 +46,38 @@
     /**
      * 鍒犻櫎杞﹁締閲岀▼缁熻
      * 
-     * @param statsId 杞﹁締閲岀▼缁熻涓婚敭
+     * @param statsId 缁熻ID
      * @return 缁撴灉
      */
-    public int deleteVehicleMileageStatsByStatsId(Long statsId);
+    public int deleteVehicleMileageStatsById(Long statsId);
 
     /**
      * 鎵归噺鍒犻櫎杞﹁締閲岀▼缁熻
      * 
-     * @param statsIds 闇�瑕佸垹闄ょ殑鏁版嵁涓婚敭闆嗗悎
+     * @param statsIds 闇�瑕佸垹闄ょ殑鏁版嵁ID
      * @return 缁撴灉
      */
-    public int deleteVehicleMileageStatsByStatsIds(Long[] statsIds);
+    public int deleteVehicleMileageStatsByIds(Long[] statsIds);
 
     /**
-     * 鏌ヨ鎸囧畾杞﹁締鍜屾棩鏈熺殑缁熻璁板綍
+     * 鏌ヨ杞﹁締鍦ㄦ寚瀹氭棩鏈熺殑缁熻璁板綍
      * 
      * @param vehicleId 杞﹁締ID
-     * @param statsDate 缁熻鏃ユ湡
+     * @param statDate 缁熻鏃ユ湡
      * @return 缁熻璁板綍
      */
-    public VehicleMileageStats selectByVehicleIdAndDate(@Param("vehicleId") Long vehicleId, @Param("statsDate") Date statsDate);
+    public VehicleMileageStats selectByVehicleIdAndDate(@Param("vehicleId") Long vehicleId, 
+                                                         @Param("statDate") Date statDate);
+
+    /**
+     * 鏌ヨ杞﹁締鍦ㄦ寚瀹氭椂闂磋寖鍥村唴鐨勪换鍔℃椂闂村尯闂�
+     * 
+     * @param vehicleId 杞﹁締ID
+     * @param startTime 寮�濮嬫椂闂�
+     * @param endTime 缁撴潫鏃堕棿
+     * @return 浠诲姟鏃堕棿鍖洪棿鍒楄〃
+     */
+    public List<TaskTimeInterval> selectTaskTimeIntervals(@Param("vehicleId") Long vehicleId,
+                                                           @Param("startTime") Date startTime,
+                                                           @Param("endTime") Date endTime);
 }

--
Gitblit v1.9.1