From 501f1a74bbd57c18bceb6843cf298b851fef7b34 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 30 Mar 2022 13:34:12 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.2=E3=80=91=E3=80=90expand=E3=80=91?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../expand/modular/modular/entity/SysExpand.java  | 15 +++++++++++++++
 .../modular/pojo/request/SysExpandRequest.java    | 12 ++++++++++++
 .../service/impl/SysExpandServiceImpl.java        |  5 +++++
 3 files changed, 32 insertions(+)

diff --git a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/entity/SysExpand.java b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/entity/SysExpand.java
index 32e0b2d53..64db6077b 100644
--- a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/entity/SysExpand.java
+++ b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/entity/SysExpand.java
@@ -48,6 +48,13 @@ public class SysExpand extends BaseEntity {
     @ChineseDescription("状态：1-启用，2-禁用")
     private Integer expandStatus;
 
+    /**
+     * 主业务表，例如：sys_user
+     */
+    @TableField("primary_table_name")
+    @ChineseDescription("主业务表，例如：sys_user")
+    private String primaryTableName;
+
     /**
      * 业务主键id字段名，例如：user_id
      */
@@ -55,4 +62,12 @@ public class SysExpand extends BaseEntity {
     @ChineseDescription("业务主键id字段名，例如：user_id")
     private String primaryFieldName;
 
+    /**
+     * 业务主键id字段名驼峰法，例如：userId
+     */
+    @TableField("primary_field_camel")
+    @ChineseDescription("业务主键id字段名驼峰法，例如：userId")
+    private String primaryFieldCamel;
+
+
 }
diff --git a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandRequest.java b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandRequest.java
index 7434fc354..59611d1d4 100644
--- a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandRequest.java
+++ b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/pojo/request/SysExpandRequest.java
@@ -45,10 +45,22 @@ public class SysExpandRequest extends BaseRequest {
     @StatusValue(groups = updateStatus.class)
     private Integer expandStatus;
 
+    /**
+     * 主业务表，例如：sys_user
+     */
+    @ChineseDescription("主业务表，例如：sys_user")
+    private String primaryTableName;
+
     /**
      * 业务主键id字段名，例如：user_id
      */
     @ChineseDescription("业务主键id字段名，例如：user_id")
     private String primaryFieldName;
 
+    /**
+     * 业务主键id字段名驼峰法，例如：userId
+     */
+    @ChineseDescription("业务主键id字段名驼峰法，例如：userId")
+    private String primaryFieldCamel;
+
 }
diff --git a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java
index a5e48cda1..2ca4c93e6 100644
--- a/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java
+++ b/kernel-s-expand/expand-business/src/main/java/cn/stylefeng/roses/kernel/expand/modular/modular/service/impl/SysExpandServiceImpl.java
@@ -10,6 +10,7 @@ import cn.stylefeng.roses.kernel.expand.modular.modular.enums.SysExpandException
 import cn.stylefeng.roses.kernel.expand.modular.modular.mapper.SysExpandMapper;
 import cn.stylefeng.roses.kernel.expand.modular.modular.pojo.request.SysExpandRequest;
 import cn.stylefeng.roses.kernel.expand.modular.modular.service.SysExpandService;
+import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
 import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -31,6 +32,10 @@ public class SysExpandServiceImpl extends ServiceImpl<SysExpandMapper, SysExpand
     public void add(SysExpandRequest sysExpandRequest) {
         SysExpand sysExpand = new SysExpand();
         BeanUtil.copyProperties(sysExpandRequest, sysExpand);
+
+        // 设置启用状态
+        sysExpand.setExpandStatus(StatusEnum.ENABLE.getCode());
+
         this.save(sysExpand);
     }