From 442f8cf748c2191213ed93ccdd2633ac4f02e038 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 08 Jul 2026 10:50:59 +0800
Subject: [PATCH] feat(device): 添加设备使用年限和维护状态功能
---
drone-service/drone-fw/src/main/java/org/sxkj/fw/device/mapper/FwDeviceMapper.xml | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 3ba566d..530a73f 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
@@ -34,6 +34,8 @@
<result column="update_user" property="updateUser"/>
<result column="update_time" property="updateTime"/>
<result column="status" property="status"/>
+ <result column="use_date" property="useDate"/>
+ <result column="service_life" property="serviceLife"/>
<!-- <result column="is_deleted" property="isDeleted"/>-->
</resultMap>
@@ -75,6 +77,12 @@
</if>
<if test="param2.belongDept != null and param2.belongDept != ''">
and belong_dept::text = #{param2.belongDept}::text
+ </if>
+ <if test="param2.useDate != null">
+ and use_date = #{param2.useDate}
+ </if>
+ <if test="param2.serviceLife != null">
+ and service_life = #{param2.serviceLife}
</if>
<if test="param2.deviceStatusList != null and param2.deviceStatusList != ''">
and status::text in
@@ -670,6 +678,8 @@
d.update_time,
d.status,
d.is_deleted,
+ d.use_date,
+ d.service_life,
NULLIF(trim(d.latitude::text), '')::double precision AS latitude,
NULLIF(trim(d.longitude::text), '')::double precision AS longitude,
min(ad.id) as area_divide_id,
--
Gitblit v1.9.3