gitee
/
roses
mirror of https://gitee.com/stylefeng/roses
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

【7.2.5】更新UserGroup实体

pull/37/head
fengshuonan 2022-09-26 10:15:08 +08:00
parent 848a34e440
commit 51eae2d7e1
13 changed files with 83 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/controller/SysUserGroupController.java
View File

@ -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<SysUserGroup> 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<SysUserGroup> 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<SysUserGroup>> 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<PageResult<SysUserGroup>> page(SysUserGroupRequest sysUserGroupRequest) {

4
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroup.java
View File

@ -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

22
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/entity/SysUserGroupDetail.java
View File

@ -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;
}

4
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupDetailExceptionEnum.java
View File

@ -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 {

4
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/enums/SysUserGroupExceptionEnum.java
View File

@ -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 {

4
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupDetailMapper.java
View File

@ -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<SysUserGroupDetail> {

4
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/SysUserGroupMapper.java
View File

@ -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<SysUserGroup> {

20
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupDetailRequest.java
View File

@ -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;
}

4
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/request/SysUserGroupRequest.java
View File

@ -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

16
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupDetailService.java
View File

@ -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<SysUserGroupDetail> {
@ -20,7 +20,7 @@ public interface SysUserGroupDetailService extends IService<SysUserGroupDetail>
*
* @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<SysUserGroupDetail>
*
* @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<SysUserGroupDetail>
*
* @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<SysUserGroupDetail>
*
* @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<SysUserGroupDetail>
* @param sysUserGroupDetailRequest 请求参数
* @return List<SysUserGroupDetail> 返回结果
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
List<SysUserGroupDetail> findList(SysUserGroupDetailRequest sysUserGroupDetailRequest);
@ -67,7 +67,7 @@ public interface SysUserGroupDetailService extends IService<SysUserGroupDetail>
* @param sysUserGroupDetailRequest 请求参数
* @return PageResult<SysUserGroupDetail> 返回结果
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
PageResult<SysUserGroupDetail> findPage(SysUserGroupDetailRequest sysUserGroupDetailRequest);

16
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/SysUserGroupService.java
View File

@ -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<SysUserGroup> {
@ -20,7 +20,7 @@ public interface SysUserGroupService extends IService<SysUserGroup> {
*
* @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<SysUserGroup> {
*
* @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<SysUserGroup> {
*
* @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<SysUserGroup> {
*
* @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<SysUserGroup> {
* @param sysUserGroupRequest 请求参数
* @return List<SysUserGroup> 返回结果
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
List<SysUserGroup> findList(SysUserGroupRequest sysUserGroupRequest);
@ -67,7 +67,7 @@ public interface SysUserGroupService extends IService<SysUserGroup> {
* @param sysUserGroupRequest 请求参数
* @return PageResult<SysUserGroup> 返回结果
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
PageResult<SysUserGroup> findPage(SysUserGroupRequest sysUserGroupRequest);

12
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupDetailServiceImpl.java
View File

@ -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<SysUserGroupDetailMapper, SysUserGroupDetail> implements SysUserGroupDetailService {
@ -69,7 +69,7 @@ public class SysUserGroupDetailServiceImpl extends ServiceImpl<SysUserGroupDetai
* 获取信息
*
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
private SysUserGroupDetail querySysUserGroupDetail(SysUserGroupDetailRequest sysUserGroupDetailRequest) {
SysUserGroupDetail sysUserGroupDetail = this.getById(sysUserGroupDetailRequest.getDetailId());
@ -83,7 +83,7 @@ public class SysUserGroupDetailServiceImpl extends ServiceImpl<SysUserGroupDetai
* 创建查询wrapper
*
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
private LambdaQueryWrapper<SysUserGroupDetail> createWrapper(SysUserGroupDetailRequest sysUserGroupDetailRequest) {
LambdaQueryWrapper<SysUserGroupDetail> queryWrapper = new LambdaQueryWrapper<>();
@ -93,12 +93,16 @@ public class SysUserGroupDetailServiceImpl extends ServiceImpl<SysUserGroupDetai
Integer selectType = sysUserGroupDetailRequest.getSelectType();
Long selectValue = sysUserGroupDetailRequest.getSelectValue();
String selectValueName = sysUserGroupDetailRequest.getSelectValueName();
String subSelectValue = sysUserGroupDetailRequest.getSubSelectValue();
String subSelectValueName = sysUserGroupDetailRequest.getSubSelectValueName();
queryWrapper.eq(ObjectUtil.isNotNull(detailId), SysUserGroupDetail::getDetailId, detailId);
queryWrapper.eq(ObjectUtil.isNotNull(userGroupId), SysUserGroupDetail::getUserGroupId, userGroupId);
queryWrapper.eq(ObjectUtil.isNotNull(selectType), SysUserGroupDetail::getSelectType, selectType);
queryWrapper.eq(ObjectUtil.isNotNull(selectValue), SysUserGroupDetail::getSelectValue, selectValue);
queryWrapper.like(ObjectUtil.isNotEmpty(selectValueName), SysUserGroupDetail::getSelectValueName, selectValueName);
queryWrapper.like(ObjectUtil.isNotEmpty(subSelectValue), SysUserGroupDetail::getSubSelectValue, subSelectValue);
queryWrapper.like(ObjectUtil.isNotEmpty(subSelectValueName), SysUserGroupDetail::getSubSelectValueName, subSelectValueName);
return queryWrapper;
}

8
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/service/impl/SysUserGroupServiceImpl.java
View File

@ -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 SysUserGroupServiceImpl extends ServiceImpl<SysUserGroupMapper, SysUserGroup> implements SysUserGroupService {
@ -69,7 +69,7 @@ public class SysUserGroupServiceImpl extends ServiceImpl<SysUserGroupMapper, Sys
* 获取信息
*
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
private SysUserGroup querySysUserGroup(SysUserGroupRequest sysUserGroupRequest) {
SysUserGroup sysUserGroup = this.getById(sysUserGroupRequest.getUserGroupId());
@ -83,7 +83,7 @@ public class SysUserGroupServiceImpl extends ServiceImpl<SysUserGroupMapper, Sys
* 创建查询wrapper
*
* @author fengshuonan
* @date 2022/09/25 22:11
* @date 2022/09/26 10:12
*/
private LambdaQueryWrapper<SysUserGroup> createWrapper(SysUserGroupRequest sysUserGroupRequest) {
LambdaQueryWrapper<SysUserGroup> queryWrapper = new LambdaQueryWrapper<>();