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

合并冲突

pull/3/head
liuhanqing 2021-02-03 21:00:33 +08:00
parent 213785d89f 0770d68a51
commit 58903b66f0
41 changed files with 630 additions and 396 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/LoginLogServiceApi.java
View File

@ -1,6 +1,6 @@
package cn.stylefeng.roses.kernel.system;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
/**
* 登录日志api接口

7
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/exception/enums/SysUserOrgExceptionEnum.java
View File

@ -27,7 +27,12 @@ public enum SysUserOrgExceptionEnum implements AbstractExceptionEnum {
/**
* 用户未设置主部门，或主部门信息为多个
*/
EMPLOYEE_NOT_OR_MANY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "23", "用户未设置主部门，或主部门信息为多个");
EMPLOYEE_NOT_OR_MANY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "23", "用户未设置主部门，或主部门信息为多个"),
/**
* 用户组织或部门不存在
*/
USER_ORG_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "24", "用户组织或部门不存在：用户组织id：{}");
/**
* 错误编码

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrPositionRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/HrPositionRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.organization;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/request/SysAppRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysAppRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.app.request;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.validator.validators.status.StatusValue;

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/loginlog/request/SysLoginLogRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysLoginLogRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.loginlog.request;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import lombok.Data;

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuButtonRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysMenuButtonRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.menu;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.validator.validators.unique.TableUniqueValue;

2
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/menu/SysMenuRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/SysMenuRequest.java
View File

@ -1,4 +1,4 @@
package cn.stylefeng.roses.kernel.system.pojo.menu;
package cn.stylefeng.roses.kernel.system.pojo;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.validator.validators.flag.FlagValue;

29
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserDataScopeRequest.java Normal file
View File

@ -0,0 +1,29 @@
package cn.stylefeng.roses.kernel.system.pojo;
import lombok.Data;
/**
* 用户数据范围
*
* @author chenjinlong
* @date 2021/2/3 15:35
*/
@Data
public class UserDataScopeRequest {
/**
* 主键
*/
private Long userDataScopeId;
/**
* 用户id
*/
private Long userId;
/**
* 机构id
*/
private Long orgId;
}

33
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserOrgRequest.java Normal file
View File

@ -0,0 +1,33 @@
package cn.stylefeng.roses.kernel.system.pojo;
import lombok.Data;
/**
* 用户组织机构关联
*
* @author chenjinlong
* @date 2021/2/3 10:51
*/
@Data
public class UserOrgRequest {
/**
* 主键
*/
private Long userOrgId;
/**
* 用户id
*/
private Long userId;
/**
* 所属机构id
*/
private Long orgId;
/**
* 职位id
*/
private Long positionId;
}

29
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/UserRoleRequest.java Normal file
View File

@ -0,0 +1,29 @@
package cn.stylefeng.roses.kernel.system.pojo;
import lombok.Data;
/**
* 用户角色
*
* @author chenjinlong
* @date 2021/2/3 14:53
*/
@Data
public class UserRoleRequest {
/**
* 主键
*/
private Long userRoleId;
/**
* 用户id
*/
private Long userId;
/**
* 角色id
*/
private Long roleId;
}

67
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/app/response/SysAppResponse.java
View File

@ -1,67 +0,0 @@
package cn.stylefeng.roses.kernel.system.pojo.app.response;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
* 系统应用表
*
* @author fengshuonan
* @date 2020/11/24 21:05
*/
@Data
public class SysAppResponse implements Serializable {
/**
* 主键id
*/
private Long appId;
/**
* 应用名称
*/
private String appName;
/**
* 编码
*/
private String appCode;
/**
* 是否默认激活（Y-是，N-否）
*/
private String activeFlag;
/**
* 状态（字典 1启用 2禁用）
*/
private Integer statusFlag;
/**
* 是否删除（Y-已删除，N-未删除）
*/
private String delFlag;
/**
* 创建时间
*/
private Date createTime;
/**
* 创建人
*/
private Long createUser;
/**
* 修改时间
*/
private Date updateTime;
/**
* 修改人
*/
private Long updateUser;
}

46
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/loginlog/response/SysLoginLogResponse.java
View File

@ -1,46 +0,0 @@
package cn.stylefeng.roses.kernel.system.pojo.loginlog.response;
import lombok.Data;
import java.io.Serializable;
/**
* 登录日志表
*
* @author chenjinlong
* @date 2021/1/13 11:06
*/
@Data
public class SysLoginLogResponse implements Serializable {
/**
* 主键id
*/
private Long llgId;
/**
* 日志名称
*/
private String llgName;
/**
* 是否执行成功
*/
private String llgSucceed;
/**
* 具体消息
*/
private String llgMessage;
/**
* 登录ip
*/
private String llgIpAddress;
/**
* 用户id
*/
private Long userId;
}

0
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/notice/request/SysNoticeRequest.java → kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/request/SysNoticeRequest.java
View File

6
kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/user/SysUserResponse.java
View File

@ -3,6 +3,7 @@ package cn.stylefeng.roses.kernel.system.pojo.user;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* 系统用户结果
@ -78,4 +79,9 @@ public class SysUserResponse {
*/
private Integer statusFlag;
/**
* 用户角色id
*/
private List<Long> grantRoleIdList;
}

2
kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/controller/SysAppController.java
View File

@ -6,7 +6,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.pojo.app.request.SysAppRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

2
kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/SysAppService.java
View File

@ -26,7 +26,7 @@ package cn.stylefeng.roses.kernel.app.modular.service;
import cn.stylefeng.roses.kernel.app.modular.entity.SysApp;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.system.pojo.app.request.SysAppRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

2
kernel-s-system/system-business-app/src/main/java/cn/stylefeng/roses/kernel/app/modular/service/impl/SysAppServiceImpl.java
View File

@ -16,7 +16,7 @@ import cn.stylefeng.roses.kernel.system.AppServiceApi;
import cn.stylefeng.roses.kernel.system.MenuServiceApi;
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
import cn.stylefeng.roses.kernel.system.exception.enums.AppExceptionEnum;
import cn.stylefeng.roses.kernel.system.pojo.app.request.SysAppRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysAppRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;

2
kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/controller/SysLoginLogController.java
View File

@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.ApiResource;
import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RestController;

2
kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/service/SysLoginLogService.java
View File

@ -27,7 +27,7 @@ package cn.stylefeng.roses.kernel.loginlog.modular.service;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.loginlog.modular.entity.SysLoginLog;
import cn.stylefeng.roses.kernel.system.LoginLogServiceApi;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
import com.baomidou.mybatisplus.extension.service.IService;
/**

2
kernel-s-system/system-business-login-log/src/main/java/cn/stylefeng/roses/kernel/loginlog/modular/service/impl/SysLoginLogServiceImpl.java
View File

@ -13,7 +13,7 @@ import cn.stylefeng.roses.kernel.loginlog.modular.service.SysLoginLogService;
import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil;
import cn.stylefeng.roses.kernel.system.exception.enums.AppExceptionEnum;
import cn.stylefeng.roses.kernel.system.pojo.loginlog.request.SysLoginLogRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysLoginLogRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuButtonController.java
View File

@ -8,7 +8,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.GetResource;
import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysMenuButtonRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

2
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/controller/SysMenuController.java
View File

@ -9,7 +9,7 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode;
import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysMenuRequest;
import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse;
import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiMenuAndButtonTreeResponse;
import cn.stylefeng.roses.kernel.system.pojo.role.request.SysRoleRequest;

2
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuButtonService.java
View File

@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.menu.modular.service;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenuButton;
import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysMenuButtonRequest;
import com.baomidou.mybatisplus.extension.service.IService;
/**

2
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/SysMenuService.java
View File

@ -26,7 +26,7 @@ package cn.stylefeng.roses.kernel.menu.modular.service;
import cn.stylefeng.roses.kernel.menu.modular.entity.SysMenu;
import cn.stylefeng.roses.kernel.rule.pojo.ztree.ZTreeNode;
import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysMenuRequest;
import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdIndexMenuTreeNode;
import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse;
import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenus;

2
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuButtonServiceImpl.java
View File

@ -14,7 +14,7 @@ import cn.stylefeng.roses.kernel.menu.modular.service.SysMenuService;
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
import cn.stylefeng.roses.kernel.system.exception.enums.SysMenuButtonExceptionEnum;
import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuButtonRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysMenuButtonRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

2
kernel-s-system/system-business-menu/src/main/java/cn/stylefeng/roses/kernel/menu/modular/service/impl/SysMenuServiceImpl.java
View File

@ -53,7 +53,7 @@ import cn.stylefeng.roses.kernel.system.constants.SymbolConstant;
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
import cn.stylefeng.roses.kernel.system.exception.enums.SysMenuExceptionEnum;
import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum;
import cn.stylefeng.roses.kernel.system.pojo.menu.SysMenuRequest;
import cn.stylefeng.roses.kernel.system.pojo.SysMenuRequest;
import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdIndexMenuTreeNode;
import cn.stylefeng.roses.kernel.system.pojo.menu.antd.AntdSysMenuResponse;
import cn.stylefeng.roses.kernel.system.pojo.menu.layui.LayuiAppIndexMenus;

2
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrPositionController.java
View File

@ -7,7 +7,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.modular.organization.service.HrPositionService;
import cn.stylefeng.roses.kernel.system.pojo.organization.HrPositionRequest;
import cn.stylefeng.roses.kernel.system.pojo.HrPositionRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;

2
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/HrPositionService.java
View File

@ -2,7 +2,7 @@ package cn.stylefeng.roses.kernel.system.modular.organization.service;
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition;
import cn.stylefeng.roses.kernel.system.pojo.organization.HrPositionRequest;
import cn.stylefeng.roses.kernel.system.pojo.HrPositionRequest;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;

2
kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/service/impl/HrPositionServiceImpl.java
View File

@ -14,7 +14,7 @@ import cn.stylefeng.roses.kernel.system.exception.enums.PositionExceptionEnum;
import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrPosition;
import cn.stylefeng.roses.kernel.system.modular.organization.mapper.HrPositionMapper;
import cn.stylefeng.roses.kernel.system.modular.organization.service.HrPositionService;
import cn.stylefeng.roses.kernel.system.pojo.organization.HrPositionRequest;
import cn.stylefeng.roses.kernel.system.pojo.HrPositionRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;

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

@ -8,8 +8,6 @@ import cn.stylefeng.roses.kernel.resource.api.annotation.PostResource;
import cn.stylefeng.roses.kernel.rule.pojo.request.BaseRequest;
import cn.stylefeng.roses.kernel.rule.pojo.response.ResponseData;
import cn.stylefeng.roses.kernel.rule.pojo.response.SuccessResponseData;
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
@ -19,7 +17,6 @@ import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
/**
@ -202,12 +199,7 @@ public class SysUserController {
@GetResource(name = "系统用户_获取用户的角色列表", path = "/sysUser/getUserRoles")
public ResponseData ownRole(@Validated(SysUserRequest.detail.class) SysUserRequest sysUserRequest) {
Long userId = sysUserRequest.getUserId();
try {
List<SysUserRole> userRoles = sysUserRoleService.getUserRoles(userId);
return new SuccessResponseData(userRoles);
} catch (SystemModularException e) {
return new SuccessResponseData(new ArrayList<>());
}
return new SuccessResponseData(sysUserRoleService.findListByUserId(userId));
}
/**

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

@ -1,10 +1,10 @@
package cn.stylefeng.roses.kernel.system.modular.user.mapper;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser;
import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse;
import org.apache.ibatis.annotations.Param;
import java.util.List;

10
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/mapper/mapping/SysUserMapper.xml
View File

@ -3,7 +3,7 @@
<mapper namespace="cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserMapper">
<!--获取用户分页列表-->
<select id="findUserPage" resultType="cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse">
<select id="findUserPage" resultType="cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse">
select
suser.user_id as userId,
suser.account as account,
@ -31,7 +31,8 @@
and suser.status_flag like concat('%',#{sysUserRequest.statusFlag},'%')
</if>
<if test="sysUserRequest.orgId != null and sysUserRequest.orgId != ''">
and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or org_id=#{sysUserRequest.orgId})
and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or
org_id=#{sysUserRequest.orgId})
</if>
and suser.del_flag = 'N'
order by suser.create_time desc
@ -40,7 +41,7 @@
</select>
<!--获取用户列表-->
<select id="findUserList" resultType="cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse">
<select id="findUserList" resultType="cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse">
select
suser.user_id as userId,
suser.account as account,
@ -68,7 +69,8 @@
and suser.status_flag like concat('%',#{sysUserRequest.statusFlag},'%')
</if>
<if test="sysUserRequest.orgId != null and sysUserRequest.orgId != ''">
and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or org_id=#{sysUserRequest.orgId})
and suorg.org_id in(select org_id from hr_organization where org_pids like CONCAT('%[',#{sysUserRequest.orgId},']%') or
org_id=#{sysUserRequest.orgId})
</if>
and suser.del_flag = 'N'
order by suser.create_time desc

88
kernel-s-system/system-business-user/src/main/java/cn/stylefeng/roses/kernel/system/modular/user/pojo/response/SysUserResponse.java
View File

@ -1,88 +0,0 @@
package cn.stylefeng.roses.kernel.system.modular.user.pojo.response;
import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data;
import java.util.Date;
import java.util.List;
/**
* 系统用户结果
*
* @author fengshuonan
* @date 2020/4/2 9:19
*/
@Data
public class SysUserResponse {
/**
* 主键
*/
private Long userId;
/**
* 账号
*/
private String account;
/**
* 昵称
*/
private String nickName;
/**
* 姓名
*/
private String realName;
/**
* 头像
*/
private Long avatar;
/**
* 生日
*/
@JsonFormat(pattern = "yyyy-MM-dd")
private Date birthday;
/**
* 性别（M-男，F-女）
*/
private String sex;
/**
* 邮箱
*/
private String email;
/**
* 手机
*/
private String phone;
/**
* 电话
*/
private String tel;
/**
* 用户所属机构
*/
private Long orgId;
/**
* 用户所属机构的职务
*/
private Long positionId;
/**
* 状态
*/
private Integer statusFlag;
/**
* 用户角色id
*/
private List<Long> grantRoleIdList;
}

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

@ -1,6 +1,7 @@
package cn.stylefeng.roses.kernel.system.modular.user.service;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope;
import cn.stylefeng.roses.kernel.system.pojo.UserDataScopeRequest;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import com.baomidou.mybatisplus.extension.service.IService;
@ -14,14 +15,51 @@ import java.util.List;
*/
public interface SysUserDataScopeService extends IService<SysUserDataScope> {
/**
* 授权数据范围（组织机构id集合）给某个用户
* 新增
*
* @param sysUserRequest 授权参数
* @author fengshuonan
* @date 2020/11/21 14:49
* @param userDataScopeRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void grantData(SysUserRequest sysUserRequest);
void add(UserDataScopeRequest userDataScopeRequest);
/**
* 删除
*
* @param userDataScopeRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void del(UserDataScopeRequest userDataScopeRequest);
/**
* 根据 用户id 删除
*
* @param userId 用户id
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void delByUserId(Long userId);
/**
* 修改
*
* @param userDataScopeRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void edit(UserDataScopeRequest userDataScopeRequest);
/**
* 查询-详情-根据主键id
*
* @param userDataScopeRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
SysUserDataScope detail(UserDataScopeRequest userDataScopeRequest);
/**
* 获取用户的数据范围id集合
@ -31,14 +69,23 @@ public interface SysUserDataScopeService extends IService<SysUserDataScope> {
* @author luojie
* @date 2020/11/6 15:01
*/
List<Long> getUserDataScopeIdList(Long uerId);
List<Long> findOrgIdsByUserId(Long uerId);
/**
* 根据用户id删除对应的用户-数据范围关联信息
* 查询-列表-按实体对象
*
* @param userId 用户id
* @author luojie
* @date 2020/11/6 15:01
* @param userDataScopeRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void deleteUserDataScopeListByUserId(Long userId);
List<SysUserDataScope> findList(UserDataScopeRequest userDataScopeRequest);
/**
* 分配数据范围
*
* @author chenjinlong
* @date 2021/2/3 15:49
*/
void assignData(SysUserRequest sysUserRequest);
}

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

@ -2,8 +2,11 @@ package cn.stylefeng.roses.kernel.system.modular.user.service;
import cn.stylefeng.roses.kernel.system.UserOrgServiceApi;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg;
import cn.stylefeng.roses.kernel.system.pojo.UserOrgRequest;
import com.baomidou.mybatisplus.extension.service.IService;
import java.util.List;
/**
* 用户组织机构关联信息
*
@ -13,19 +16,80 @@ import com.baomidou.mybatisplus.extension.service.IService;
public interface SysUserOrgService extends IService<SysUserOrg>, UserOrgServiceApi {
/**
* 更新用户组织机构绑定
* 新增
*
* @author fengshuonan
* @date 2020/12/19 22:29
* @param userOrgResponse 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void updateUserOrg(Long userId, Long orgId, Long positionId);
void add(UserOrgRequest userOrgResponse);
/**
* 删除用户对应的组织机构信息
* 新增
*
* @author fengshuonan
* @date 2020/12/19 22:38
* @param userId 用户id
* @param orgId 机构id
* @param positionId 部门id
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void deleteUserOrg(Long userId);
void add(Long userId, Long orgId, Long positionId);
/**
* 删除
*
* @param userOrgResponse 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void del(UserOrgRequest userOrgResponse);
/**
* 删除
*
* @param userId 用户id
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void delByUserId(Long userId);
/**
* 修改
*
* @param userOrgResponse 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void edit(UserOrgRequest userOrgResponse);
/**
* 修改
*
* @param userId 用户id
* @param orgId 机构id
* @param positionId 部门id
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void edit(Long userId, Long orgId, Long positionId);
/**
* 详情
*
* @param userOrgResponse 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
SysUserOrg detail(UserOrgRequest userOrgResponse);
/**
* 查询-列表
*
* @param userOrgResponse 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
List<SysUserOrg> findList(UserOrgRequest userOrgResponse);
}

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

@ -1,6 +1,7 @@
package cn.stylefeng.roses.kernel.system.modular.user.service;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole;
import cn.stylefeng.roses.kernel.system.pojo.UserRoleRequest;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import com.baomidou.mybatisplus.extension.service.IService;
@ -9,46 +10,94 @@ import java.util.List;
/**
* 系统用户角色service接口
*
* @author luojie
* @date 2020/11/6 10:28
* @author chenjinlong
* @date 2021/2/3 15:23
*/
public interface SysUserRoleService extends IService<SysUserRole> {
/**
* 获取账号绑定的角色
*
* @param userId 用户id
* @author fengshuonan
* @date 2020/12/22 16:52
*/
List<SysUserRole> getUserRoles(Long userId);
/**
* 获取账号绑定的角色id集合
* 新增
*
* @param userId 用户id
* @return 角色id集合
* @param userRoleRequest 参数对象
* @author chenjinlong
* @date 2021/1/12 19:42
* @date 2021/1/26 12:52
*/
List<Long> getUserRoleIds(Long userId);
void add(UserRoleRequest userRoleRequest);
/**
* 给某个用户授权角色
* 删除
*
* @param sysUserRequest 用户和角色id集合
* @author fengshuonan
* @date 2020/11/21 14:44
* @param userRoleRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void grantRole(SysUserRequest sysUserRequest);
void del(UserRoleRequest userRoleRequest);
/**
* 根据用户id删除对应的用户-角色表关联信息
* 根据用户id删除角色
*
* @param userId 用户id
* @author luojie
* @date 2020/11/6 15:03
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void deleteUserRoleListByUserId(Long userId);
void delByUserId(Long userId);
/**
* 修改
*
* @param userRoleRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
void edit(UserRoleRequest userRoleRequest);
/**
* 查询-详情
*
* @param userRoleRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
SysUserRole detail(UserRoleRequest userRoleRequest);
/**
* 查询-列表
*
* @param userRoleRequest 参数对象
* @author chenjinlong
* @date 2021/1/26 12:52
*/
List<SysUserRole> findList(UserRoleRequest userRoleRequest);
/**
* 根据userId查询列表
*
* @param userId 用户id
* @return
* @author chenjinlong
* @date 2021/2/3 15:06
*/
List<SysUserRole> findListByUserId(Long userId);
/**
* 根据userId查询角色集合
*
* @param userId 用户id
* @return 用户角色集合
* @author chenjinlong
* @date 2021/2/3 15:09
*/
List<Long> findRoleIdsByUserId(Long userId);
/**
* 角色分配
*
* @param sysUserRequest 请求参数
* @return
* @author chenjinlong
* @date 2021/2/3 15:16
*/
void assignRoles(SysUserRequest sysUserRequest);
}

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

@ -5,7 +5,7 @@ import cn.stylefeng.roses.kernel.rule.pojo.dict.SimpleDict;
import cn.stylefeng.roses.kernel.rule.pojo.tree.UserSelectTreeNode;
import cn.stylefeng.roses.kernel.system.UserServiceApi;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUser;
import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse;
import cn.stylefeng.roses.kernel.system.pojo.user.SysUserResponse;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import com.baomidou.mybatisplus.extension.service.IService;

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

@ -1,14 +1,18 @@
package cn.stylefeng.roses.kernel.system.modular.user.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserDataScope;
import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserDataScopeMapper;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService;
import cn.stylefeng.roses.kernel.system.pojo.UserDataScopeRequest;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -22,44 +26,107 @@ import java.util.stream.Collectors;
public class SysUserDataScopeServiceImpl extends ServiceImpl<SysUserDataScopeMapper, SysUserDataScope> implements SysUserDataScopeService {
@Override
public void grantData(SysUserRequest sysUserRequest) {
@Transactional(rollbackFor = Exception.class)
public void assignData(SysUserRequest sysUserRequest) {
// 获取用户id
Long userId = sysUserRequest.getUserId();
// 删除该用户的数据范围集合，sys_user_data_scope表中
LambdaQueryWrapper<SysUserDataScope> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserDataScope::getUserId, userId);
this.remove(queryWrapper);
// 删除用户所有授权范围
this.delByUserId(userId);
List<Long> orgIdList = sysUserRequest.getGrantOrgIdList();
List<Long> orgIds = sysUserRequest.getGrantOrgIdList();
// 授权组织机构数据范围给用户
ArrayList<SysUserDataScope> sysUserDataScopes = new ArrayList<>();
for (Long orgId : orgIdList) {
List<SysUserDataScope> sysUserDataScopeList = CollUtil.newArrayList();
// 批量添加数据范围
orgIds.forEach(orgId -> {
SysUserDataScope sysUserDataScope = new SysUserDataScope();
sysUserDataScope.setUserId(userId);
sysUserDataScope.setOrgId(orgId);
sysUserDataScopes.add(sysUserDataScope);
}
this.saveBatch(sysUserDataScopes);
sysUserDataScopeList.add(sysUserDataScope);
});
this.saveBatch(sysUserDataScopeList);
}
@Override
public void add(UserDataScopeRequest userDataScopeRequest) {
SysUserDataScope sysUserDataScope = new SysUserDataScope();
BeanUtil.copyProperties(userDataScopeRequest, sysUserDataScope);
this.save(sysUserDataScope);
}
@Override
public List<Long> getUserDataScopeIdList(Long uerId) {
LambdaQueryWrapper<SysUserDataScope> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserDataScope::getUserId, uerId);
queryWrapper.select(SysUserDataScope::getOrgId);
List<SysUserDataScope> list = this.list(queryWrapper);
return list.stream().map(SysUserDataScope::getOrgId).collect(Collectors.toList());
public void del(UserDataScopeRequest userDataScopeRequest) {
SysUserDataScope sysUserDataScope = this.querySysUserRoleById(userDataScopeRequest);
this.removeById(sysUserDataScope.getUserDataScopeId());
}
@Override
public void deleteUserDataScopeListByUserId(Long userId) {
LambdaQueryWrapper<SysUserDataScope> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserDataScope::getUserId, userId);
public void delByUserId(Long userId) {
UserDataScopeRequest userDataScopeRequest = new UserDataScopeRequest();
userDataScopeRequest.setUserId(userId);
LambdaQueryWrapper<SysUserDataScope> queryWrapper = this.createQueryWrapper(userDataScopeRequest);
this.remove(queryWrapper);
}
@Override
public void edit(UserDataScopeRequest userDataScopeRequest) {
SysUserDataScope sysUserDataScope = this.querySysUserRoleById(userDataScopeRequest);
BeanUtil.copyProperties(sysUserDataScope, userDataScopeRequest);
this.updateById(sysUserDataScope);
}
@Override
public SysUserDataScope detail(UserDataScopeRequest userDataScopeRequest) {
LambdaQueryWrapper<SysUserDataScope> queryWrapper = this.createQueryWrapper(userDataScopeRequest);
return this.getOne(queryWrapper, false);
}
@Override
public List<Long> findOrgIdsByUserId(Long uerId) {
UserDataScopeRequest userDataScopeRequest = new UserDataScopeRequest();
userDataScopeRequest.setUserId(uerId);
List<SysUserDataScope> sysUserDataScopeList = this.findList(userDataScopeRequest);
return sysUserDataScopeList.stream().map(SysUserDataScope::getOrgId).collect(Collectors.toList());
}
@Override
public List<SysUserDataScope> findList(UserDataScopeRequest userDataScopeRequest) {
LambdaQueryWrapper<SysUserDataScope> queryWrapper = this.createQueryWrapper(userDataScopeRequest);
return this.list(queryWrapper);
}
/**
* 根据主键查询
*
* @param userDataScopeRequest dto实体
* @author chenjinlong
* @date 2021/2/3 15:02
*/
private SysUserDataScope querySysUserRoleById(UserDataScopeRequest userDataScopeRequest) {
return this.getById(userDataScopeRequest.getUserDataScopeId());
}
/**
* 构建 QueryWrapper
*
* @param userDataScopeRequest dto实体
* @author chenjinlong
* @date 2021/2/3 14:54
*/
private LambdaQueryWrapper<SysUserDataScope> createQueryWrapper(UserDataScopeRequest userDataScopeRequest) {
LambdaQueryWrapper<SysUserDataScope> queryWrapper = new LambdaQueryWrapper<>();
// SQL拼接
queryWrapper.eq(ObjectUtil.isNotNull(userDataScopeRequest.getOrgId()), SysUserDataScope::getOrgId, userDataScopeRequest.getOrgId());
queryWrapper.eq(ObjectUtil.isNotNull(userDataScopeRequest.getUserId()), SysUserDataScope::getUserId, userDataScopeRequest.getUserId());
queryWrapper.eq(ObjectUtil.isNotNull(userDataScopeRequest.getUserDataScopeId()), SysUserDataScope::getUserDataScopeId, userDataScopeRequest.getUserDataScopeId());
return queryWrapper;
}
}

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

@ -3,12 +3,13 @@ package cn.stylefeng.roses.kernel.system.modular.user.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
import cn.stylefeng.roses.kernel.system.exception.enums.SysUserOrgExceptionEnum;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserOrg;
import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserOrgMapper;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService;
import cn.stylefeng.roses.kernel.system.pojo.UserOrgRequest;
import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@ -26,23 +27,6 @@ import static cn.stylefeng.roses.kernel.system.exception.enums.SysUserOrgExcepti
@Service
public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper, SysUserOrg> implements SysUserOrgService {
@Override
@Transactional(rollbackFor = Exception.class)
public void updateUserOrg(Long userId, Long orgId, Long positionId) {
// 删除旧的绑定信息
LambdaUpdateWrapper<SysUserOrg> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(SysUserOrg::getUserId, userId);
this.remove(updateWrapper);
// 新增新的绑定信息
SysUserOrg sysUserOrg = new SysUserOrg();
sysUserOrg.setUserId(userId);
sysUserOrg.setOrgId(orgId);
sysUserOrg.setPositionId(positionId);
this.save(sysUserOrg);
}
@Override
public SysUserOrgResponse getUserOrgInfo(Long userId) {
@ -60,13 +44,71 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
}
}
@Override
public void deleteUserOrg(Long userId) {
LambdaUpdateWrapper<SysUserOrg> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(SysUserOrg::getUserId, userId);
this.remove(updateWrapper);
public void add(UserOrgRequest userOrgResponse) {
SysUserOrg sysUserOrg = new SysUserOrg();
BeanUtil.copyProperties(userOrgResponse, sysUserOrg);
this.save(sysUserOrg);
}
@Override
public void add(Long userId, Long orgId, Long positionId) {
SysUserOrg sysUserOrg = new SysUserOrg();
sysUserOrg.setUserId(userId);
sysUserOrg.setOrgId(orgId);
sysUserOrg.setPositionId(positionId);
this.save(sysUserOrg);
}
@Override
public void del(UserOrgRequest userOrgResponse) {
SysUserOrg sysUserOrg = this.querySysUserOrgById(userOrgResponse);
this.removeById(sysUserOrg.getUserOrgId());
}
@Override
public void delByUserId(Long userId) {
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserOrg::getUserId, userId);
this.remove(queryWrapper);
}
@Override
public void edit(UserOrgRequest userOrgResponse) {
SysUserOrg sysUserOrg = this.querySysUserOrgById(userOrgResponse);
BeanUtil.copyProperties(userOrgResponse, sysUserOrg);
this.updateById(sysUserOrg);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void edit(Long userId, Long orgId, Long positionId) {
UserOrgRequest userOrgResponse = new UserOrgRequest();
userOrgResponse.setUserId(userId);
userOrgResponse.setOrgId(orgId);
userOrgResponse.setPositionId(positionId);
// 删除已有
this.delByUserId(userId);
this.add(userId, orgId, positionId);
}
@Override
public SysUserOrg detail(UserOrgRequest userOrgResponse) {
LambdaQueryWrapper<SysUserOrg> queryWrapper = this.createWrapper(userOrgResponse);
return this.getOne(queryWrapper, false);
}
@Override
public List<SysUserOrg> findList(UserOrgRequest userOrgResponse) {
LambdaQueryWrapper<SysUserOrg> queryWrapper = this.createWrapper(userOrgResponse);
return this.list(queryWrapper);
}
@Override
public Boolean getUserOrgFlag(Long orgId, Long positionId) {
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
@ -75,4 +117,34 @@ public class SysUserOrgServiceServiceImpl extends ServiceImpl<SysUserOrgMapper,
return this.list(queryWrapper).size() > 0;
}
/**
* 根据主键id获取对象
*
* @author chenjinlong
* @date 2021/1/26 13:28
*/
private SysUserOrg querySysUserOrgById(UserOrgRequest userOrgResponse) {
SysUserOrg sysUserOrg = this.getById(userOrgResponse.getUserOrgId());
if (ObjectUtil.isEmpty(sysUserOrg)) {
throw new SystemModularException(SysUserOrgExceptionEnum.USER_ORG_NOT_EXIST, sysUserOrg.getOrgId());
}
return sysUserOrg;
}
/**
* 实体构建queryWrapper
*
* @author fengshuonan
* @date 2021/1/24 22:03
*/
private LambdaQueryWrapper<SysUserOrg> createWrapper(UserOrgRequest userOrgResponse) {
LambdaQueryWrapper<SysUserOrg> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getUserOrgId()), SysUserOrg::getUserOrgId, userOrgResponse.getUserOrgId());
queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getUserId()), SysUserOrg::getUserId, userOrgResponse.getUserId());
queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getOrgId()), SysUserOrg::getOrgId, userOrgResponse.getOrgId());
queryWrapper.eq(ObjectUtil.isNotEmpty(userOrgResponse.getPositionId()), SysUserOrg::getPositionId, userOrgResponse.getPositionId());
return queryWrapper;
}
}

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

@ -1,17 +1,18 @@
package cn.stylefeng.roses.kernel.system.modular.user.service.impl;
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.stylefeng.roses.kernel.system.modular.user.entity.SysUserRole;
import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserRoleMapper;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService;
import cn.stylefeng.roses.kernel.system.pojo.UserRoleRequest;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@ -24,58 +25,114 @@ import java.util.stream.Collectors;
@Service
public class SysUserRoleServiceImpl extends ServiceImpl<SysUserRoleMapper, SysUserRole> implements SysUserRoleService {
@Override
public List<SysUserRole> getUserRoles(Long userId) {
LambdaQueryWrapper<SysUserRole> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysUserRole::getUserId, userId);
List<SysUserRole> list = this.list(wrapper);
// 账号下没有绑定角色
if (list.isEmpty()) {
throw new SystemModularException(SysUserExceptionEnum.USER_NOT_BIND_ROLE);
}
return list;
public void add(UserRoleRequest userRoleRequest) {
SysUserRole sysUserRole = new SysUserRole();
BeanUtil.copyProperties(userRoleRequest, sysUserRole);
this.save(sysUserRole);
}
@Override
public List<Long> getUserRoleIds(Long userId) {
LambdaQueryWrapper<SysUserRole> wrapper = new LambdaQueryWrapper<>();
wrapper.eq(SysUserRole::getUserId, userId);
List<SysUserRole> list = this.list(wrapper);
return list.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
public void del(UserRoleRequest userRoleRequest) {
SysUserRole sysUserRole = querySysUserRoleById(userRoleRequest);
this.removeById(sysUserRole.getUserRoleId());
}
@Override
public void delByUserId(Long userId) {
LambdaQueryWrapper<SysUserRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserRole::getUserId, userId);
this.remove(queryWrapper);
}
@Override
public void edit(UserRoleRequest userRoleRequest) {
SysUserRole sysUserRole = this.querySysUserRoleById(userRoleRequest);
BeanUtil.copyProperties(userRoleRequest, sysUserRole);
this.updateById(sysUserRole);
}
@Override
public SysUserRole detail(UserRoleRequest userRoleRequest) {
LambdaQueryWrapper<SysUserRole> queryWrapper = this.createQueryWrapper(userRoleRequest);
return this.getOne(queryWrapper, false);
}
@Override
public List<SysUserRole> findList(UserRoleRequest userRoleRequest) {
LambdaQueryWrapper<SysUserRole> queryWrapper = this.createQueryWrapper(userRoleRequest);
return this.list(queryWrapper);
}
@Override
public List<SysUserRole> findListByUserId(Long userId) {
UserRoleRequest userRoleRequest = new UserRoleRequest();
userRoleRequest.setUserId(userId);
return this.findList(userRoleRequest);
}
@Override
public List<Long> findRoleIdsByUserId(Long userId) {
UserRoleRequest userRoleRequest = new UserRoleRequest();
userRoleRequest.setUserId(userId);
List<SysUserRole> sysUserRoleList = this.findList(userRoleRequest);
return sysUserRoleList.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
}
@Override
@Transactional(rollbackFor = Exception.class)
public void grantRole(SysUserRequest sysUserRequest) {
public void assignRoles(SysUserRequest sysUserRequest) {
// 获取用户id
Long userId = sysUserRequest.getUserId();
// 删除该用户的所有角色
LambdaQueryWrapper<SysUserRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserRole::getUserId, userId);
this.remove(queryWrapper);
// 删除已有角色
this.delByUserId(userId);
// 为该用户授权角色
List<Long> roleIdList = sysUserRequest.getGrantRoleIdList();
List<Long> rileIds = sysUserRequest.getGrantRoleIdList();
ArrayList<SysUserRole> sysUserRoles = new ArrayList<>();
for (Long roleId : roleIdList) {
// 批量添加角色
List<SysUserRole> sysUserRoleList = CollUtil.newArrayList();
rileIds.forEach(roleId -> {
SysUserRole sysUserRole = new SysUserRole();
sysUserRole.setUserId(userId);
sysUserRole.setRoleId(roleId);
sysUserRoles.add(sysUserRole);
}
this.saveBatch(sysUserRoles);
sysUserRoleList.add(sysUserRole);
});
this.saveBatch(sysUserRoleList);
}
@Override
public void deleteUserRoleListByUserId(Long userId) {
/**
* 根据主键查询
*
* @param userRoleRequest dto实体
* @return
* @author chenjinlong
* @date 2021/2/3 15:02
*/
private SysUserRole querySysUserRoleById(UserRoleRequest userRoleRequest) {
return this.getById(userRoleRequest.getUserRoleId());
}
/**
* 构建 QueryWrapper
*
* @param userRoleRequest dto实体
* @author chenjinlong
* @date 2021/2/3 14:54
*/
private LambdaQueryWrapper<SysUserRole> createQueryWrapper(UserRoleRequest userRoleRequest) {
LambdaQueryWrapper<SysUserRole> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.eq(SysUserRole::getUserId, userId);
// SQL拼接
queryWrapper.eq(ObjectUtil.isNotNull(userRoleRequest.getUserRoleId()), SysUserRole::getUserRoleId, userRoleRequest.getUserRoleId());
queryWrapper.eq(ObjectUtil.isNotNull(userRoleRequest.getUserId()), SysUserRole::getUserId, userRoleRequest.getUserId());
queryWrapper.eq(ObjectUtil.isNotNull(userRoleRequest.getRoleId()), SysUserRole::getRoleId, userRoleRequest.getRoleId());
this.remove(queryWrapper);
return queryWrapper;
}
}

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

@ -36,7 +36,6 @@ import cn.stylefeng.roses.kernel.system.modular.user.factory.OnlineUserCreateFac
import cn.stylefeng.roses.kernel.system.modular.user.factory.SysUserCreateFactory;
import cn.stylefeng.roses.kernel.system.modular.user.factory.UserLoginInfoFactory;
import cn.stylefeng.roses.kernel.system.modular.user.mapper.SysUserMapper;
import cn.stylefeng.roses.kernel.system.modular.user.pojo.response.SysUserResponse;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserDataScopeService;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserOrgService;
import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserRoleService;
@ -44,10 +43,7 @@ import cn.stylefeng.roses.kernel.system.modular.user.service.SysUserService;
import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeResponse;
import cn.stylefeng.roses.kernel.system.pojo.organization.HrOrganizationResponse;
import cn.stylefeng.roses.kernel.system.pojo.role.response.SysRoleResponse;
import cn.stylefeng.roses.kernel.system.pojo.user.OnlineUserResponse;
import cn.stylefeng.roses.kernel.system.pojo.user.SysUserDTO;
import cn.stylefeng.roses.kernel.system.pojo.user.SysUserOrgResponse;
import cn.stylefeng.roses.kernel.system.pojo.user.UserLoginInfoDTO;
import cn.stylefeng.roses.kernel.system.pojo.user.*;
import cn.stylefeng.roses.kernel.system.pojo.user.request.OnlineUserRequest;
import cn.stylefeng.roses.kernel.system.pojo.user.request.SysUserRequest;
import cn.stylefeng.roses.kernel.system.util.DataScopeUtil;
@ -141,7 +137,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
this.save(sysUser);
// 更新用户员工信息
sysUserOrgService.updateUserOrg(sysUser.getUserId(), sysUserRequest.getOrgId(), sysUserRequest.getPositionId());
sysUserOrgService.add(sysUser.getUserId(), sysUserRequest.getOrgId(), sysUserRequest.getPositionId());
}
@Override
@ -165,7 +161,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
Long sysUserId = sysUser.getUserId();
// 更新用户员工信息
sysUserOrgService.updateUserOrg(sysUser.getUserId(), sysUserRequest.getOrgId(), sysUserRequest.getPositionId());
sysUserOrgService.edit(sysUser.getUserId(), sysUserRequest.getOrgId(), sysUserRequest.getPositionId());
}
@Override
@ -273,7 +269,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
DataScopeUtil.quickValidateDataScope(organizationId);
// 给用户授权角色
sysUserRoleService.grantRole(sysUserRequest);
sysUserRoleService.assignRoles(sysUserRequest);
}
@Override
@ -288,7 +284,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
// 判断当前用户有无该用户的权限
DataScopeUtil.quickValidateDataScope(organizationId);
sysUserDataScopeService.grantData(sysUserRequest);
sysUserDataScopeService.assignData(sysUserRequest);
}
@Override
@ -315,13 +311,13 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
Long userId = sysUser.getUserId();
// 删除该用户对应的员工表信息
sysUserOrgService.deleteUserOrg(userId);
sysUserOrgService.delByUserId(userId);
// 删除该用户对应的用户-角色表关联信息
sysUserRoleService.deleteUserRoleListByUserId(userId);
sysUserRoleService.delByUserId(userId);
// 删除该用户对应的用户-数据范围表关联信息
sysUserDataScopeService.deleteUserDataScopeListByUserId(userId);
sysUserDataScopeService.delByUserId(userId);
}
@Override
@ -338,7 +334,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
sysUserResponse.setPositionId(userOrgInfo.getPositionId());
// 获取用户角色信息
sysUserResponse.setGrantRoleIdList(sysUserRoleService.getUserRoleIds(sysUser.getUserId()));
sysUserResponse.setGrantRoleIdList(sysUserRoleService.findRoleIdsByUserId(sysUser.getUserId()));
return sysUserResponse;
}
@ -433,8 +429,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
Long userId = sysUser.getUserId();
// 2. 获取用户角色信息
List<SysUserRole> userRoles = sysUserRoleService.getUserRoles(userId);
List<Long> roleIds = userRoles.stream().map(SysUserRole::getRoleId).collect(Collectors.toList());
List<Long> roleIds = sysUserRoleService.findRoleIdsByUserId(userId);
List<SysRoleResponse> roleResponseList = roleServiceApi.getRolesByIds(roleIds);
// 3. 获取用户的数据范围
@ -505,7 +500,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
@Override
public List<Long> getUserBindDataScope(Long userId) {
return sysUserDataScopeService.getUserDataScopeIdList(userId);
return sysUserDataScopeService.findOrgIdsByUserId(userId);
}
@Override
@ -651,23 +646,11 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
*/
private LambdaQueryWrapper<SysUser> createWrapper(SysUserRequest sysUserRequest) {
LambdaQueryWrapper<SysUser> queryWrapper = new LambdaQueryWrapper<>();
if (ObjectUtil.isNotNull(sysUserRequest)) {
// 组装账号的查询条件
if (ObjectUtil.isNotEmpty(sysUserRequest.getUserId())) {
queryWrapper.eq(SysUser::getUserId, sysUserRequest.getUserId());
}
// 组装账号的查询条件
if (ObjectUtil.isNotEmpty(sysUserRequest.getAccount())) {
queryWrapper.like(SysUser::getAccount, sysUserRequest.getAccount());
}
// 组装用户姓名的查询条件
if (ObjectUtil.isNotEmpty(sysUserRequest.getRealName())) {
queryWrapper.eq(SysUser::getRealName, sysUserRequest.getRealName());
}
}
// SQL拼接
queryWrapper.eq(ObjectUtil.isNotEmpty(sysUserRequest.getUserId()), SysUser::getUserId, sysUserRequest.getUserId());
queryWrapper.like(ObjectUtil.isNotEmpty(sysUserRequest.getAccount()), SysUser::getAccount, sysUserRequest.getAccount());
queryWrapper.eq(ObjectUtil.isNotEmpty(sysUserRequest.getRealName()), SysUser::getRealName, sysUserRequest.getRealName());
// 查询未删除状态的
queryWrapper.eq(SysUser::getDelFlag, YesOrNotEnum.N.getCode());