From fd047fa7234dc11643dab8ecbf38e8d7a8ba0854 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期六, 22 十一月 2025 23:48:12 +0800
Subject: [PATCH] feat:修改任务

---
 ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
index 9e01aae..3abe287 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
@@ -119,4 +119,36 @@
             where g2.vehicle_id = g.vehicle_id
         )
     </delete>
+
+    <select id="selectGpsDataByTimeRange" resultMap="VehicleGpsResult">
+        select gps_id, vehicle_id, device_id, longitude, latitude, altitude, speed, direction, 
+               collect_time, device_report_time, platform_process_time, create_time
+        from tb_vehicle_gps
+        where vehicle_id = #{vehicleId}
+          and collect_time &gt;= #{startTime}
+          and collect_time &lt;= #{endTime}
+        order by collect_time
+    </select>
+
+    <select id="selectActiveVehicleIds" resultType="Long">
+        select distinct vehicle_id
+        from tb_vehicle_gps
+        where collect_time &gt;= DATE_SUB(NOW(), INTERVAL 7 DAY)
+        order by vehicle_id
+    </select>
+    
+    <!-- 鏌ヨ鏈璁＄畻鐨凣PS鍧愭爣锛堜笉鍦╰b_vehicle_gps_calculated琛ㄤ腑鐨勮褰曪級 -->
+    <select id="selectUncalculatedGps" resultMap="VehicleGpsResult">
+        SELECT g.gps_id, g.vehicle_id, g.device_id, g.longitude, g.latitude, g.altitude, 
+               g.speed, g.direction, g.collect_time, g.device_report_time, 
+               g.platform_process_time, g.create_time, v.vehicle_no
+        FROM tb_vehicle_gps g
+        LEFT JOIN tb_vehicle_info v ON g.vehicle_id = v.vehicle_id
+        LEFT JOIN tb_vehicle_gps_calculated c ON g.gps_id = c.gps_id
+        WHERE g.vehicle_id = #{vehicleId}
+          AND g.collect_time &gt;= #{startTime}
+          AND g.collect_time &lt;= #{endTime}
+          AND c.gps_id IS NULL  -- 鏈璁＄畻鐨凣PS鐐�
+        ORDER BY g.collect_time
+    </select>
 </mapper> 
\ No newline at end of file

--
Gitblit v1.9.1