From 09faa36132c8cbada5327649875534ef01c1a3b1 Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期四, 11 十二月 2025 20:44:31 +0800
Subject: [PATCH] feat: 优化任务里程统计
---
ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml | 192 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 175 insertions(+), 17 deletions(-)
diff --git a/ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml
index aa34be7..09303ac 100644
--- a/ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml
@@ -6,6 +6,7 @@
<resultMap type="com.ruoyi.system.domain.VehicleInfo" id="VehicleInfoResult">
<id property="vehicleId" column="vehicle_id" />
+ <result property="carId" column="car_id" />
<result property="deviceId" column="device_id" />
<result property="vehicleNo" column="vehicle_no" />
<result property="vehicleType" column="vehicle_type" />
@@ -13,44 +14,151 @@
<result property="vehicleModel" column="vehicle_model" />
<result property="status" column="status" />
<result property="platformCode" column="platform_code" />
+ <result property="deptName" column="dept_name" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
</resultMap>
+
+ <!-- 鍖呭惈澶氬垎鍏徃鍏宠仈鐨勫畬鏁寸粨鏋滄槧灏勶紙浠呭湪闇�瑕佹椂浣跨敤锛� -->
+ <resultMap type="com.ruoyi.system.domain.VehicleInfo" id="VehicleInfoWithDeptsResult" extends="VehicleInfoResult">
+ <!-- 澶氫釜鍒嗗叕鍙稿叧鑱旓紙绔嬪嵆鍔犺浇锛岄伩鍏嶅欢杩熷姞杞藉鑷寸殑搴忓垪鍖栭棶棰橈級 -->
+ <collection property="deptIds" ofType="Long"
+ select="selectVehicleDeptIds"
+ column="vehicle_id"
+ fetchType="eager"/>
+ <collection property="deptNames" ofType="String"
+ select="selectVehicleDeptNames"
+ column="vehicle_id"
+ fetchType="eager"/>
+ </resultMap>
<sql id="selectVehicleInfoVo">
- select vehicle_id, device_id, vehicle_no, vehicle_type, vehicle_brand, vehicle_model, status, platform_code, create_by, create_time, update_by, update_time, remark
- from tb_vehicle_info
+ select v.vehicle_id, v.car_id, v.device_id, v.vehicle_no, v.vehicle_type, v.vehicle_brand, v.vehicle_model, v.status, v.platform_code, v.create_by, v.create_time, v.update_by, v.update_time, v.remark
+ from tb_vehicle_info v
</sql>
-
- <select id="selectVehicleInfoList" parameterType="VehicleInfo" resultMap="VehicleInfoResult">
- <include refid="selectVehicleInfoVo"/>
- <where>
- <if test="vehicleNo != null and vehicleNo != ''"> and vehicle_no = #{vehicleNo}</if>
- <if test="deviceId != null and deviceId != ''"> and device_id = #{deviceId}</if>
- <if test="vehicleType != null and vehicleType != ''"> and vehicle_type = #{vehicleType}</if>
- <if test="vehicleBrand != null and vehicleBrand != ''"> and vehicle_brand = #{vehicleBrand}</if>
- <if test="vehicleModel != null and vehicleModel != ''"> and vehicle_model = #{vehicleModel}</if>
- <if test="status != null and status != ''"> and status = #{status}</if>
- <if test="platformCode != null and platformCode != ''"> and platform_code = #{platformCode}</if>
- </where>
+
+ <!-- 鏌ヨ杞﹁締鍏宠仈鐨勬墍鏈夊垎鍏徃ID -->
+ <select id="selectVehicleDeptIds" resultType="Long">
+ SELECT dept_id FROM tb_vehicle_dept WHERE vehicle_id = #{vehicle_id}
</select>
- <select id="selectVehicleInfoById" parameterType="Long" resultMap="VehicleInfoResult">
+ <!-- 鏌ヨ杞﹁締鍏宠仈鐨勬墍鏈夊垎鍏徃鍚嶇О -->
+ <select id="selectVehicleDeptNames" resultType="String">
+ SELECT d.dept_name
+ FROM tb_vehicle_dept vd
+ LEFT JOIN sys_dept d ON vd.dept_id = d.dept_id
+ WHERE vd.vehicle_id = #{vehicle_id}
+ </select>
+
+ <select id="selectVehicleInfoListWithDepts" parameterType="VehicleInfo" resultMap="VehicleInfoWithDeptsResult">
+ select v.vehicle_id, v.car_id, v.device_id, v.vehicle_no, v.vehicle_type, v.vehicle_brand,
+ v.vehicle_model, v.status, v.platform_code, v.create_by, v.create_time,
+ v.update_by, v.update_time, v.remark
+ from tb_vehicle_info v
+ <where>
+ <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no LIKE concat('%', #{vehicleNo}, '%')</if>
+ <if test="deviceId != null and deviceId != ''"> and v.device_id = #{deviceId}</if>
+ <if test="vehicleType != null and vehicleType != ''"> and v.vehicle_type = #{vehicleType}</if>
+ <if test="vehicleBrand != null and vehicleBrand != ''"> and v.vehicle_brand = #{vehicleBrand}</if>
+ <if test="vehicleModel != null and vehicleModel != ''"> and v.vehicle_model = #{vehicleModel}</if>
+ <if test="status != null and status != ''"> and v.status = #{status}</if>
+ <if test="platformCode != null and platformCode != ''"> and v.platform_code = #{platformCode}</if>
+ <!-- 閮ㄩ棬杩囨护锛氭牴鎹垎鍏徃ID鏌ヨ杞﹁締锛堥�氳繃鍏宠仈琛級 -->
+ <if test="deptId != null">
+ and EXISTS (
+ SELECT 1 FROM tb_vehicle_dept vd2
+ WHERE vd2.vehicle_id = v.vehicle_id
+ AND vd2.dept_id = #{deptId}
+ )
+ </if>
+ and v.status=0
+ </where>
+ group by v.vehicle_id, v.car_id, v.device_id, v.vehicle_no, v.vehicle_type, v.vehicle_brand,
+ v.vehicle_model, v.status, v.platform_code, v.create_by, v.create_time,
+ v.update_by, v.update_time, v.remark
+ order by v.create_time desc
+ </select>
+
+ <select id="selectVehicleInfoList" parameterType="VehicleInfo" resultMap="VehicleInfoResult">
+ select v.vehicle_id, v.car_id, v.device_id, v.vehicle_no, v.vehicle_type, v.vehicle_brand,
+ v.vehicle_model, v.status, v.platform_code, v.create_by, v.create_time,
+ v.update_by, v.update_time, v.remark,
+ GROUP_CONCAT(DISTINCT d.dept_name ORDER BY d.dept_name SEPARATOR ',') as dept_name
+ from tb_vehicle_info v
+ left join tb_vehicle_dept vd on v.vehicle_id = vd.vehicle_id
+ left join sys_dept d on vd.dept_id = d.dept_id
+ <where>
+ <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no LIKE concat('%', #{vehicleNo}, '%')</if>
+ <if test="deviceId != null and deviceId != ''"> and v.device_id = #{deviceId}</if>
+ <if test="vehicleType != null and vehicleType != ''"> and v.vehicle_type = #{vehicleType}</if>
+ <if test="vehicleBrand != null and vehicleBrand != ''"> and v.vehicle_brand = #{vehicleBrand}</if>
+ <if test="vehicleModel != null and vehicleModel != ''"> and v.vehicle_model = #{vehicleModel}</if>
+ <if test="status != null and status != ''"> and v.status = #{status}</if>
+ <if test="platformCode != null and platformCode != ''"> and v.platform_code = #{platformCode}</if>
+ <!-- 閮ㄩ棬杩囨护锛氭牴鎹垎鍏徃ID鏌ヨ杞﹁締锛堥�氳繃鍏宠仈琛級 -->
+ <if test="deptId != null">
+ and EXISTS (
+ SELECT 1 FROM tb_vehicle_dept vd2
+ WHERE vd2.vehicle_id = v.vehicle_id
+ AND vd2.dept_id = #{deptId}
+ )
+ </if>
+ <!-- 浠诲姟杞﹁締閫夋嫨蹇呴』杩囨护锛氬彧鏄剧ずcar_id涓嶄负绌轰笖宸插叧鑱斿垎鍏徃鐨勮溅杈� -->
+<!-- and v.car_id is not null and v.car_id != ''-->
+<!-- and EXISTS (SELECT 1 FROM tb_vehicle_dept vd WHERE vd.vehicle_id = v.vehicle_id)-->
+ and v.status=0
+
+ </where>
+ group by v.vehicle_id, v.car_id, v.device_id, v.vehicle_no, v.vehicle_type, v.vehicle_brand,
+ v.vehicle_model, v.status, v.platform_code, v.create_by, v.create_time,
+ v.update_by, v.update_time, v.remark
+ </select>
+
+ <select id="selectVehicleInfoById" parameterType="Long" resultMap="VehicleInfoWithDeptsResult">
<include refid="selectVehicleInfoVo"/>
- where vehicle_id = #{vehicleId}
+ where v.vehicle_id = #{vehicleId}
+ </select>
+
+ <!-- 鏌ヨ杞﹁締淇℃伅锛堝寘鍚鍒嗗叕鍙稿叧鑱旓級 -->
+ <select id="selectVehicleInfoWithDeptsById" parameterType="Long" resultMap="VehicleInfoWithDeptsResult">
+ <include refid="selectVehicleInfoVo"/>
+ where v.vehicle_id = #{vehicleId}
</select>
<select id="selectVehicleInfoByPlateNumber" parameterType="String" resultMap="VehicleInfoResult">
<include refid="selectVehicleInfoVo"/>
- where vehicle_no = #{plateNumber}
+ where v.vehicle_no LIKE concat('%', #{plateNumber}, '%')
+ limit 1
+ </select>
+
+ <select id="selectVehicleInfoByVehicleNo" parameterType="String" resultMap="VehicleInfoResult">
+ <include refid="selectVehicleInfoVo"/>
+ where v.vehicle_no LIKE concat('%', #{vehicleNo}, '%')
+ </select>
+
+ <!-- 鏍规嵁鏃х郴缁熻溅杈咺D(CarID)鏌ヨ杞﹁締淇℃伅 -->
+ <select id="selectVehicleInfoByCarId" parameterType="Integer" resultMap="VehicleInfoResult">
+ <include refid="selectVehicleInfoVo"/>
+ where v.car_id = #{carId}
+ </select>
+
+ <!-- 鏍规嵁鏃х郴缁熻溅杈咺D鏌ヨ杞﹁締淇℃伅 -->
+ <select id="selectVehicleInfoByCarID" resultType="java.util.HashMap">
+ SELECT
+ vehicle_id,
+ car_id,
+ vehicle_no
+ FROM tb_vehicle_info
+ WHERE car_id = #{carID}
</select>
<insert id="insertVehicleInfo" parameterType="VehicleInfo" useGeneratedKeys="true" keyProperty="vehicleId">
insert into tb_vehicle_info
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="carId != null">car_id,</if>
<if test="deviceId != null">device_id,</if>
<if test="vehicleNo != null">vehicle_no,</if>
<if test="vehicleType != null">vehicle_type,</if>
@@ -65,6 +173,7 @@
<if test="remark != null">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="carId != null">#{carId},</if>
<if test="deviceId != null">#{deviceId},</if>
<if test="vehicleNo != null">#{vehicleNo},</if>
<if test="vehicleType != null">#{vehicleType},</if>
@@ -83,6 +192,7 @@
<update id="updateVehicleInfo" parameterType="VehicleInfo">
update tb_vehicle_info
<trim prefix="SET" suffixOverrides=",">
+ <if test="carId != null">car_id = #{carId},</if>
<if test="deviceId != null">device_id = #{deviceId},</if>
<if test="vehicleNo != null">vehicle_no = #{vehicleNo},</if>
<if test="vehicleType != null">vehicle_type = #{vehicleType},</if>
@@ -107,4 +217,52 @@
#{vehicleId}
</foreach>
</delete>
+
+ <!-- 缁戝畾杞﹁締鍒扮敤鎴� -->
+ <insert id="bindVehicleToUser">
+ INSERT INTO sys_user_vehicle (user_id, vehicle_id, bind_time, bind_by, status, create_by, create_time)
+ VALUES (#{userId}, #{vehicleId}, NOW(), #{bindBy}, '0', #{bindBy}, NOW())
+ </insert>
+
+ <!-- 瑙ｇ粦鐢ㄦ埛杞﹁締 -->
+ <update id="unbindVehicleFromUser">
+ UPDATE sys_user_vehicle
+ SET status = '1', update_time = NOW()
+ WHERE user_id = #{userId} AND vehicle_id = #{vehicleId} AND status = '0'
+ </update>
+
+ <!-- 瑙ｇ粦鐢ㄦ埛鐨勬墍鏈夎溅杈� -->
+ <update id="unbindAllVehiclesFromUser">
+ UPDATE sys_user_vehicle
+ SET status = '1', update_time = NOW()
+ WHERE user_id = #{userId} AND status = '0'
+ </update>
+
+ <!-- 鑾峰彇鐢ㄦ埛褰撳墠缁戝畾鐨勮溅杈� -->
+ <select id="getUserBoundVehicle" resultMap="VehicleInfoResult">
+ SELECT v.*
+ FROM tb_vehicle_info v
+ INNER JOIN sys_user_vehicle uv ON v.vehicle_id = uv.vehicle_id
+ WHERE uv.user_id = #{userId} AND uv.status = '0'
+ ORDER BY uv.bind_time DESC
+ LIMIT 1
+ </select>
+
+ <!-- 鎵归噺鎻掑叆杞﹁締-鍒嗗叕鍙稿叧鑱� -->
+ <insert id="batchInsertVehicleDept">
+ INSERT INTO tb_vehicle_dept (vehicle_id, dept_id, order_class, create_by, create_time)
+ VALUES
+ <foreach collection="list" item="item" separator=",">
+ (#{item.vehicleId}, #{item.deptId}, #{item.orderClass}, #{item.createBy}, NOW())
+ </foreach>
+ ON DUPLICATE KEY UPDATE
+ order_class = VALUES(order_class),
+ update_by = VALUES(create_by),
+ update_time = NOW()
+ </insert>
+
+ <!-- 鍒犻櫎杞﹁締鐨勬墍鏈夊垎鍏徃鍏宠仈 -->
+ <delete id="deleteVehicleDeptByVehicleId">
+ DELETE FROM tb_vehicle_dept WHERE vehicle_id = #{vehicleId}
+ </delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1