From 8d5b8a8c1909be6cdca5228a01bdc017b85a4078 Mon Sep 17 00:00:00 2001
From: rain <1679827795@qq.com>
Date: Wed, 21 Jan 2026 15:37:17 +0800
Subject: [PATCH] 处理Vo继承entity问题
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
index 25825d0..05b4769 100644
--- a/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
+++ b/drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml
@@ -23,6 +23,8 @@
<result column="detect_target_cnt" property="detectTargetCnt"/>
<result column="effective_range_km" property="effectiveRangeKm"/>
<result column="work_mode" property="workMode"/>
+ <result column="latitude" property="latitude"/>
+ <result column="longitude" property="longitude"/>
<result column="area_code" property="areaCode"/>
<result column="device_sn" property="deviceSn"/>
<result column="create_user" property="createUser"/>
@@ -76,6 +78,9 @@
#{item}
</foreach>
</if>
+ <if test="param2.status != null">
+ and status = #{param2.status}
+ </if>
</where>
</select>
@@ -118,6 +123,9 @@
</otherwise>
</choose>
)
+ </if>
+ <if test="status != null">
+ and status = #{status}
</if>
</where>
</select>
@@ -165,7 +173,7 @@
<!-- 获取设备类型统计数据 -->
<select id="getDeviceTypeStatistics" resultType="org.sxkj.fw.device.vo.DeviceTypeStatisticsVO">
- SELECT a.device_type,b.dict_value AS device_type_value,count(*) device_count, (SELECT COUNT(*) FROM ja_fw_device) as total_devices
+ SELECT a.device_type,b.dict_value AS device_type_value,count(*) device_count, (SELECT COUNT(*) FROM ja_fw_device where is_deleted = 0) as total_devices
FROM ja_fw_device a
LEFT JOIN blade_dict_biz b ON (
a.device_type = b.dict_key
@@ -243,6 +251,8 @@
left join ja_fw_task_schedule fts on d.id = fts.device_id
<where>
d.is_deleted = 0
+ and d.longitude is not null
+ and d.latitude is not null
<if test="param2.id != null and param2.id != ''">
and d.id = #{param2.id}
</if>
--
Gitblit v1.9.3