From a8fc752885b438adb5a48c1df2486ac8c534383d Mon Sep 17 00:00:00 2001
From: wzp <2040239371@qq.com>
Date: 星期六, 10 五月 2025 16:02:45 +0800
Subject: [PATCH] fix:YNL

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

diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
index e899130..a1c00c3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml
@@ -7,6 +7,7 @@
     <resultMap type="VehicleGps" id="VehicleGpsResult">
         <result property="gpsId"    column="gps_id"    />
         <result property="vehicleId"    column="vehicle_id"    />
+        <result property="deviceId"    column="device_id"    />
         <result property="vehicleNo"    column="vehicle_no"    />
         <result property="longitude"    column="longitude"    />
         <result property="latitude"    column="latitude"    />
@@ -14,11 +15,14 @@
         <result property="speed"    column="speed"    />
         <result property="direction"    column="direction"    />
         <result property="collectTime"    column="collect_time"    />
+        <result property="deviceReportTime"    column="device_report_time"    />
+        <result property="platformProcessTime"    column="platform_process_time"    />
         <result property="createTime"    column="create_time"    />
     </resultMap>
 
     <sql id="selectVehicleGpsVo">
-        select g.gps_id, g.vehicle_id, v.vehicle_no, g.longitude, g.latitude, g.altitude, g.speed, g.direction, g.collect_time, g.create_time 
+        select g.gps_id, g.vehicle_id, g.device_id, v.vehicle_no, g.longitude, g.latitude, g.altitude, g.speed, g.direction, 
+        g.collect_time, g.device_report_time, g.platform_process_time, g.create_time
         from tb_vehicle_gps g
         left join tb_vehicle_info v on g.vehicle_id = v.vehicle_id
     </sql>
@@ -33,7 +37,8 @@
             <if test="altitude != null "> and g.altitude = #{altitude}</if>
             <if test="speed != null "> and g.speed = #{speed}</if>
             <if test="direction != null "> and g.direction = #{direction}</if>
-            <if test="collectTime != null  and collectTime != ''"> and g.collect_time = #{collectTime}</if>
+            <if test="beginTime != null and beginTime != ''"> and g.collect_time &gt;= #{beginTime}</if>
+            <if test="endTime != null and endTime != ''"> and g.collect_time &lt;= #{endTime}</if>
         </where>
     </select>
     
@@ -46,22 +51,28 @@
         insert into tb_vehicle_gps
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="vehicleId != null">vehicle_id,</if>
+            <if test="deviceId != null">device_id,</if>
             <if test="longitude != null">longitude,</if>
             <if test="latitude != null">latitude,</if>
             <if test="altitude != null">altitude,</if>
             <if test="speed != null">speed,</if>
             <if test="direction != null">direction,</if>
             <if test="collectTime != null">collect_time,</if>
+            <if test="deviceReportTime != null">device_report_time,</if>
+            <if test="platformProcessTime != null">platform_process_time,</if>
             <if test="createTime != null">create_time,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="vehicleId != null">#{vehicleId},</if>
+            <if test="deviceId != null">#{deviceId},</if>
             <if test="longitude != null">#{longitude},</if>
             <if test="latitude != null">#{latitude},</if>
             <if test="altitude != null">#{altitude},</if>
             <if test="speed != null">#{speed},</if>
             <if test="direction != null">#{direction},</if>
             <if test="collectTime != null">#{collectTime},</if>
+            <if test="deviceReportTime != null">#{deviceReportTime},</if>
+            <if test="platformProcessTime != null">#{platformProcessTime},</if>
             <if test="createTime != null">#{createTime},</if>
          </trim>
     </insert>

--
Gitblit v1.9.1