From a3203854c53ab943cc51b22444d56ab01e87546f Mon Sep 17 00:00:00 2001
From: qinyulong <yulong.qin@ceict.com.cn>
Date: Mon, 5 Jan 2026 14:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=8F=B0=E8=B4=A6=E6=A3=80?=
 =?UTF-8?q?=E7=B4=A2=E6=9D=A1=E4=BB=B6=E5=A2=9E=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../desk/device/pojo/entity/EquipmentEntity.java       | 10 +++++++++-
 .../desk/device/controller/EquipmentController.java    |  3 +++
 .../desk/device/service/impl/EquipmentServiceImpl.java |  5 ++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
index b7ea22db..f7795037 100644
--- a/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
+++ b/blade-service-api/blade-desk-api/src/main/java/org/springblade/desk/device/pojo/entity/EquipmentEntity.java
@@ -88,7 +88,7 @@ public class EquipmentEntity extends BaseEntity {
 	 * 是否对接;1.是,   0.否
 	 */
 	@Schema(description = "是否对接;1.是,   0.否")
-	private String docking;
+	private String docking = "0";
 	/**
 	 * 类别说明
 	 */
@@ -120,4 +120,12 @@ public class EquipmentEntity extends BaseEntity {
 	@Schema(description = "附件链接")
 	private String attachLink;
 
+	public void setDocking(String docking) {
+		// 核心逻辑：如果传入的是 null 或空字符串，则使用默认值 "0"
+		if (docking == null || docking.trim().isEmpty()) {
+			this.docking = "0";
+		} else {
+			this.docking = docking;
+		}
+	}
 }
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
index dba4cb35..d2e84e4f 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/controller/EquipmentController.java
@@ -94,6 +94,9 @@ public class EquipmentController extends BladeController {
 			@Parameter(name = "deviceCode", description = "设备编码", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 			@Parameter(name = "deviceName", description = "设备名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 			@Parameter(name = "category", description = "设备分类", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+			@Parameter(name = "typeName", description = "类别名称", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
+			@Parameter(name = "used", description = "服役状态", in = ParameterIn.QUERY, schema = @Schema(type = "Integer")),
+			@Parameter(name = "virtualMac", description = "虚拟设备", in = ParameterIn.QUERY, schema = @Schema(type = "string")),
 	})
 	public R<IPage<EquipmentVO>> page(@Parameter(hidden = true)EquipmentEntity equipment, Query query) {
 		IPage<EquipmentEntity> pages = equipmentService.selectEquipmentPage(Condition.getPage(query), equipment);
diff --git a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
index 2c4ccf78..12922a57 100644
--- a/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
+++ b/blade-service/blade-desk/src/main/java/org/springblade/desk/device/service/impl/EquipmentServiceImpl.java
@@ -59,7 +59,10 @@ public class EquipmentServiceImpl extends BaseServiceImpl<EquipmentMapper, Equip
 		// 根据实体对象 entity 中字段是否为空，来动态拼接WHERE条件
 		wrapper.like(Objects.nonNull(equipment.getDeviceCode()), EquipmentEntity::getDeviceCode, equipment.getDeviceCode())
 				.like(Objects.nonNull(equipment.getDeviceName()), EquipmentEntity::getDeviceName, equipment.getDeviceName())
-				.like(Objects.nonNull(equipment.getCategory()), EquipmentEntity::getCategory, equipment.getCategory());
+				.like(Objects.nonNull(equipment.getCategory()), EquipmentEntity::getCategory, equipment.getCategory())
+				.like(Objects.nonNull(equipment.getTypeName()), EquipmentEntity::getTypeName, equipment.getTypeName())
+				.eq(Objects.nonNull(equipment.getUsed()), EquipmentEntity::getUsed, equipment.getUsed())
+				.eq(Objects.nonNull(equipment.getVirtualMac()), EquipmentEntity::getVirtualMac, equipment.getVirtualMac());
 
 		// 3. 执行分页查询
 		return baseMapper.selectPage(page, wrapper);