From 3bbd80a63ac7728ac01b641a48a26befcb171a0f Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期一, 15 十二月 2025 07:19:21 +0800
Subject: [PATCH] feat:增加企业微信登录判断

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

diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
index 2c78bdf..650f10e 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
@@ -130,26 +130,29 @@
         order by collect_time
     </select>
 
-    <!-- 鏌ヨ娲昏穬杞﹁締ID锛堜紭鍖栵細娣诲姞LIMIT闄愬埗锛岄伩鍏嶅ぇ琛ㄦ壂鎻忥級 -->
+    <!-- 鏌ヨ娲昏穬杞﹁締ID锛堜紭鍖栵細浣跨敤GROUP BY鏇夸唬DISTINCT锛屾彁鍗囨�ц兘锛� -->
     <select id="selectActiveVehicleIds" resultType="Long">
-        select distinct vehicle_id
+        select vehicle_id
         from tb_vehicle_gps
         where collect_time &gt;= #{startTime}
+        group by vehicle_id
         order by vehicle_id
     </select>
     
-    <!-- 鏌ヨ鏈璁＄畻鐨凣PS鍧愭爣锛堜笉鍦╰b_vehicle_gps_calculated琛ㄤ腑鐨勮褰曪級 -->
+    <!-- 鏌ヨ鏈璁＄畻鐨凣PS鍧愭爣锛堜紭鍖栵細浣跨敤NOT EXISTS鏇夸唬LEFT JOIN ... IS NULL锛� -->
     <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
+        INNER JOIN tb_vehicle_info v ON g.vehicle_id = v.vehicle_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鐐�
+          AND NOT EXISTS (
+              SELECT 1 FROM tb_vehicle_gps_calculated c 
+              WHERE c.gps_id = g.gps_id
+          )
         ORDER BY g.collect_time
     </select>
 </mapper> 
\ No newline at end of file

--
Gitblit v1.9.1