mirror of https://gitee.com/stylefeng/roses
【system】整理枚举异常常量
fengshuonan
parent
6d6e70b126
commit
41bf173cf4
|
|
@ -17,13 +17,6 @@
|
|||
|
||||
<dependencies>
|
||||
|
||||
<!--资源扫描器的api-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
<artifactId>scanner-api</artifactId>
|
||||
<version>7.0.0</version>
|
||||
</dependency>
|
||||
|
||||
<!--参数校验模块的api-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
|
|
@ -38,6 +31,14 @@
|
|||
<version>7.0.0</version>
|
||||
</dependency>
|
||||
|
||||
<!--资源扫描器的api-->
|
||||
<!--ResourceServiceApi需要用scanner-api的ResourceDefinition相关类-->
|
||||
<dependency>
|
||||
<groupId>cn.stylefeng.roses</groupId>
|
||||
<artifactId>scanner-api</artifactId>
|
||||
<version>7.0.0</version>
|
||||
</dependency>
|
||||
|
||||
<!--auth模块的api-->
|
||||
<!--需要用到LoginUser这个类，所以要引用一下auth-api-->
|
||||
<dependency>
|
||||
|
|
|
|||
|
|
@ -18,16 +18,6 @@ public interface SystemConstants {
|
|||
*/
|
||||
String SYSTEM_EXCEPTION_STEP_CODE = "18";
|
||||
|
||||
/**
|
||||
* pids系列字段，每个id的左分隔符
|
||||
*/
|
||||
String PID_LEFT_DIVIDE_SYMBOL = "[";
|
||||
|
||||
/**
|
||||
* pids系列字段，每个id的右分隔符
|
||||
*/
|
||||
String PID_RIGHT_DIVIDE_SYMBOL = "]";
|
||||
|
||||
/**
|
||||
* 默认的系统版本号
|
||||
*/
|
||||
|
|
@ -48,9 +38,4 @@ public interface SystemConstants {
|
|||
*/
|
||||
String DEFAULT_SYSTEM_NAME = "Guns快速开发平台";
|
||||
|
||||
/**
|
||||
* 超级管理员角色编码
|
||||
*/
|
||||
//String SYSTEM_ADMIN_ROLE_CODE = "superAdmin";
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
package cn.stylefeng.roses.kernel.system.enums;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
|
||||
import cn.stylefeng.roses.kernel.system.exception.enums.SysUserExceptionEnum;
|
||||
import lombok.Getter;
|
||||
|
|
@ -81,8 +80,7 @@ public enum UserStatusEnum {
|
|||
if (ENABLE.getCode().equals(code) || DISABLE.getCode().equals(code) || FREEZE.getCode().equals(code)) {
|
||||
return;
|
||||
}
|
||||
String userTip = StrUtil.format(SysUserExceptionEnum.REQUEST_USER_STATUS_ERROR.getUserTip(), code);
|
||||
throw new SystemModularException(SysUserExceptionEnum.REQUEST_USER_STATUS_ERROR, userTip);
|
||||
throw new SystemModularException(SysUserExceptionEnum.REQUEST_USER_STATUS_ERROR, code);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,24 +0,0 @@
|
|||
package cn.stylefeng.roses.kernel.system.exception;
|
||||
|
||||
import cn.stylefeng.roses.kernel.rule.exception.AbstractExceptionEnum;
|
||||
import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException;
|
||||
import cn.stylefeng.roses.kernel.system.constants.SystemConstants;
|
||||
|
||||
/**
|
||||
* 数据范围异常，当前用户没有操作该数据的权限
|
||||
*
|
||||
* @author fengshuonan
|
||||
* @date 2020/11/4 15:50
|
||||
*/
|
||||
public class DataScopeException extends ServiceException {
|
||||
|
||||
public DataScopeException(AbstractExceptionEnum exception,String userTip) {
|
||||
|
||||
super(SystemConstants.SYSTEM_MODULE_NAME, exception.getErrorCode(), userTip);
|
||||
}
|
||||
|
||||
public DataScopeException(AbstractExceptionEnum exception) {
|
||||
super(SystemConstants.SYSTEM_MODULE_NAME, exception);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -17,10 +17,6 @@ public class SystemModularException extends ServiceException {
|
|||
super(SystemConstants.SYSTEM_MODULE_NAME, exception.getErrorCode(), StrUtil.format(exception.getUserTip(), params));
|
||||
}
|
||||
|
||||
public SystemModularException(AbstractExceptionEnum exception, String userTip) {
|
||||
super(SystemConstants.SYSTEM_MODULE_NAME, exception.getErrorCode(), userTip);
|
||||
}
|
||||
|
||||
public SystemModularException(AbstractExceptionEnum exception) {
|
||||
super(SystemConstants.SYSTEM_MODULE_NAME, exception);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -41,22 +41,22 @@ public enum AppExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 默认激活的系统只能有一个
|
||||
*/
|
||||
APP_ACTIVE_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "71", "默认激活的系统只能有一个，请检查active参数"),
|
||||
APP_ACTIVE_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "11", "默认激活的系统只能有一个，请检查active参数"),
|
||||
|
||||
/**
|
||||
* 应用不存在
|
||||
*/
|
||||
APP_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "72", "应用不存在"),
|
||||
APP_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "12", "应用不存在"),
|
||||
|
||||
/**
|
||||
* 该应用下有菜单
|
||||
*/
|
||||
APP_CANNOT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "75", "该应用下有菜单，无法删除"),
|
||||
APP_CANNOT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "13", "该应用下有菜单，无法删除"),
|
||||
|
||||
/**
|
||||
* 激活的应用不能被禁用
|
||||
*/
|
||||
CANT_DISABLE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "76", "激活的应用不能被禁用");
|
||||
CANT_DISABLE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "14", "激活的应用不能被禁用");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -17,17 +17,17 @@ public enum DataScopeExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 操作失败，当前用户没有该数据的数据权限
|
||||
*/
|
||||
DATA_SCOPE_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "61", "操作失败，当前用户没有该数据的数据权限，当前数据范围是：{}"),
|
||||
DATA_SCOPE_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "21", "操作失败，当前用户没有该数据的数据权限，当前数据范围是：{}"),
|
||||
|
||||
/**
|
||||
* 用户id为空
|
||||
*/
|
||||
USER_ID_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "62", "获取数据范围失败，用户id为空"),
|
||||
USER_ID_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "22", "获取数据范围失败，用户id为空"),
|
||||
|
||||
/**
|
||||
* 用户角色为空
|
||||
*/
|
||||
ROLE_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "63", "获取数据范围失败，用户角色为空，userId：{}");
|
||||
ROLE_EMPTY_ERROR(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "23", "获取数据范围失败，用户角色为空，userId：{}");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -41,12 +41,12 @@ public enum NoticeExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 通知不存在
|
||||
*/
|
||||
NOTICE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "91", "通知不存在，id为：{}"),
|
||||
NOTICE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "31", "通知不存在，id为：{}"),
|
||||
|
||||
/**
|
||||
* 通知范围不允许修改
|
||||
*/
|
||||
NOTICE_SCOPE_NOT_EDIT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "92", "通知范围不允许修改");
|
||||
NOTICE_SCOPE_NOT_EDIT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "32", "通知范围不允许修改");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ public enum OrganizationExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 添加组织架构失败，一级节点只有超级管理员可以添加
|
||||
*/
|
||||
ADD_ONE_LEVEL_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "01", "添加组织架构失败，一级节点只有超级管理员可以添加"),
|
||||
ADD_ONE_LEVEL_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "41", "添加组织架构失败，一级节点只有超级管理员可以添加"),
|
||||
|
||||
/**
|
||||
* 添加组织架构失败，数据权限不够
|
||||
*/
|
||||
ADD_ORG_ERROR_DATA_SCOPE_NOT_ENOUGH(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "02", "添加组织架构失败，数据权限不够"),
|
||||
ADD_ORG_ERROR_DATA_SCOPE_NOT_ENOUGH(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "42", "添加组织架构失败，数据权限不够"),
|
||||
|
||||
/**
|
||||
* 查询不到组织机构，错误的组织机构ID
|
||||
*/
|
||||
CANT_FIND_ORG(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "03", "查询不到组织机构，错误的组织机构ID：{}"),
|
||||
CANT_FIND_ORG(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "43", "查询不到组织机构，错误的组织机构ID：{}"),
|
||||
|
||||
/**
|
||||
* 删除机构失败，该机构下有绑定员工
|
||||
*/
|
||||
DELETE_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "04", "删除机构失败，该机构下有绑定员工");
|
||||
DELETE_ORGANIZATION_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "44", "删除机构失败，该机构下有绑定员工");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -17,12 +17,12 @@ public enum PositionExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 找不到职务
|
||||
*/
|
||||
CANT_FIND_POSITION(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "31", "查询不到组该职务，错误的职务ID：{}"),
|
||||
CANT_FIND_POSITION(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "51", "查询不到组该职务，错误的职务ID：{}"),
|
||||
|
||||
/**
|
||||
* 职务删除失败
|
||||
*/
|
||||
CANT_DELETE_POSITION(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "32", "职务删除失败，该职务下有关联人员");
|
||||
CANT_DELETE_POSITION(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "52", "职务删除失败，该职务下有关联人员");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ public enum SysMenuButtonExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 菜单按钮不存在
|
||||
*/
|
||||
MENU_BUTTON_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "91", "菜单按钮不存在");
|
||||
MENU_BUTTON_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "61", "菜单按钮不存在");
|
||||
|
||||
private final String errorCode;
|
||||
|
||||
|
|
|
|||
|
|
@ -15,12 +15,12 @@ public enum SysMenuExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 本菜单无法修改应用，非一级菜单，不能改变所属应用
|
||||
*/
|
||||
CANT_MOVE_APP(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "810", "本菜单无法修改应用，非一级菜单，不能改变所属应用"),
|
||||
CANT_MOVE_APP(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "62", "本菜单无法修改应用，非一级菜单，不能改变所属应用"),
|
||||
|
||||
/**
|
||||
* 菜单不存在
|
||||
*/
|
||||
MENU_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "81", "菜单不存在");
|
||||
MENU_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "63", "菜单不存在");
|
||||
|
||||
private final String errorCode;
|
||||
|
||||
|
|
|
|||
|
|
@ -41,32 +41,32 @@ public enum SysRoleExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 角色不存在
|
||||
*/
|
||||
ROLE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "41", "角色不存在"),
|
||||
ROLE_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "71", "角色不存在"),
|
||||
|
||||
/**
|
||||
* 角色编码重复
|
||||
*/
|
||||
ROLE_CODE_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "42", "角色编码重复，请检查code参数"),
|
||||
ROLE_CODE_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "72", "角色编码重复，请检查code参数"),
|
||||
|
||||
/**
|
||||
* 角色名称重复
|
||||
*/
|
||||
ROLE_NAME_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "43", "角色名称重复，请检查name参数"),
|
||||
ROLE_NAME_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "73", "角色名称重复，请检查name参数"),
|
||||
|
||||
/**
|
||||
* 超级管理员不能被删除
|
||||
*/
|
||||
SUPER_ADMIN_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "44", "超级管理员不能被删除"),
|
||||
SUPER_ADMIN_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "74", "超级管理员不能被删除"),
|
||||
|
||||
/**
|
||||
* 超级管理员不能被删除
|
||||
*/
|
||||
SYSTEM_ROLE_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "45", "系统角色不能被删除"),
|
||||
SYSTEM_ROLE_CANT_DELETE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "75", "系统角色不能被删除"),
|
||||
|
||||
/**
|
||||
* 必须选择公司范围集合
|
||||
*/
|
||||
PLEASE_FILL_DATA_SCOPE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "46", "指定部门类型的数据范围必须选择组织机构");
|
||||
PLEASE_FILL_DATA_SCOPE(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "76", "指定部门类型的数据范围必须选择组织机构");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -41,62 +41,62 @@ public enum SysUserExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 用户不存在
|
||||
*/
|
||||
USER_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "51", "{} 用户不存在"),
|
||||
USER_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "81", "{} 用户不存在"),
|
||||
|
||||
/**
|
||||
* 账号已存在
|
||||
*/
|
||||
USER_ACCOUNT_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "52", "账号已存在，请检查account参数"),
|
||||
USER_ACCOUNT_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "82", "账号已存在，请检查account参数"),
|
||||
|
||||
/**
|
||||
* 原密码错误
|
||||
*/
|
||||
USER_PWD_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "53", "原密码错误，请重新输入"),
|
||||
USER_PWD_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "83", "原密码错误，请重新输入"),
|
||||
|
||||
/**
|
||||
* 新密码与原密码相同
|
||||
*/
|
||||
USER_PWD_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "54", "新密码与原密码相同，请更换新密码"),
|
||||
USER_PWD_REPEAT(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "84", "新密码与原密码相同，请更换新密码"),
|
||||
|
||||
/**
|
||||
* 不能删除超级管理员
|
||||
*/
|
||||
USER_CAN_NOT_DELETE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "55", "不能删除超级管理员"),
|
||||
USER_CAN_NOT_DELETE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "85", "不能删除超级管理员"),
|
||||
|
||||
/**
|
||||
* 不能修改超级管理员状态
|
||||
*/
|
||||
USER_CAN_NOT_UPDATE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "56", "不能修改超级管理员状态"),
|
||||
USER_CAN_NOT_UPDATE_ADMIN(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "86", "不能修改超级管理员状态"),
|
||||
|
||||
/**
|
||||
* 请求状态值为空
|
||||
*/
|
||||
REQUEST_USER_STATUS__EMPTY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "57", "请求状态值为空"),
|
||||
REQUEST_USER_STATUS__EMPTY(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "87", "请求状态值为空"),
|
||||
|
||||
/**
|
||||
* 请求状值为非正确状态值
|
||||
*/
|
||||
REQUEST_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "58", "请求状态值不合法，用户状态参数不合法，参数值：{}"),
|
||||
REQUEST_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "88", "请求状态值不合法，用户状态参数不合法，参数值：{}"),
|
||||
|
||||
/**
|
||||
* 更新用户状态错误
|
||||
*/
|
||||
UPDATE_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "59", "更新用户状态错误，更新生效数量0"),
|
||||
UPDATE_USER_STATUS_ERROR(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "89", "更新用户状态错误，更新生效数量0"),
|
||||
|
||||
/**
|
||||
* 当前用户未分配菜单
|
||||
*/
|
||||
USER_NOT_HAVE_MENUS(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "60", "当前用户未分配菜单"),
|
||||
USER_NOT_HAVE_MENUS(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "810", "当前用户未分配菜单"),
|
||||
|
||||
/**
|
||||
* 用户未绑定角色
|
||||
*/
|
||||
USER_NOT_BIND_ROLE(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "61", "用户未绑定角色"),
|
||||
USER_NOT_BIND_ROLE(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "811", "用户未绑定角色"),
|
||||
|
||||
/**
|
||||
* 系统错误，账号存在多个
|
||||
*/
|
||||
ACCOUNT_HAVE_MANY(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "62", "系统错误，账号存在多个，账号为：{}");
|
||||
ACCOUNT_HAVE_MANY(RuleConstants.BUSINESS_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "812", "系统错误，账号存在多个，账号为：{}");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -17,22 +17,22 @@ public enum SysUserOrgExceptionEnum implements AbstractExceptionEnum {
|
|||
/**
|
||||
* 企业员工信息不存在
|
||||
*/
|
||||
EMPLOYEE_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "21", "企业员工信息不存在,用户id：{}"),
|
||||
EMPLOYEE_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "91", "企业员工信息不存在,用户id：{}"),
|
||||
|
||||
/**
|
||||
* 用户绑定多个或未绑定机构信息
|
||||
*/
|
||||
EMPLOYEE_MANY_MAIN_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "22", "用户绑定多个或未绑定机构信息"),
|
||||
EMPLOYEE_MANY_MAIN_NOT_FOUND(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "92", "用户绑定多个或未绑定机构信息"),
|
||||
|
||||
/**
|
||||
* 用户未设置主部门，或主部门信息为多个
|
||||
*/
|
||||
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 + "93", "用户未设置主部门，或主部门信息为多个"),
|
||||
|
||||
/**
|
||||
* 用户组织或部门不存在
|
||||
*/
|
||||
USER_ORG_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "24", "用户组织或部门不存在：用户组织id：{}");
|
||||
USER_ORG_NOT_EXIST(RuleConstants.USER_OPERATION_ERROR_TYPE_CODE + SystemConstants.SYSTEM_EXCEPTION_STEP_CODE + "94", "用户组织或部门不存在：用户组织id：{}");
|
||||
|
||||
/**
|
||||
* 错误编码
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
package cn.stylefeng.roses.kernel.system.util;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.stylefeng.roses.kernel.auth.api.context.LoginContext;
|
||||
import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum;
|
||||
import cn.stylefeng.roses.kernel.auth.api.exception.AuthException;
|
||||
|
|
@ -131,8 +130,7 @@ public class DataScopeUtil {
|
|||
public static void quickValidateDataScope(Long organizationId) {
|
||||
boolean validateResult = validateDataScopeByOrganizationId(organizationId);
|
||||
if (!validateResult) {
|
||||
String userTip = StrUtil.format(DataScopeExceptionEnum.DATA_SCOPE_ERROR.getUserTip(), DataScopeUtil.getDataScopeTip());
|
||||
throw new SystemModularException(DataScopeExceptionEnum.DATA_SCOPE_ERROR, userTip);
|
||||
throw new SystemModularException(DataScopeExceptionEnum.DATA_SCOPE_ERROR, DataScopeUtil.getDataScopeTip());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
package cn.stylefeng.roses.kernel.system.modular.organization.service;
|
||||
|
||||
import cn.hutool.core.util.StrUtil;
|
||||
import cn.stylefeng.roses.kernel.auth.api.enums.DataScopeTypeEnum;
|
||||
import cn.stylefeng.roses.kernel.db.api.DbOperatorApi;
|
||||
import cn.stylefeng.roses.kernel.system.DataScopeApi;
|
||||
import cn.stylefeng.roses.kernel.system.RoleServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.UserOrgServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.UserServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.exception.DataScopeException;
|
||||
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
|
||||
import cn.stylefeng.roses.kernel.system.exception.enums.DataScopeExceptionEnum;
|
||||
import cn.stylefeng.roses.kernel.system.pojo.organization.DataScopeResponse;
|
||||
import cn.stylefeng.roses.kernel.system.pojo.role.response.SysRoleResponse;
|
||||
|
|
@ -50,8 +49,7 @@ public class DataScopeService implements DataScopeApi {
|
|||
Set<Long> organizationIds = new HashSet<>();
|
||||
|
||||
if (userId == null) {
|
||||
String userTip = StrUtil.format(DataScopeExceptionEnum.USER_ID_EMPTY_ERROR.getUserTip(), userId);
|
||||
throw new DataScopeException(DataScopeExceptionEnum.USER_ID_EMPTY_ERROR, userTip);
|
||||
throw new SystemModularException(DataScopeExceptionEnum.USER_ID_EMPTY_ERROR, userId);
|
||||
}
|
||||
|
||||
// 获取用户的主要部门信息
|
||||
|
|
|
|||
|
|
@ -12,6 +12,7 @@ import cn.stylefeng.roses.kernel.db.api.context.DbOperatorContext;
|
|||
import cn.stylefeng.roses.kernel.db.api.factory.PageFactory;
|
||||
import cn.stylefeng.roses.kernel.db.api.factory.PageResultFactory;
|
||||
import cn.stylefeng.roses.kernel.db.api.pojo.page.PageResult;
|
||||
import cn.stylefeng.roses.kernel.rule.constants.SymbolConstant;
|
||||
import cn.stylefeng.roses.kernel.rule.constants.TreeConstants;
|
||||
import cn.stylefeng.roses.kernel.rule.enums.StatusEnum;
|
||||
import cn.stylefeng.roses.kernel.rule.enums.YesOrNotEnum;
|
||||
|
|
@ -22,7 +23,6 @@ import cn.stylefeng.roses.kernel.system.RoleDataScopeServiceApi;
|
|||
import cn.stylefeng.roses.kernel.system.RoleServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.UserOrgServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.UserServiceApi;
|
||||
import cn.stylefeng.roses.kernel.system.constants.SystemConstants;
|
||||
import cn.stylefeng.roses.kernel.system.exception.SystemModularException;
|
||||
import cn.stylefeng.roses.kernel.system.exception.enums.OrganizationExceptionEnum;
|
||||
import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization;
|
||||
|
|
@ -294,9 +294,9 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
|||
// 获取pids值
|
||||
String pids = hrOrganization.getOrgPids();
|
||||
// 去掉所有的左中括号
|
||||
pids = StrUtil.removeAll(pids, SystemConstants.PID_LEFT_DIVIDE_SYMBOL);
|
||||
pids = StrUtil.removeAll(pids, SymbolConstant.LEFT_SQUARE_BRACKETS);
|
||||
// 去掉所有的右中括号
|
||||
pids = StrUtil.removeAll(pids, SystemConstants.PID_RIGHT_DIVIDE_SYMBOL);
|
||||
pids = StrUtil.removeAll(pids, SymbolConstant.RIGHT_SQUARE_BRACKETS);
|
||||
// 按逗号分割这个字符串，得到pid的数组
|
||||
String[] finalPidArray = pids.split(StrUtil.COMMA);
|
||||
|
||||
|
|
@ -376,8 +376,7 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
|||
private HrOrganization queryOrganization(HrOrganizationRequest hrOrganizationRequest) {
|
||||
HrOrganization hrOrganization = this.getById(hrOrganizationRequest.getOrgId());
|
||||
if (ObjectUtil.isEmpty(hrOrganization)) {
|
||||
String userTip = StrUtil.format(OrganizationExceptionEnum.CANT_FIND_ORG.getUserTip(), hrOrganizationRequest.getOrgId());
|
||||
throw new SystemModularException(OrganizationExceptionEnum.CANT_FIND_ORG, userTip);
|
||||
throw new SystemModularException(OrganizationExceptionEnum.CANT_FIND_ORG, hrOrganizationRequest.getOrgId());
|
||||
}
|
||||
return hrOrganization;
|
||||
}
|
||||
|
|
@ -393,14 +392,14 @@ public class HrOrganizationServiceImpl extends ServiceImpl<HrOrganizationMapper,
|
|||
// 如果是一级节点（一级节点的pid是0）
|
||||
if (hrOrganization.getOrgParentId().equals(TreeConstants.DEFAULT_PARENT_ID)) {
|
||||
// 设置一级节点的pid为[0],
|
||||
hrOrganization.setOrgPids(SystemConstants.PID_LEFT_DIVIDE_SYMBOL + TreeConstants.DEFAULT_PARENT_ID + SystemConstants.PID_RIGHT_DIVIDE_SYMBOL + ",");
|
||||
hrOrganization.setOrgPids(SymbolConstant.LEFT_SQUARE_BRACKETS + TreeConstants.DEFAULT_PARENT_ID + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA);
|
||||
} else {
|
||||
// 获取父组织机构
|
||||
HrOrganization parentOrganization = this.getById(hrOrganization.getOrgParentId());
|
||||
|
||||
// 设置本节点的父ids为 (上一个节点的pids + (上级节点的id) )
|
||||
hrOrganization.setOrgPids(
|
||||
parentOrganization.getOrgPids() + SystemConstants.PID_LEFT_DIVIDE_SYMBOL + parentOrganization.getOrgId() + SystemConstants.PID_RIGHT_DIVIDE_SYMBOL + ",");
|
||||
parentOrganization.getOrgPids() + SymbolConstant.LEFT_SQUARE_BRACKETS + parentOrganization.getOrgId() + SymbolConstant.RIGHT_SQUARE_BRACKETS + SymbolConstant.COMMA);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -104,8 +104,7 @@ public class HrPositionServiceImpl extends ServiceImpl<HrPositionMapper, HrPosit
|
|||
private HrPosition querySysPositionById(HrPositionRequest hrPositionRequest) {
|
||||
HrPosition hrPosition = this.getById(hrPositionRequest.getPositionId());
|
||||
if (ObjectUtil.isEmpty(hrPosition)) {
|
||||
String userTip = StrUtil.format(PositionExceptionEnum.CANT_FIND_POSITION.getUserTip(), hrPositionRequest.getPositionId());
|
||||
throw new SystemModularException(PositionExceptionEnum.CANT_FIND_POSITION, userTip);
|
||||
throw new SystemModularException(PositionExceptionEnum.CANT_FIND_POSITION, hrPositionRequest.getPositionId());
|
||||
}
|
||||
return hrPosition;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -393,14 +393,12 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
|
|||
|
||||
// 用户不存在
|
||||
if (list.isEmpty()) {
|
||||
String userTip = StrUtil.format(SysUserExceptionEnum.USER_NOT_EXIST.getUserTip(), account);
|
||||
throw new SystemModularException(SysUserExceptionEnum.USER_NOT_EXIST, userTip);
|
||||
throw new SystemModularException(SysUserExceptionEnum.USER_NOT_EXIST, account);
|
||||
}
|
||||
|
||||
// 账号存在多个
|
||||
if (list.size() > 1) {
|
||||
String userTip = StrUtil.format(SysUserExceptionEnum.ACCOUNT_HAVE_MANY.getUserTip(), account);
|
||||
throw new SystemModularException(SysUserExceptionEnum.ACCOUNT_HAVE_MANY, userTip);
|
||||
throw new SystemModularException(SysUserExceptionEnum.ACCOUNT_HAVE_MANY, account);
|
||||
}
|
||||
|
||||
return list.get(0);
|
||||
|
|
|
|||
Loading…
Reference in New Issue