From 9f3485f2e619f011d17952b4e2dac09ec702b724 Mon Sep 17 00:00:00 2001
From: wanglizhong <wlz>
Date: 星期三, 14 五月 2025 17:48:27 +0800
Subject: [PATCH] fix:gps 查询修改超时时间 180000
---
ruoyi-system/src/main/resources/mapper/system/VehicleGpsMapper.xml | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 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..9e01aae 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>
@@ -26,15 +30,20 @@
<select id="selectVehicleGpsList" parameterType="VehicleGps" resultMap="VehicleGpsResult">
<include refid="selectVehicleGpsVo"/>
<where>
- <if test="vehicleId != null "> and g.vehicle_id = #{vehicleId}</if>
- <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no like concat('%', #{vehicleNo}, '%')</if>
- <if test="longitude != null "> and g.longitude = #{longitude}</if>
- <if test="latitude != null "> and g.latitude = #{latitude}</if>
- <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="vehicleNo != null and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
+ <if test="longitude != null "> and longitude = #{longitude}</if>
+ <if test="latitude != null "> and latitude = #{latitude}</if>
+ <if test="speed != null "> and speed = #{speed}</if>
+ <if test="direction != null "> and direction = #{direction}</if>
+ <if test="collectTime != null "> and collect_time = #{collectTime}</if>
+ <if test="beginTime != null and beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+ AND date_format(collect_time,'%y%m%d') >= date_format(#{beginTime},'%y%m%d')
+ </if>
+ <if test="endTime != null and endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+ AND date_format(collect_time,'%y%m%d') <= date_format(#{endTime},'%y%m%d')
+ </if>
</where>
+ order by collect_time desc
</select>
<select id="selectVehicleGpsById" parameterType="Long" resultMap="VehicleGpsResult">
@@ -46,22 +55,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>
@@ -95,4 +110,13 @@
<select id="getVehicleIdByNo" parameterType="String" resultType="Long">
select vehicle_id from tb_vehicle_info where vehicle_no = #{vehicleNo}
</select>
+
+ <delete id="deleteVehicleGpsBeforeDate">
+ delete g from tb_vehicle_gps g
+ where g.collect_time < (
+ select date_sub(max(collect_time), interval 2 day)
+ from tb_vehicle_gps g2
+ where g2.vehicle_id = g.vehicle_id
+ )
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1