From 26d2f05c4e1d9855c0171dac9ca35fd47f4e7a84 Mon Sep 17 00:00:00 2001
From: daiyongfei <974332738@qq.com>
Date: Fri, 28 Nov 2025 10:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=91=E5=AE=9A=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../equipment/domain/query/DeviceQueryCriteria.java       | 8 ++++++++
 .../com/fuyuanshen/equipment/service/DeviceService.java   | 7 ++-----
 .../src/main/resources/mapper/equipment/DeviceMapper.xml  | 3 +++
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
index fa053673..5258b1e5 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/domain/query/DeviceQueryCriteria.java
@@ -123,4 +123,12 @@ public class DeviceQueryCriteria extends BaseEntity {
      */
     private Integer onlineStatus;
 
+    /**
+     * 绑定状态
+     * 0 未绑定
+     * 1 已绑定
+     */
+    @Schema(title = "绑定状态")
+    private Integer bindingStatus;
+
 }
diff --git a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java
index f0ab8143..d283534e 100644
--- a/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java
+++ b/fys-modules/fys-equipment/src/main/java/com/fuyuanshen/equipment/service/DeviceService.java
@@ -1,13 +1,10 @@
 package com.fuyuanshen.equipment.service;
 
-import cn.hutool.core.lang.Dict;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.fuyuanshen.common.core.domain.PageResult;
 import com.fuyuanshen.common.mybatis.core.page.PageQuery;
 import com.fuyuanshen.common.mybatis.core.page.TableDataInfo;
 import com.fuyuanshen.equipment.domain.Device;
-import com.fuyuanshen.equipment.domain.DeviceType;
 import com.fuyuanshen.equipment.domain.dto.AppDeviceBo;
 import com.fuyuanshen.equipment.domain.form.DeviceForm;
 import com.fuyuanshen.equipment.domain.query.DeviceQueryCriteria;
@@ -146,7 +143,7 @@ public interface DeviceService extends IService<Device> {
      * @return
      */
     List<Map<String, Object>> getEquipmentUsageData(Long deviceTypeId, Integer range);
-    
+
     /**
      * 根据设备IMEI查询设备
      *
@@ -191,7 +188,7 @@ public interface DeviceService extends IService<Device> {
     /**
      * 根据条件查询设备位置信息
      *
-     * @param groupId 设备分组ID
+     * @param groupId    设备分组ID
      * @param deviceType 设备类型
      * @param deviceImei 设备IMEI
      * @return 设备位置信息列表
diff --git a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
index 44059604..89c45dc2 100644
--- a/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
+++ b/fys-modules/fys-equipment/src/main/resources/mapper/equipment/DeviceMapper.xml
@@ -74,6 +74,9 @@
             <if test="criteria.onlineStatus != null">
                 and d.online_status = #{criteria.onlineStatus}
             </if>
+            <if test="criteria.bindingStatus != null">
+                and d.binding_status = #{criteria.bindingStatus}
+            </if>
             <if test="criteria.groupId != null">
                 and d.group_id = #{criteria.groupId}
             </if>