From c5ac97682e3b4ca748541ace97cb37a2295bd81e Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 19 三月 2026 22:46:29 +0800
Subject: [PATCH] feat: 增加GPS清理后台任务

---
 ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml
index 674cfdd..8b6f6c8 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsSegmentMileageMapper.xml
@@ -62,11 +62,27 @@
     </select>
 
     <select id="selectSegmentsByDateRange" resultMap="VehicleGpsSegmentMileageResult">
-        <include refid="selectVehicleGpsSegmentMileageVo"/>
+        SELECT segment_id, vehicle_id, vehicle_no, segment_start_time, segment_end_time,
+        start_longitude, start_latitude, end_longitude, end_latitude,
+        segment_distance, gps_point_count, task_id, task_code
+        FROM tb_vehicle_gps_segment_mileage
         WHERE vehicle_id = #{vehicleId}
-          AND segment_start_time &lt;= #{endDate}
+          AND segment_start_time between #{startDate} and #{endDate}
           AND segment_end_time &gt;= #{startDate}
           AND segment_distance &gt;0
+    </select>
+    
+    <!-- 鏌ヨ杞﹁締鍦ㄦ寚瀹氭椂闂磋寖鍥村唴鐨勫垎娈甸噷绋� -->
+    <select id="selectSegmentsByTimeRange" resultMap="VehicleGpsSegmentMileageResult">
+        SELECT segment_id, vehicle_id, vehicle_no, segment_start_time, segment_end_time,
+               start_longitude, start_latitude, end_longitude, end_latitude,
+               segment_distance, gps_point_count, gps_ids, task_id, task_code, calculate_method
+        FROM tb_vehicle_gps_segment_mileage
+        WHERE vehicle_id = #{vehicleId}
+          AND segment_start_time between #{startDate} and #{endDate}
+          AND segment_end_time &gt;= #{startTime}
+          AND segment_distance &gt; 0
+        ORDER BY segment_start_time
     </select>
     
     <!-- 鎸変换鍔D鏌ヨ鍒嗘閲岀▼鍒楄〃 -->
@@ -83,6 +99,7 @@
         WHERE task_id = #{taskId}
     </select>
         
+    <!-- 鎻掑叆鎴栨洿鏂板垎娈甸噷绋嬭褰曪紙閬垮厤閲嶅鎻掑叆锛� -->
     <insert id="insertVehicleGpsSegmentMileage" parameterType="VehicleGpsSegmentMileage">
         INSERT INTO tb_vehicle_gps_segment_mileage
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -117,6 +134,20 @@
             <if test="taskCode != null">#{taskCode},</if>
             <if test="calculateMethod != null">#{calculateMethod},</if>
         </trim>
+        ON DUPLICATE KEY UPDATE
+        vehicle_no = VALUES(vehicle_no),
+        segment_end_time = VALUES(segment_end_time),
+        start_longitude = VALUES(start_longitude),
+        start_latitude = VALUES(start_latitude),
+        end_longitude = VALUES(end_longitude),
+        end_latitude = VALUES(end_latitude),
+        segment_distance = VALUES(segment_distance),
+        gps_point_count = VALUES(gps_point_count),
+        gps_ids = VALUES(gps_ids),
+        task_id = VALUES(task_id),
+        task_code = VALUES(task_code),
+        calculate_method = VALUES(calculate_method),
+        update_time = NOW()
     </insert>
 
     <update id="updateVehicleGpsSegmentMileage" parameterType="VehicleGpsSegmentMileage">

--
Gitblit v1.9.1