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