From 42377da9f843d8dee8b2799fe7201a8b6f2a8c4f Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 28 Mar 2025 13:44:42 +0800 Subject: [PATCH] clean code --- .../manage/common/GlobalExceptionHandler.java | 2 +- .../industry/software/common/enums/DataOwnEnum.java | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/common/GlobalExceptionHandler.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/common/GlobalExceptionHandler.java index eaf846d..6bbcfd5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/common/GlobalExceptionHandler.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/common/GlobalExceptionHandler.java @@ -43,7 +43,7 @@ public class GlobalExceptionHandler { public ElectromagneticResult accessDeniedError(PermissionDeniedException e) { log.error(e.getMessage(), e); UserThreadLocal.setExceptionDetail(ExceptionUtil.stacktraceToOneLineString(e)); - UserThreadLocal.setRes(new ElectromagneticResult<>(false, "-1", e.getMessage(), "")); + UserThreadLocal.setRes(new ElectromagneticResult<>(false, HttpStatus.UNAUTHORIZED.value() + "", e.getMessage(), "")); return ElectromagneticResultUtil.fail("-1", e.getMessage()); } diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java index 5050d35..841f60e 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/DataOwnEnum.java @@ -8,12 +8,13 @@ import java.util.Map; @AllArgsConstructor public enum DataOwnEnum { - SYS_FILE(0, "数据库上传的文件或者新建的文件夹", "项目数据"), - SYS_PRJ(1, "系统管理员创建的层级", "项目数据"), - USER_PRJ(2, "用户自定义的层级", "个人数据"), - USER_FILE(4, "用户上传的文件或创建的文件夹", "个人数据"), - REPO_FILE(3, "库文件", "库数据"), - REPO_PRJ(5, "库工程", "库数据"); + SYS_PRJ(1, "项目数据层级", "项目数据"), + USER_PRJ(2, "个人数据层级", "个人数据"), + REPO_PRJ(5, "库数据层级", "库数据"), + + SYS_FILE(0, "项目数据文件（文件夹）", "项目数据"), + USER_FILE(4, "个人数据文件（文件夹）", "个人数据"), + REPO_FILE(3, "库数据文件（文件夹）", "库数据"); private static final Map FILE_PRJ_MAP = new HashMap<>();