From e53ff7732127fa6cf127441c59ac2f0e7f8b161e Mon Sep 17 00:00:00 2001 From: dzq Date: Tue, 14 Oct 2025 09:32:29 +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=A0corpid=E5=AD=97=E6=AE=B5=E6=94=AF=E6=8C=81=E4=BC=81?= =?UTF-8?q?=E4=B8=9A=E5=BE=AE=E4=BF=A1=E9=9B=86=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为智能柜功能添加企业微信集成支持，包括数据库字段、实体类属性和查询条件 --- .../domain/cabinet/smartCabinet/db/SmartCabinetEntity.java | 4 ++++ .../cabinet/smartCabinet/query/SearchSmartCabinetQuery.java | 2 ++ sql/20251013_cabinet_corpid.sql | 2 ++ 3 files changed, 8 insertions(+) create mode 100644 sql/20251013_cabinet_corpid.sql 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 99e6433..66f9031 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 @@ -83,6 +83,10 @@ public class SmartCabinetEntity extends BaseEntity { @TableField("return_deadline") private Integer returnDeadline; + @ApiModelProperty("企业微信id") + @TableField("corpid") + private String corpid; + @ApiModelProperty("已用格口数") @TableField(exist = false) private Integer usedCells; 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 03a6fdc..d41f3f9 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,7 @@ public class SearchSmartCabinetQuery extends AbstractPageQuery { private Date endTime; private Long mqttServerId; private Long shopId; + private String corpid; private Integer belongType; private Integer mode; @@ -32,6 +33,7 @@ public class SearchSmartCabinetQuery extends AbstractPageQuery { .eq(cabinetType != null, "sc.cabinet_type", cabinetType) .eq(mqttServerId!= null, "sc.mqtt_server_id", mqttServerId) .eq(shopId!= null, "sc.shop_id", shopId) + .eq(StrUtil.isNotEmpty(corpid), "sc.corpid", corpid) .eq(belongType!= null, "sc.belong_type", belongType) .eq(mode != null, "sc.mode", mode) .eq(balanceEnable != null, "sc.balance_enable", balanceEnable) diff --git a/sql/20251013_cabinet_corpid.sql b/sql/20251013_cabinet_corpid.sql new file mode 100644 index 0000000..cbc0d6c --- /dev/null +++ b/sql/20251013_cabinet_corpid.sql @@ -0,0 +1,2 @@ +-- 为smart_cabinet表添加corpid字段 +ALTER TABLE `smart_cabinet` ADD COLUMN `corpid` varchar(50) DEFAULT NULL COMMENT '企业微信id'; \ No newline at end of file