From 849f96cf20c47460cafbfe2a1dbfa17e99f15b59 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 26 Mar 2025 15:53:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E7=8E=B0=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/controller/UserEdFileInfoController.java | 2 +- .../industry/software/manage/pojo/resp/AccessLogQueryVO.java | 2 ++ .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 2 ++ .../manage/service/serviceimpl/UserAccessLogServiceImpl.java | 2 +- .../software/common/enums/UserOperationModuleEnum.java | 4 ++-- 5 files changed, 8 insertions(+), 4 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java index 60c1795..a499889 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/UserEdFileInfoController.java @@ -43,7 +43,7 @@ public class UserEdFileInfoController { return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.USER_FILE.code); } - @UserOperation(value = "作废文件夹", modelName = UserOperationModuleEnum.USER_PRJ) + @UserOperation(value = "作废", modelName = UserOperationModuleEnum.USER_PRJ) @RequestMapping("delete") public ElectromagneticResult delete(@RequestParam String id) { return edFileInfoService.delete(id, DataOwnEnum.USER_FILE.code); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/AccessLogQueryVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/AccessLogQueryVO.java index c343d3d..4b72622 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/AccessLogQueryVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/AccessLogQueryVO.java @@ -1,5 +1,6 @@ package com.electromagnetic.industry.software.manage.pojo.resp; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -23,6 +24,7 @@ public class AccessLogQueryVO { private String operationMsg; // 操作时间 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date createTime; // 请求远端地址 diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java index cbf7244..e89a195 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdFileInfoServiceImpl.java @@ -1190,6 +1190,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl info(AccessLogQueryDTO pars, boolean adminQuery) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserAccessLog.class); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserAccessLog.class).orderByDesc(UserAccessLog::getCreateTime); if (!adminQuery) { queryWrapper.eq(UserAccessLog::getDataId, pars.getDataId()); } else { diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/UserOperationModuleEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/UserOperationModuleEnum.java index 921ecd8..c19e158 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/UserOperationModuleEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/UserOperationModuleEnum.java @@ -7,8 +7,8 @@ import java.util.Objects; @AllArgsConstructor public enum UserOperationModuleEnum { - SYS_PRJ_SETTING("sys_prj_setting", "数据库层级定义"), - SYS_PRJ_DATABASE("sys_prj_database", "数据库管理"), + SYS_PRJ_SETTING("sys_prj_setting", "项目数据层级定义"), + SYS_PRJ_DATABASE("sys_prj_database", "项目数据管理"), REPO_PRJ_DATABASE("repo_prj_database", "库数据管理"), REPO_PRJ_SETTING("repo_prj_setting", "库数据层级定义"),