From 7944c5bfc9e74cf12c0205fe16c8fd6db901a998 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Fri, 18 Apr 2025 10:05:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/manage/config/LoginInterceptor.java | 2 -- .../industry/software/manage/pojo/models/EdFileInfo.java | 7 ------- .../software/manage/pojo/models/UserAccessLog.java | 3 --- .../service/serviceimpl/UserAccessLogServiceImpl.java | 2 +- .../industry/software/manage/tasks/BackupTask.java | 3 +-- 5 files changed, 2 insertions(+), 15 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java index e06214d..9405527 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/LoginInterceptor.java @@ -166,7 +166,6 @@ public class LoginInterceptor implements HandlerInterceptor { .setReqArgs(reqArgs) .setRemoteAddr(getRealIp(request)) .setAccessSuccess(true) - .setCreateTime(new Date()) .setOperationModule(userOperation.modelName().key) .setOperationMsg(res.getErrorMessage()) .setDataId("") @@ -193,7 +192,6 @@ public class LoginInterceptor implements HandlerInterceptor { .setReqArgs(reqArgs) .setRemoteAddr(getRealIp(request)) .setAccessSuccess(true) - .setCreateTime(new Date()) .setOperationModule(userOperation.modelName().key) .setOperationMsg(accessSuccessInfo.getSuccessMsg()) .setDataId(accessSuccessInfo.getDataId()) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java index 267572d..eecb1a7 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/EdFileInfo.java @@ -125,17 +125,10 @@ public class EdFileInfo extends BaseModel { private Boolean permanentDeleted; public void newInit() { - String userId = UserThreadLocal.getUserId(); String newFileDbId = IdWorker.getSnowFlakeIdString(); String fileTime = EleCommonUtil.getNowTimeStr(); - Date now = new Date(); - this.setUpdatedBy(userId); this.setId(newFileDbId); - this.setUpdatedTime(now); - this.setCreatedTime(now); this.setFileTime(fileTime); - this.setCreatedBy(userId); this.setFileId(newFileDbId); - this.setEffectFlag(EffectFlagEnum.EFFECT.code); } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java index 480e266..d2cf325 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/UserAccessLog.java @@ -51,9 +51,6 @@ public class UserAccessLog extends BaseModel { // 异常信息 供开发者异常查看 private String exceptionDetail; - // 创建时间，对应操作时间 - private Date createTime; - // 操作对象 private String operationModule; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java index 3c5dfc0..d461ad9 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java @@ -43,7 +43,7 @@ public class UserAccessLogServiceImpl extends ServiceImpl info(AccessLogQueryDTO pars, boolean adminQuery) { - LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserAccessLog.class).orderByDesc(UserAccessLog::getCreateTime); + LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(UserAccessLog.class).orderByDesc(UserAccessLog::getCreatedTime); if (!adminQuery) { queryWrapper.eq(UserAccessLog::getDataId, pars.getDataId()); } else { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java index 961ec1a..58ae191 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/tasks/BackupTask.java @@ -157,8 +157,7 @@ public class BackupTask { .setReqArgs("") .setRemoteAddr("") .setAccessSuccess(true) - .setOperationMsg("从系统中物理删除了文件" + file.getName()) - .setCreateTime(new Date()) + .setOperationMsg("从系统中物理删除了文件--->" + file.getAbsolutePath()) .setOperationModule(UserOperationModuleEnum.TMP.key) .setDataId("") .setParentId("")