From 82acc597e63a7e78e54a7789f194cf3f2fd0a965 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Wed, 5 Mar 2025 15:20:45 +0800 Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8D=E6=9B=B4=E6=96=B0=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E5=A1=AB=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/config/LoginInterceptor.java | 35 +++++++++--------- .../manage/pojo/models/UserAccessLog.java | 3 +- .../service/serviceimpl/CommonService.java | 6 +-- .../serviceimpl/EdFileInfoServiceImpl.java | 14 +++---- .../service/serviceimpl/EdPrjServiceImpl.java | 12 +++--- .../serviceimpl/FileFormatServiceImpl.java | 4 +- .../serviceimpl/FileRecycleServiceImpl.java | 2 +- .../serviceimpl/UserAccessLogServiceImpl.java | 4 -- .../software/manage/tasks/BackupTask.java | 37 +++++++++---------- 9 files changed, 56 insertions(+), 61 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 f83b32a..de1398f 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 @@ -111,24 +111,23 @@ public class LoginInterceptor implements HandlerInterceptor { UserLoginInfo user = Optional.of(UserThreadLocal.getUser()).orElse(new UserLoginInfo()); - UserAccessLog userAccessLog = UserAccessLog.builder() - .id(IdWorker.getSnowFlakeIdString()) - .userId(user.getUserId()) - .accessStartTime(DateUtil.date(accessStartTime)) - .accessEndTime(DateUtil.date(accessEndTime)) - .accessDuration(accessEndTime - accessStartTime) - .action(userOperation.value()) - .requestUrl(request.getRequestURL().toString()) - .requestIp(parseIpFromUrl(request.getRequestURL().toString())) - .reqArgs(reqArgs) - .remoteAddr(getRealIp(request)) - .accessSuccess(true) - .createTime(new Date()) - .operationModule(userOperation.modelName().key) - .operationMsg(UserThreadLocal.getUser().getSuccessMsg()) - .dataId(user.getDataId()) - .parentId(user.getParentId()) - .build(); + UserAccessLog userAccessLog = new UserAccessLog() + .setId(IdWorker.getSnowFlakeIdString()) + .setUserId(user.getUserId()) + .setAccessStartTime(DateUtil.date(accessStartTime)) + .setAccessEndTime(DateUtil.date(accessEndTime)) + .setAccessDuration(accessEndTime - accessStartTime) + .setAction(userOperation.value()) + .setRequestUrl(request.getRequestURL().toString()) + .setRequestIp(parseIpFromUrl(request.getRequestURL().toString())) + .setReqArgs(reqArgs) + .setRemoteAddr(getRealIp(request)) + .setAccessSuccess(true) + .setCreateTime(new Date()) + .setOperationModule(userOperation.modelName().key) + .setOperationMsg(UserThreadLocal.getUser().getSuccessMsg()) + .setDataId(user.getDataId()) + .setParentId(user.getParentId()); ElectromagneticResult result = user.getResult(); if (result != null) { 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 9b35745..44e93df 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 @@ -3,11 +3,12 @@ package com.electromagnetic.industry.software.manage.pojo.models; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Builder; import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @Data -@Builder +@Accessors(chain = true) @TableName("user_access_log") public class UserAccessLog { diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java index 92b977e..5900992 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java @@ -292,7 +292,7 @@ public class CommonService { return ElectromagneticResultUtil.fail("-1", info); } else { // 先设置dataStatus状态为删除状态 - edFileInfoMapper.update(null, Wrappers.lambdaUpdate() + edFileInfoMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate() .like(EdFileInfo::getFilePath, id) .set(EdFileInfo::getSort, -1) .set(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)); @@ -306,7 +306,7 @@ public class CommonService { for (int i = 0; i < edFileInfos1.size(); i++) { String tmp = edFileInfos1.get(i).getId(); - edFileInfoMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) + edFileInfoMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .set(EdFileInfo::getSort, i + 1) .eq(EdFileInfo::getId, tmp)); } @@ -322,7 +322,7 @@ public class CommonService { return ElectromagneticResultUtil.fail("-1", info); } else { // 逻辑删除文件夹 - edFileInfoMapper.update(null, Wrappers.lambdaUpdate() + edFileInfoMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate() .eq(EdFileInfo::getId, id) .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)); fileSystemService.renameFile(srcFilePath, srcPrjName + "_" + IdUtil.fastSimpleUUID() + DELETE_FLAG); 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 f572f33..f2e56f6 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 @@ -226,7 +226,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl versionBack(String fileId, int targetVersion) { EdFileInfo fileInfo = this.baseMapper.selectList(Wrappers.lambdaQuery().eq(EdFileInfo::getFileId, fileId).last("limit 1")).get(0); try { - this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) + this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .eq(EdFileInfo::getFileId, fileId) .set(EdFileInfo::getEffectFlag, false)); - this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) + this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .set(EdFileInfo::getEffectFlag, true) .eq(EdFileInfo::getFileId, fileId) .eq(EdFileInfo::getFileVersion, targetVersion)); @@ -921,7 +921,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl String tmpPath = newPrjName + "_" + IdUtil.fastSimpleUUID() + DELETE_FLAG; fileSystemService.renameFile(newPath, tmpPath); } - this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) + this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .eq(EdFileInfo::getId, prjId) .set(EdFileInfo::getFileName, newPrjName)); fileSystemService.renameFile(commonService.getEleDataPath(dataOwnCode), oldPrjName, newPrjName); @@ -184,7 +184,7 @@ public class EdPrjServiceImpl extends ServiceImpl List edFileInfos = this.baseMapper.selectList(queryWrapper); List ids = edFileInfos.stream().map(EdFileInfo::getId).collect(Collectors.toList()); ids.add(prjId); - this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code).in(EdFileInfo::getId, ids)); + this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class).set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code).in(EdFileInfo::getId, ids)); // 对原文件进行处理 EdFileInfo prjFile = this.getById(prjId); fileSystemService.renameFile(commonService.getFileSysPath(prjId, dataOwnCode), prjFile + "_" + IdUtil.fastSimpleUUID() + DELETE_FLAG); @@ -257,7 +257,7 @@ public class EdPrjServiceImpl extends ServiceImpl LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(EdFileInfo.class) .set(EdFileInfo::getSort, folderResortDTO.getSort()) .eq(EdFileInfo::getId, folderResortDTO.getId()); - this.update(updateWrapper); + this.update(new EdFileInfo(), updateWrapper); } UserThreadLocal.setSuccessInfo("", "", "子集重排序成功"); return ElectromagneticResultUtil.success(true); @@ -291,7 +291,7 @@ public class EdPrjServiceImpl extends ServiceImpl fileSysPaths.add(fileSysPath); }); - this.update(Wrappers.lambdaUpdate(EdFileInfo.class) + this.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code) .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code) .likeRight(EdFileInfo::getFilePath, prjId)); @@ -300,7 +300,7 @@ public class EdPrjServiceImpl extends ServiceImpl .set(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code) .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code) .likeRight(EdFileInfo::getFilePath, prjId); - this.update(updateWrapper); + this.update(new EdFileInfo(), updateWrapper); commonService.deletePrjSysDir(fileSysPaths); UserThreadLocal.setSuccessInfo("", prjId, "项目 {} 发布成功", fileInfo.getFileName()); return ElectromagneticResultUtil.success(true); @@ -433,7 +433,7 @@ public class EdPrjServiceImpl extends ServiceImpl EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class) .eq(EdFileInfo::getId, id)); String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath(), dataOwnCode); - this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) + this.baseMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .eq(EdFileInfo::getId, id) .set(EdFileInfo::getFileName, newFolderName)); fileSystemService.renameFile(sysFilePath, newFolderName); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java index ea9af63..1e3fdd1 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java @@ -34,7 +34,7 @@ public class FileFormatServiceImpl extends ServiceImpllambdaUpdate().set(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code)); + this.baseMapper.update(new FileFormat(), Wrappers.lambdaUpdate().set(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code)); } else { FileFormat fileFormat = new FileFormat(); fileFormat.setSuffixName(suffixName); @@ -63,7 +63,7 @@ public class FileFormatServiceImpl extends ServiceImpllambdaUpdate().eq(FileFormat::getId, id).set(FileFormat::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)); + this.baseMapper.update(new FileFormat(), Wrappers.lambdaUpdate().eq(FileFormat::getId, id).set(FileFormat::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)); UserThreadLocal.setSuccessInfo("","", StrFormatter.format("废除了文件格式，id {} ", id)); return true; } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java index 818bbd1..3dff2ea 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileRecycleServiceImpl.java @@ -194,7 +194,7 @@ public class FileRecycleServiceImpl implements FileRecycleService { } // 更新MySQL数据库 - this.edFileInfoMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) + this.edFileInfoMapper.update(new EdFileInfo(), Wrappers.lambdaUpdate(EdFileInfo.class) .eq(EdFileInfo::getFileId, fileId) .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code) .set(EdFileInfo::getPermanentDeleted, true) 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 a4ce647..62d0f65 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 @@ -32,10 +32,6 @@ public class UserAccessLogServiceImpl extends ServiceImpl files = FileUtil.loopFiles(elePropertyConfig.getTmpDir(), filter); for (File file : files) { fileSystemService.deleteFile(file.getAbsolutePath()); - UserAccessLog userAccessLog = UserAccessLog.builder() - .id(IdWorker.getSnowFlakeIdString()) - .userId("") - .accessStartTime(new Date()) - .accessEndTime(new Date()) - .accessDuration(0L) - .action("删除") - .requestUrl("") - .requestIp("") - .reqArgs("") - .remoteAddr("") - .accessSuccess(true) - .operationMsg("从系统中物理删除了文件" + file.getName()) - .createTime(new Date()) - .operationModule(UserOperationModuleEnum.TMP.key) - .dataId("") - .parentId("") - .response("") - .build(); + UserAccessLog userAccessLog = new UserAccessLog() + .setId(IdWorker.getSnowFlakeIdString()) + .setUserId("") + .setAccessStartTime(new Date()) + .setAccessEndTime(new Date()) + .setAccessDuration(0L) + .setAction("删除") + .setRequestUrl("") + .setRequestIp("") + .setReqArgs("") + .setRemoteAddr("") + .setAccessSuccess(true) + .setOperationMsg("从系统中物理删除了文件" + file.getName()) + .setCreateTime(new Date()) + .setOperationModule(UserOperationModuleEnum.TMP.key) + .setDataId("") + .setParentId("") + .setResponse(""); userAccessLogMapper.insert(userAccessLog); } }