From 51eae2d7e152b0584d3c52a08f1bcb1477a8e5d6 Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Mon, 26 Sep 2022 10:15:08 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.2.5=E3=80=91=E6=9B=B4=E6=96=B0UserGr?= =?UTF-8?q?oup=E5=AE=9E=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysUserGroupController.java | 18 +++++++-------- .../modular/user/entity/SysUserGroup.java | 4 ++-- .../user/entity/SysUserGroupDetail.java | 22 +++++++++++++++---- .../SysUserGroupDetailExceptionEnum.java | 4 ++-- .../user/enums/SysUserGroupExceptionEnum.java | 4 ++-- .../user/mapper/SysUserGroupDetailMapper.java | 4 ++-- .../user/mapper/SysUserGroupMapper.java | 4 ++-- .../request/SysUserGroupDetailRequest.java | 20 +++++++++++++---- .../pojo/request/SysUserGroupRequest.java | 4 ++-- .../service/SysUserGroupDetailService.java | 16 +++++++------- .../user/service/SysUserGroupService.java | 16 +++++++------- .../impl/SysUserGroupDetailServiceImpl.java | 12 ++++++---- .../service/impl/SysUserGroupServiceImpl.java | 8 +++---- 13 files changed, 83 insertions(+), 53 deletions(-) diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java index d595256f7..7fa19c287 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java @@ -17,13 +17,13 @@ import javax.annotation.Resource; import java.util.List; /** - * 权限分组控制器 + * 用户组控制器 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @RestController -@ApiResource(name = "权限分组") +@ApiResource(name = "用户组") public class SysUserGroupController { @Resource @@ -33,7 +33,7 @@ public class SysUserGroupController { * 添加 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @PostResource(name = "添加", path = "/sysUserGroup/add") public ResponseData add(@RequestBody @Validated(SysUserGroupRequest.add.class) SysUserGroupRequest sysUserGroupRequest) { @@ -45,7 +45,7 @@ public class SysUserGroupController { * 删除 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @PostResource(name = "删除", path = "/sysUserGroup/delete") public ResponseData delete(@RequestBody @Validated(SysUserGroupRequest.delete.class) SysUserGroupRequest sysUserGroupRequest) { @@ -57,7 +57,7 @@ public class SysUserGroupController { * 编辑 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @PostResource(name = "编辑", path = "/sysUserGroup/edit") public ResponseData edit(@RequestBody @Validated(SysUserGroupRequest.edit.class) SysUserGroupRequest sysUserGroupRequest) { @@ -69,7 +69,7 @@ public class SysUserGroupController { * 查看详情 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @GetResource(name = "查看详情", path = "/sysUserGroup/detail") public ResponseData detail(@Validated(SysUserGroupRequest.detail.class) SysUserGroupRequest sysUserGroupRequest) { @@ -80,7 +80,7 @@ public class SysUserGroupController { * 获取列表 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @GetResource(name = "获取列表", path = "/sysUserGroup/list") public ResponseData> list(SysUserGroupRequest sysUserGroupRequest) { @@ -91,7 +91,7 @@ public class SysUserGroupController { * 获取列表（带分页） * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @GetResource(name = "分页查询", path = "/sysUserGroup/page") public ResponseData> page(SysUserGroupRequest sysUserGroupRequest) { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java index c23b1a693..898048f72 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java @@ -10,10 +10,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 权限分组实例类 + * 用户组实例类 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @TableName("sys_user_group") @Data diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java index e98f55238..f708a6c7a 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java @@ -10,10 +10,10 @@ import lombok.Data; import lombok.EqualsAndHashCode; /** - * 权限分组详情实例类 + * 用户组详情实例类 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @TableName("sys_user_group_detail") @Data @@ -35,10 +35,10 @@ public class SysUserGroupDetail extends BaseEntity { private Long userGroupId; /** - * 授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系 + * 授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系，6-部门审批人 */ @TableField("select_type") - @ChineseDescription("授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系") + @ChineseDescription("授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系，6-部门审批人") private Integer selectType; /** @@ -55,4 +55,18 @@ public class SysUserGroupDetail extends BaseEntity { @ChineseDescription("授权对象名称，例如：张三，研发部，管理员等") private String selectValueName; + /** + * 子选择对象值，目前只用在select_type为6时，代表审批人类型 + */ + @TableField("sub_select_value") + @ChineseDescription("子选择对象值，目前只用在select_type为6时，代表审批人类型") + private String subSelectValue; + + /** + * 子选择对象值的名称，目前只用在select_type为6时，代表审批人类型 + */ + @TableField("sub_select_value_name") + @ChineseDescription("子选择对象值的名称，目前只用在select_type为6时，代表审批人类型") + private String subSelectValueName; + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java index 439e1e4c1..95f6d035b 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java @@ -5,10 +5,10 @@ import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** - * 权限分组详情异常相关枚举 + * 用户组详情异常相关枚举 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @Getter public enum SysUserGroupDetailExceptionEnum implements AbstractExceptionEnum { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java index 143138e65..3983b34f7 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java @@ -5,10 +5,10 @@ import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum; import lombok.Getter; /** - * 权限分组异常相关枚举 + * 用户组异常相关枚举 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @Getter public enum SysUserGroupExceptionEnum implements AbstractExceptionEnum { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java index dfc044be0..c74da3c9b 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java @@ -4,10 +4,10 @@ import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroupDetail; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * 权限分组详情 Mapper 接口 + * 用户组详情 Mapper 接口 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ public interface SysUserGroupDetailMapper extends BaseMapper { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java index 6e2c73729..6c8ed885f 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java @@ -4,10 +4,10 @@ import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserGroup; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** - * 权限分组 Mapper 接口 + * 用户组 Mapper 接口 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ public interface SysUserGroupMapper extends BaseMapper { diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java index 8b7fb4021..c6fae4ca3 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; /** - * 权限分组详情封装类 + * 用户组详情封装类 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @EqualsAndHashCode(callSuper = true) @Data @@ -31,9 +31,9 @@ public class SysUserGroupDetailRequest extends BaseRequest { private Long userGroupId; /** - * 授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系 + * 授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系，6-部门审批人 */ - @ChineseDescription("授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系") + @ChineseDescription("授权对象类型：1-用户，2-部门，3-角色，4-职位，5-关系，6-部门审批人") private Integer selectType; /** @@ -48,4 +48,16 @@ public class SysUserGroupDetailRequest extends BaseRequest { @ChineseDescription("授权对象名称，例如：张三，研发部，管理员等") private String selectValueName; + /** + * 子选择对象值，目前只用在select_type为6时，代表审批人类型 + */ + @ChineseDescription("子选择对象值，目前只用在select_type为6时，代表审批人类型") + private String subSelectValue; + + /** + * 子选择对象值的名称，目前只用在select_type为6时，代表审批人类型 + */ + @ChineseDescription("子选择对象值的名称，目前只用在select_type为6时，代表审批人类型") + private String subSelectValueName; + } diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java index 55f67f894..4091e232c 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java @@ -8,10 +8,10 @@ import lombok.EqualsAndHashCode; import javax.validation.constraints.NotNull; /** - * 权限分组封装类 + * 用户组封装类 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @EqualsAndHashCode(callSuper = true) @Data diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java index 8dc39d036..64847ff9c 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * 权限分组详情 服务类 + * 用户组详情 服务类 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ public interface SysUserGroupDetailService extends IService { @@ -20,7 +20,7 @@ public interface SysUserGroupDetailService extends IService * * @param sysUserGroupDetailRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ void add(SysUserGroupDetailRequest sysUserGroupDetailRequest); @@ -29,7 +29,7 @@ public interface SysUserGroupDetailService extends IService * * @param sysUserGroupDetailRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ void del(SysUserGroupDetailRequest sysUserGroupDetailRequest); @@ -38,7 +38,7 @@ public interface SysUserGroupDetailService extends IService * * @param sysUserGroupDetailRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ void edit(SysUserGroupDetailRequest sysUserGroupDetailRequest); @@ -47,7 +47,7 @@ public interface SysUserGroupDetailService extends IService * * @param sysUserGroupDetailRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ SysUserGroupDetail detail(SysUserGroupDetailRequest sysUserGroupDetailRequest); @@ -57,7 +57,7 @@ public interface SysUserGroupDetailService extends IService * @param sysUserGroupDetailRequest 请求参数 * @return List 返回结果 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ List findList(SysUserGroupDetailRequest sysUserGroupDetailRequest); @@ -67,7 +67,7 @@ public interface SysUserGroupDetailService extends IService * @param sysUserGroupDetailRequest 请求参数 * @return PageResult 返回结果 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ PageResult findPage(SysUserGroupDetailRequest sysUserGroupDetailRequest); diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java index 4223a8282..64f61845d 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java @@ -8,10 +8,10 @@ import com.baomidou.mybatisplus.extension.service.IService; import java.util.List; /** - * 权限分组 服务类 + * 用户组 服务类 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ public interface SysUserGroupService extends IService { @@ -20,7 +20,7 @@ public interface SysUserGroupService extends IService { * * @param sysUserGroupRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ void add(SysUserGroupRequest sysUserGroupRequest); @@ -29,7 +29,7 @@ public interface SysUserGroupService extends IService { * * @param sysUserGroupRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ void del(SysUserGroupRequest sysUserGroupRequest); @@ -38,7 +38,7 @@ public interface SysUserGroupService extends IService { * * @param sysUserGroupRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ void edit(SysUserGroupRequest sysUserGroupRequest); @@ -47,7 +47,7 @@ public interface SysUserGroupService extends IService { * * @param sysUserGroupRequest 请求参数 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ SysUserGroup detail(SysUserGroupRequest sysUserGroupRequest); @@ -57,7 +57,7 @@ public interface SysUserGroupService extends IService { * @param sysUserGroupRequest 请求参数 * @return List 返回结果 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ List findList(SysUserGroupRequest sysUserGroupRequest); @@ -67,7 +67,7 @@ public interface SysUserGroupService extends IService { * @param sysUserGroupRequest 请求参数 * @return PageResult 返回结果 * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ PageResult findPage(SysUserGroupRequest sysUserGroupRequest); diff --git a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java index 6fcb72d0e..eaa30c7ee 100644 --- a/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java +++ b/kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java @@ -19,10 +19,10 @@ import org.springframework.stereotype.Service; import java.util.List; /** - * 权限分组详情业务实现层 + * 用户组详情业务实现层 * * @author fengshuonan - * @date 2022/09/25 22:11 + * @date 2022/09/26 10:12 */ @Service public class SysUserGroupDetailServiceImpl extends ServiceImpl implements SysUserGroupDetailService { @@ -69,7 +69,7 @@ public class SysUserGroupDetailServiceImpl extends ServiceImpl createWrapper(SysUserGroupDetailRequest sysUserGroupDetailRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); @@ -93,12 +93,16 @@ public class SysUserGroupDetailServiceImpl extends ServiceImpl implements SysUserGroupService { @@ -69,7 +69,7 @@ public class SysUserGroupServiceImpl extends ServiceImpl createWrapper(SysUserGroupRequest sysUserGroupRequest) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>();