From 91b4d899403587e6982c6f76674307cd5612b17b Mon Sep 17 00:00:00 2001
From: wlzboy <66905212@qq.com>
Date: 星期日, 26 十月 2025 18:53:07 +0800
Subject: [PATCH] feat: 任务状态
---
ruoyi-system/src/main/resources/mapper/system/VehicleInfoMapper.xml | 91 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 80 insertions(+), 11 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..e44b722 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,6 +14,8 @@
<result property="vehicleModel" column="vehicle_model" />
<result property="status" column="status" />
<result property="platformCode" column="platform_code" />
+ <result property="deptId" column="dept_id" />
+ <result property="deptName" column="dept_name" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@@ -21,36 +24,67 @@
</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.dept_id, d.dept_name, v.create_by, v.create_time, v.update_by, v.update_time, v.remark
+ from tb_vehicle_info v
+ left join sys_dept d on v.dept_id = d.dept_id
</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>
+ <if test="vehicleNo != null and vehicleNo != ''"> and v.vehicle_no = #{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>
+ <!-- 閮ㄩ棬杩囨护锛氳嚜鍔ㄦ煡鎵句紶鍏ラ儴闂ㄦ墍灞炵殑鍒嗗叕鍙革紙parent_id=100锛� -->
+ <if test="deptId != null">
+ and v.dept_id = (
+ <!-- 濡傛灉浼犲叆鐨勫氨鏄垎鍏徃锛坧arent_id=100锛夛紝鐩存帴杩斿洖 -->
+ select case
+ when exists(select 1 from sys_dept where dept_id = #{deptId} and parent_id = 100) then #{deptId}
+ else (
+ <!-- 鍚﹀垯浠� ancestors 涓煡鎵惧垎鍏徃ID -->
+ select d.dept_id
+ from sys_dept d
+ where d.parent_id = 100
+ and FIND_IN_SET(d.dept_id, (
+ select ancestors from sys_dept where dept_id = #{deptId}
+ ))
+ limit 1
+ )
+ end
+ )
+ </if>
+ <!-- 浠诲姟杞﹁締閫夋嫨蹇呴』杩囨护锛氬彧鏄剧ずcar_id鍜宒ept_id閮戒笉涓虹┖鐨勮溅杈� -->
+ and v.car_id is not null and v.car_id != ''
+ and v.dept_id is not null
+ and v.status=0
+
</where>
</select>
<select id="selectVehicleInfoById" parameterType="Long" resultMap="VehicleInfoResult">
<include refid="selectVehicleInfoVo"/>
- where vehicle_id = #{vehicleId}
+ where v.vehicle_id = #{vehicleId}
</select>
<select id="selectVehicleInfoByPlateNumber" parameterType="String" resultMap="VehicleInfoResult">
<include refid="selectVehicleInfoVo"/>
- where vehicle_no = #{plateNumber}
+ where v.vehicle_no = #{plateNumber}
+ </select>
+
+ <select id="selectVehicleInfoByVehicleNo" parameterType="String" resultMap="VehicleInfoResult">
+ <include refid="selectVehicleInfoVo"/>
+ where v.vehicle_no = #{vehicleNo}
</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>
@@ -58,6 +92,7 @@
<if test="vehicleModel != null">vehicle_model,</if>
<if test="status != null">status,</if>
<if test="platformCode != null">platform_code,</if>
+ <if test="deptId != null">dept_id,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
@@ -65,6 +100,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>
@@ -72,6 +108,7 @@
<if test="vehicleModel != null">#{vehicleModel},</if>
<if test="status != null">#{status},</if>
<if test="platformCode != null">#{platformCode},</if>
+ <if test="deptId != null">#{deptId},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
@@ -83,6 +120,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>
@@ -90,6 +128,7 @@
<if test="vehicleModel != null">vehicle_model = #{vehicleModel},</if>
<if test="status != null">status = #{status},</if>
<if test="platformCode != null">platform_code = #{platformCode},</if>
+ <if test="deptId != null">dept_id = #{deptId},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
<if test="remark != null">remark = #{remark},</if>
@@ -107,4 +146,34 @@
#{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>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1