From 944a6bc7221e3da458e028a7c86462633cbb03f6 Mon Sep 17 00:00:00 2001
From: dzq <dzq@ys.com>
Date: Fri, 23 May 2025 10:49:42 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=99=BA=E8=83=BD=E6=9F=9C):=20=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=BD=92=E5=B1=9E=E7=B1=BB=E5=9E=8B=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E4=BB=A5=E6=94=AF=E6=8C=81=E5=88=86=E7=B1=BB=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在智能柜模块中新增`belong_type`字段，用于区分柜子的归属类型（0-借还柜，1-固资通）。该字段已添加到DTO、Entity和查询条件中，并同步更新了数据库表结构。此修改为后续功能扩展提供了基础支持。
---
 .../domain/cabinet/smartCabinet/db/SmartCabinetEntity.java | 4 ++++
 .../domain/cabinet/smartCabinet/dto/SmartCabinetDTO.java   | 3 +++
 .../smartCabinet/query/SearchSmartCabinetQuery.java        | 3 +++
 sql/20250521_ab98_user_tag.sql                             | 7 ++++++-
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java
index 9cb7f44..010859e 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/db/SmartCabinetEntity.java
@@ -43,6 +43,10 @@ public class SmartCabinetEntity extends BaseEntity<SmartCabinetEntity> {
     @TableField("main_cabinet")
     private Long mainCabinet;
 
+    @ApiModelProperty("归属类型（0-借还柜 1-固资通）")
+    @TableField("belong_type")
+    private Integer belongType;
+
     @ApiModelProperty("归属主柜名称")
     @TableField(exist = false)
     private String mainCabinetName;
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/SmartCabinetDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/SmartCabinetDTO.java
index eb98b76..1ad81ec 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/SmartCabinetDTO.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/dto/SmartCabinetDTO.java
@@ -37,6 +37,9 @@ public class SmartCabinetDTO {
     @ExcelColumn(name = "归属主柜ID")
     private Long mainCabinet;
 
+    @ExcelColumn(name = "归属类型（0-借还柜 1-固资通）")
+    private Integer belongType;
+
     @ExcelColumn(name = "归属主柜名称")
     private String mainCabinetName;
 
diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java
index a881ea4..aa78b14 100644
--- a/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java
+++ b/agileboot-domain/src/main/java/com/agileboot/domain/cabinet/smartCabinet/query/SearchSmartCabinetQuery.java
@@ -18,6 +18,8 @@ public class SearchSmartCabinetQuery<T> extends AbstractPageQuery<T> {
     private Date endTime;
     private Long mqttServerId;
     private Long shopId;
+    
+    private Integer belongType;
 
     @Override
     public QueryWrapper<T> addQueryCondition() {
@@ -28,6 +30,7 @@ public class SearchSmartCabinetQuery<T> extends AbstractPageQuery<T> {
             .eq(cabinetType != null, "sc.cabinet_type", cabinetType)
             .eq(mqttServerId!= null, "sc.mqtt_server_id", mqttServerId)
             .eq(shopId!= null, "sc.shop_id", shopId)
+            .eq(belongType!= null, "sc.belong_type", belongType)
             .eq(StrUtil.isNotEmpty(templateNo), "sc.template_no", templateNo)
             .eq("sc.deleted", false)
             .between(startTime != null && endTime != null, "sc.create_time", startTime, endTime);
diff --git a/sql/20250521_ab98_user_tag.sql b/sql/20250521_ab98_user_tag.sql
index e4599b5..bfad6e6 100644
--- a/sql/20250521_ab98_user_tag.sql
+++ b/sql/20250521_ab98_user_tag.sql
@@ -12,4 +12,9 @@ CREATE TABLE `ab98_user_tag` (
   PRIMARY KEY (`tag_id`),
   KEY `idx_user` (`ab98_user_id`),
   CONSTRAINT `fk_tag_user` FOREIGN KEY (`ab98_user_id`) REFERENCES `ab98_user` (`ab98_user_id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='用户标签表';
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='用户标签表';
+
+
+ALTER TABLE `smart_cabinet` 
+ADD COLUMN `belong_type` TINYINT NOT NULL DEFAULT 0 COMMENT '归属类型（0-借还柜 1-固资通）' 
+AFTER `main_cabinet`;
\ No newline at end of file