diff --git a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java index 4a8d2a7..ee44bd9 100644 --- a/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java +++ b/electrmangnetic-backup/src/main/java/com/electromagnetic/industry/software/backup/controller/FileController.java @@ -29,7 +29,7 @@ public class FileController { private BackupPro backupPro; @RequestMapping("/upload") - public ElectromagneticResult upload(@RequestParam("file") MultipartFile file, @RequestParam("path") String path) { + public ElectromagneticResult upload(@RequestParam("file") MultipartFile file) { BackupFileResLog backupFileResLog = BackupFileResLog.builder().backupStartTime(new Date()).fileName(file.getOriginalFilename()).backupSuccess(true).build(); try { fileService.upload(file); diff --git a/electrmangnetic-backup/src/main/resources/application.yml b/electrmangnetic-backup/src/main/resources/application.yml index cfe6996..5b018b1 100644 --- a/electrmangnetic-backup/src/main/resources/application.yml +++ b/electrmangnetic-backup/src/main/resources/application.yml @@ -9,4 +9,7 @@ spring: servlet: multipart: max-file-size: 500MB - max-request-size: 500MB \ No newline at end of file + max-request-size: 500MB + +server: + port: 12491 \ No newline at end of file diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java index 7056ec1..a3952fd 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/EdMetaObjectHandler.java @@ -20,7 +20,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler { this.strictInsertFill(metaObject, "createdAt", Date.class, new Date()); } if (metaObject.hasGetter("createdTime")) { - this.strictInsertFill(metaObject, "createdTime", Date.class, new Date()); + this.setFieldValByName("createdTime", new Date(), metaObject); } if (metaObject.hasGetter("gmtModified")) { this.strictInsertFill(metaObject, "gmtModified", Date.class, new Date()); @@ -29,7 +29,7 @@ public class EdMetaObjectHandler implements MetaObjectHandler { this.strictInsertFill(metaObject, "updatedAt", Date.class, new Date()); } if (metaObject.hasGetter("createdBy")) { - this.strictUpdateFill(metaObject, "createdBy", String.class, Optional.of(UserThreadLocal.getUserId()).orElse("")); + this.setFieldValByName("createdBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject); } } @@ -42,10 +42,10 @@ public class EdMetaObjectHandler implements MetaObjectHandler { this.strictUpdateFill(metaObject, "updatedAt", Date.class, new Date()); } if (metaObject.hasGetter("updatedTime")) { - this.strictUpdateFill(metaObject, "updatedTime", Date.class, new Date()); + this.setFieldValByName("updatedTime", new Date(), metaObject); } if (metaObject.hasGetter("updatedBy")) { - this.strictUpdateFill(metaObject, "updatedTime", String.class, Optional.of(UserThreadLocal.getUserId()).orElse("")); + this.setFieldValByName("updatedBy", Optional.of(UserThreadLocal.getUserId()).orElse(""), metaObject); } } } 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/controller/FileFormatController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java index cc2c6f3..bd4d424 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileFormatController.java @@ -16,7 +16,7 @@ public class FileFormatController { @Resource private FileFormatService fileFormatService; - @PostMapping("/add") + @GetMapping("/add") @UserOperation(value = "新增文件格式", modelName = UserOperationModuleEnum.DATABASE) public ElectromagneticResult addFileFormat(@RequestParam String suffixName) { return ElectromagneticResultUtil.success(fileFormatService.addFileFormat(suffixName)); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java index 5ceb3db..0ee48a5 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/FileRecycleController.java @@ -26,7 +26,7 @@ public class FileRecycleController { } @RequestMapping("remove") - @UserOperation(value = "物理删除", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "彻底清除文件", modelName = UserOperationModuleEnum.DATABASE) public ElectromagneticResult remove(@RequestParam String fileId) { return fileRecycleService.remove(fileId); } 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/pojo/resp/FileRecycleQueryVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java index cc6b0ba..acb2060 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileRecycleQueryVO.java @@ -17,7 +17,7 @@ public class FileRecycleQueryVO { private String fileVersion; - private Date updateTime; + private Date updatedTime; private String fileNote; 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 c95a694..e267c29 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 @@ -227,7 +227,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)); @@ -922,7 +922,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 0b59028..a07a4b0 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 @@ -13,6 +13,7 @@ import com.electromagnetic.industry.software.manage.pojo.models.FileFormat; import com.electromagnetic.industry.software.manage.pojo.resp.FileFormatVO; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; @@ -33,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).eq(FileFormat::getSuffixName, suffixName)); } else { FileFormat fileFormat = new FileFormat(); fileFormat.setSuffixName(suffixName); @@ -62,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; } @@ -73,7 +74,7 @@ public class FileFormatServiceImpl extends ServiceImpl getList() { - List fileFormats = this.baseMapper.selectList(Wrappers.lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code)); + List fileFormats = this.baseMapper.selectList(Wrappers.lambdaQuery().eq(FileFormat::getEffectFlag, EffectFlagEnum.EFFECT.code).orderByDesc(FileFormat::getCreatedTime)); List fileFormatVOS = BeanUtil.copyToList(fileFormats, FileFormatVO.class); UserThreadLocal.setSuccessInfo("","", "查询了文件格式列表"); return fileFormatVOS; 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); } }