From fefe259f19a251d90d17d8a42e04f6332a4cad3e Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 23 Jan 2026 15:37:30 +0800
Subject: [PATCH] sql 优化
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml | 65 +++-----------------------------
1 files changed, 6 insertions(+), 59 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 9386b8b..0e330fb 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
@@ -8,6 +8,7 @@
<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,7 +24,6 @@
<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"/>
@@ -40,6 +40,7 @@
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,
@@ -58,7 +59,7 @@
d.device_sn,
d.device_name,
d.device_type,
- d.status as status,
+ d.status as device_status,
ad.longitude as device_longitude,
ad.latitude as device_latitude,
ad.area_name,
@@ -73,71 +74,17 @@
and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
<where>
ts.is_deleted = 0
- <if test="param2.id != null and param2.id != ''">
- and ts.id = #{param2.id}
- </if>
- <if test="param2.deviceId != null and param2.deviceId != ''">
- and ts.device_id = #{param2.deviceId}
- </if>
- <if test="param2.areaDivideId != null and param2.areaDivideId != ''">
- and ts.area_divide_id = #{param2.areaDivideId}
- </if>
- <if test="param2.defenseSceneId != null and param2.defenseSceneId != ''">
- and ts.defense_scene_id = #{param2.defenseSceneId}
- </if>
- <if test="param2.longitude != null and param2.longitude != ''">
- and ts.longitude = #{param2.longitude}
- </if>
- <if test="param2.latitude != null and param2.latitude != ''">
- and ts.latitude = #{param2.latitude}
- </if>
- <if test="param2.dispatchUser != null and param2.dispatchUser != ''">
- and ts.dispatch_user = #{param2.dispatchUser}
- </if>
- <if test="param2.dispatchStartTime != null and param2.dispatchStartTime != ''">
- and ts.dispatch_start_time = #{param2.dispatchStartTime}
- </if>
- <if test="param2.dispatchEndTime != null and param2.dispatchEndTime != ''">
- and ts.dispatch_end_time = #{param2.dispatchEndTime}
- </if>
- <if test="param2.dispatchContent != null and param2.dispatchContent != ''">
- and ts.dispatch_content = #{param2.dispatchContent}
- </if>
- <if test="param2.dispatchResult != null and param2.dispatchResult != ''">
- and ts.dispatch_result = #{param2.dispatchResult}
- </if>
- <if test="param2.disposeMeasure != null and param2.disposeMeasure != ''">
- and ts.dispose_measure = #{param2.disposeMeasure}
- </if>
- <if test="param2.areaCode != null and param2.areaCode != ''">
- and ts.area_code = #{param2.areaCode}
- </if>
- <if test="param2.createUser != null and param2.createUser != ''">
- and ts.create_user = #{param2.createUser}
- </if>
- <if test="param2.createDept != null and param2.createDept != ''">
- and ts.create_dept = #{param2.createDept}
- </if>
- <if test="param2.createTime != null and param2.createTime != ''">
- and ts.create_time = #{param2.createTime}
- </if>
- <if test="param2.updateUser != null and param2.updateUser != ''">
- and ts.update_user = #{param2.updateUser}
- </if>
- <if test="param2.updateTime != null and param2.updateTime != ''">
- and ts.update_time = #{param2.updateTime}
- </if>
<if test="param2.deviceName != null and param2.deviceName != ''">
and d.device_name like concat('%', #{param2.deviceName}, '%')
</if>
<if test="param2.deviceSn != null and param2.deviceSn != ''">
and d.device_sn like concat('%', #{param2.deviceSn}, '%')
</if>
+ <if test="param2.deviceType != null and param2.deviceType != ''">
+ and d.device_type = #{param2.deviceType}
+ </if>
<if test="param2.status != null and param2.status != ''">
and d.status = #{param2.status}
- </if>
- <if test="param2.isDeleted != null and param2.isDeleted != ''">
- and ts.is_deleted = #{param2.isDeleted}
</if>
</where>
</select>
--
Gitblit v1.9.3