From 74756c657109a4e48dd6c0b4d8959cdab89b33a9 Mon Sep 17 00:00:00 2001
From: xiebin <vip_xiaobin810@163.com>
Date: Wed, 28 Jan 2026 20:10:29 +0800
Subject: [PATCH] update-区域划分表结构调整
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 122 +++++++++++++++++++++-------------------
1 files changed, 64 insertions(+), 58 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
index 94ee0c8..53471e1 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml
@@ -3,11 +3,12 @@
<mapper namespace="org.sxkj.fw.detection.mapper.FwTaskScheduleMapper">
<!-- 通用查询映射结果 -->
- <resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.entity.FwTaskScheduleEntity">
+ <resultMap id="fwTaskScheduleResultMap" type="org.sxkj.fw.detection.vo.FwTaskScheduleVO">
<result column="id" property="id"/>
<result column="device_id" property="deviceId"/>
<result column="area_divide_id" property="areaDivideId"/>
<result column="defense_scene_id" property="defenseSceneId"/>
+ <result column="defense_scene_name" property="defenseSceneName"/>
<result column="longitude" property="longitude"/>
<result column="latitude" property="latitude"/>
<result column="dispatch_user" property="dispatchUser"/>
@@ -23,73 +24,78 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
- <result column="is_deleted" property="isDeleted"/>
+ <result column="device_sn" property="deviceSn"/>
+ <result column="device_name" property="deviceName"/>
+ <result column="device_type" property="deviceType"/>
+ <result column="device_longitude" property="deviceLongitude"/>
+ <result column="device_latitude" property="deviceLatitude"/>
+ <result column="area_name" property="areaName"/>
+ <result column="defense_zone_name" property="defenseZoneName"/>
</resultMap>
<select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
- select * from ja_fw_task_schedule
+ select
+ ts.id,
+ ts.device_id,
+ ts.area_divide_id,
+ ts.defense_scene_id,
+ ds.scene_name as defense_scene_name,
+ ts.longitude,
+ ts.latitude,
+ ts.dispatch_user,
+ ts.dispatch_start_time,
+ ts.dispatch_end_time,
+ ts.dispatch_content,
+ ts.dispatch_result,
+ ts.dispose_measure,
+ ts.area_code,
+ ts.create_user,
+ ts.create_dept,
+ ts.create_time,
+ ts.update_user,
+ ts.update_time,
+ ts.is_deleted,
+ d.device_sn,
+ d.device_name,
+ d.device_type,
+ d.status as device_status,
+ ad.longitude as device_longitude,
+ ad.latitude as device_latitude,
+ ad.area_name,
+ dz.zone_name as defense_zone_name
+ from
+ ja_fw_task_schedule ts
+ left join
+ ja_fw_device d on d.id = ts.device_id
+ left join
+ ja_fw_area_divide ad on ad.id = ts.area_divide_id
+ left join
+ ja_fw_defense_scene ds on ds.id = ts.defense_scene_id
+ left join
+ ja_fw_defense_zone dz on dz.is_deleted = 0
+ and dz.defense_scene_ids is not null
+ and dz.defense_scene_ids != ''
+ and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
<where>
- is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and id = #{param2.id}
+ ts.is_deleted = 0
+ <if test="param2.deviceName != null and param2.deviceName != ''">
+ and d.device_name like concat('%', #{param2.deviceName}, '%')
</if>
- <if test="param2.deviceId != null and param2.deviceId != ''">
- and device_id = #{param2.deviceId}
+ <if test="param2.deviceSn != null and param2.deviceSn != ''">
+ and d.device_sn like concat('%', #{param2.deviceSn}, '%')
</if>
- <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
- and area_divide_id = #{param2.areaDivideId}
- </if>
- <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
- and defense_scene_id = #{param2.defenseSceneId}
- </if>
- <if test="param2.longitude != null and param2.longitude != ''">
- and longitude = #{param2.longitude}
- </if>
- <if test="param2.latitude != null and param2.latitude != ''">
- and latitude = #{param2.latitude}
- </if>
- <if test="param2.dispatchUser != null and param2.dispatchUser != ''">
- and dispatch_user = #{param2.dispatchUser}
- </if>
- <if test="param2.dispatchStartTime != null and param2.dispatchStartTime != ''">
- and dispatch_start_time = #{param2.dispatchStartTime}
- </if>
- <if test="param2.dispatchEndTime != null and param2.dispatchEndTime != ''">
- and dispatch_end_time = #{param2.dispatchEndTime}
- </if>
- <if test="param2.dispatchContent != null and param2.dispatchContent != ''">
- and dispatch_content = #{param2.dispatchContent}
- </if>
- <if test="param2.dispatchResult != null and param2.dispatchResult != ''">
- and dispatch_result = #{param2.dispatchResult}
- </if>
- <if test="param2.disposeMeasure != null and param2.disposeMeasure != ''">
- and dispose_measure = #{param2.disposeMeasure}
- </if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and area_code = #{param2.areaCode}
- </if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and create_user = #{param2.createUser}
- </if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and create_dept = #{param2.createDept}
- </if>
- <if test="param2.createTime != null and param2.createTime != ''">
- and create_time = #{param2.createTime}
- </if>
- <if test="param2.updateUser != null and param2.updateUser != ''">
- and update_user = #{param2.updateUser}
- </if>
- <if test="param2.updateTime != null and param2.updateTime != ''">
- and update_time = #{param2.updateTime}
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and d.device_type = #{param2.deviceType}
</if>
<if test="param2.status != null and param2.status != ''">
- and status = #{param2.status}
+ and d.status = #{param2.status}
</if>
- <if test="param2.isDeleted != null and param2.isDeleted != ''">
- and is_deleted = #{param2.isDeleted}
+ <if test="param2.deptList != null and param2.deptList.size > 0">
+ and ts.create_dept in
+ <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
+ #{deptId}
+ </foreach>
</if>
</where>
</select>
--
Gitblit v1.9.3