From 08ddfad4530a014094c06fe68b8c2d9a0753403a Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 05 Aug 2026 14:09:29 +0800
Subject: [PATCH] fix(gd): 修复线索事件查询中的SQL语法错误
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml | 116 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 114 insertions(+), 2 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
index fb19e74..7c6017b 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwDeviceConfigMapper.xml
@@ -4,13 +4,125 @@
<!-- 通用查询映射结果 -->
<resultMap id="fwDeviceConfigResultMap" type="org.sxkj.fw.detection.entity.FwDeviceConfigEntity">
+ <result column="id" property="id"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="config_version" property="configVersion"/>
+ <result column="is_latest" property="isLatest"/>
+ <result column="config_json" property="configJson"/>
+ <result column="area_code" property="areaCode"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_dept" property="createDept"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
+ <result column="is_deleted" property="isDeleted"/>
+ </resultMap>
+
+ <resultMap id="fwDeviceConfigVoResultMap" type="org.sxkj.fw.detection.vo.FwDeviceConfigVO">
+ <result column="id" property="id"/>
+ <result column="device_id" property="deviceId"/>
+ <result column="config_version" property="configVersion"/>
+ <result column="is_latest" property="isLatest"/>
+ <result column="config_json" property="configJson"/>
+ <result column="area_code" property="areaCode"/>
+ <result column="create_user" property="createUser"/>
+ <result column="create_dept" property="createDept"/>
+ <result column="create_time" property="createTime"/>
+ <result column="update_user" property="updateUser"/>
+ <result column="update_time" property="updateTime"/>
+ <result column="status" property="status"/>
</resultMap>
- <select id="selectFwDeviceConfigPage" resultMap="fwDeviceConfigResultMap">
- select * from ja_fw_device_config where is_deleted = 0
+ <select id="selectFwDeviceConfigPage" resultMap="fwDeviceConfigVoResultMap">
+ select * from ja_fw_device_config
+ <where>
+ is_deleted = 0
+ <if test="param2.id != null and param2.id != ''">
+ and id = #{param2.id}
+ </if>
+ <if test="param2.deviceId != null and param2.deviceId != ''">
+ and device_id = #{param2.deviceId}
+ </if>
+ <if test="param2.configVersion != null and param2.configVersion != ''">
+ and config_version = #{param2.configVersion}
+ </if>
+ <if test="param2.isLatest != null and param2.isLatest != ''">
+ and is_latest = #{param2.isLatest}
+ </if>
+ <if test="param2.configJson != null and param2.configJson != ''">
+ and config_json = #{param2.configJson}
+ </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>
+ <if test="param2.status != null and param2.status != ''">
+ and status = #{param2.status}
+ </if>
+ <if test="param2.isDeleted != null and param2.isDeleted != ''">
+ and is_deleted = #{param2.isDeleted}
+ </if>
+ </where>
</select>
+ <select id="selectLatestByDeviceId" resultMap="fwDeviceConfigResultMap">
+ select * from ja_fw_device_config
+ <where>
+ is_deleted = 0
+ and device_id = #{deviceId}
+ and is_latest = 1
+ </where>
+ order by config_version desc
+ limit 1
+ </select>
+
+ <select id="selectLatestVersionByDeviceId" resultMap="fwDeviceConfigResultMap">
+ select * from ja_fw_device_config
+ <where>
+ is_deleted = 0
+ and device_id = #{deviceId}
+ </where>
+ order by config_version desc
+ limit 1
+ </select>
+
+ <select id="selectMaxConfigVersion" resultType="java.lang.Integer">
+ select max(config_version) from ja_fw_device_config
+ <where>
+ is_deleted = 0
+ and device_id = #{deviceId}
+ </where>
+ </select>
+
+ <update id="resetLatestByDeviceId">
+ update ja_fw_device_config
+ set is_latest = 0
+ <where>
+ is_deleted = 0
+ and device_id = #{deviceId}
+ and is_latest = 1
+ <if test="excludeId != null">
+ and id != #{excludeId}
+ </if>
+ </where>
+ </update>
+
<select id="exportFwDeviceConfig" resultType="org.sxkj.fw.detection.excel.FwDeviceConfigExcel">
SELECT * FROM ja_fw_device_config ${ew.customSqlSegment}
--
Gitblit v1.9.3