diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java index 3adefa8..cf10a2a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/EdFileInfoController.java @@ -27,33 +27,33 @@ public class EdFileInfoController { @Resource private EdFileInfoService edFileInfoService; - @UserOperation(value = "查看了工程树", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "查看工程树", modelName = UserOperationModuleEnum.DATABASE) @RequestMapping("tree") public ElectromagneticResult tree() { return edFileInfoService.tree(DataOwnEnum.SYS_PRJ.code); } - @UserOperation(value = "创建了文件夹", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "创建文件夹", modelName = UserOperationModuleEnum.DATABASE) @RequestMapping("createFolder") public ElectromagneticResult createFolder(@RequestBody CreateFolderDTO createFolderDTO) { return edFileInfoService.createFolder(createFolderDTO, DataOwnEnum.COMMON.code); } - @UserOperation(value = "作废了文件夹", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "作废文件夹", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.DELETE) @RequestMapping("delete") public ElectromagneticResult delete(@RequestParam String id) { return edFileInfoService.delete(id, DataOwnEnum.COMMON.code); } - @UserOperation(value = "查询了文件", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "查询文件", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.VIEW) @RequestMapping("info") public ElectromagneticResult info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) { return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO, DataOwnEnum.COMMON.code); } - @UserOperation(value = "上传了文件", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "上传文件", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.UPLOAD) @RequestMapping("upload") public ElectromagneticResult upload(@RequestParam("parentId") String parentId, @@ -62,21 +62,21 @@ public class EdFileInfoController { return edFileInfoService.upload(parentId, file, strategy, DataOwnEnum.COMMON.code); } - @UserOperation(value = "下载了文件", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "下载文件", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.DOWNLOAD) @RequestMapping("download") public ResponseEntity download(@RequestParam String id, HttpServletResponse response) { return edFileInfoService.download(id, response, DataOwnEnum.COMMON.code); } - @UserOperation(value = "更新了文件信息", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "更新文件信息", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.EDIT) @RequestMapping("updateFileInfo") public ElectromagneticResult updateFileInfo(@RequestBody UpdateFileInfoDTO updateFileInfoDTO) { return edFileInfoService.updateFileInfo(updateFileInfoDTO, DataOwnEnum.COMMON.code); } - @UserOperation(value = "移动了文件", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "移动文件", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.MOVE) @RequestMapping("moveFile") public ElectromagneticResult moveFile(@RequestParam("id") String id, @@ -85,7 +85,7 @@ public class EdFileInfoController { return edFileInfoService.moveFile(id, targetFolderId, strategy, DataOwnEnum.COMMON.code); } - @UserOperation(value = "复制了文件", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "复制文件", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.MOVE) @RequestMapping("copyFile") public ElectromagneticResult copyFile(@RequestParam("id") String id, @@ -94,27 +94,27 @@ public class EdFileInfoController { return edFileInfoService.copyFile(id, targetFolderId, strategy, DataOwnEnum.COMMON.code); } - @UserOperation(value = "查看了文件历史版本信息", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "查看文件历史版本信息", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.VIEW) @RequestMapping("versionView") public ElectromagneticResult versionView(@RequestParam String fileId) { return edFileInfoService.versionView(fileId); } - @UserOperation(value = "回退了版本", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "回退版本", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.EDIT) @RequestMapping("versionBack") public ElectromagneticResult versionBack(@RequestParam String fileId, @RequestParam int targetVersion) { return edFileInfoService.versionBack(fileId, targetVersion); } - @UserOperation(value = "导出了数据库", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "导出数据库", modelName = UserOperationModuleEnum.DATABASE) @RequestMapping("batchExport") public ResponseEntity batchExport(@RequestParam String fileIds, HttpServletResponse response) throws IOException { return edFileInfoService.batchExport(fileIds, response, DataOwnEnum.COMMON.code); } - @UserOperation(value = "批量上传了数据库", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.DATABASE) @RequestMapping(value = "/mergeChunks", method = RequestMethod.GET) public ElectromagneticResult mergeChunks(@RequestParam String identifier, @RequestParam String fileName, @@ -122,39 +122,39 @@ public class EdFileInfoController { return edFileInfoService.mergeChunks(identifier, fileName, totalChunks, DataOwnEnum.COMMON.code); } - @UserOperation(value = "批量上传了数据库", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "批量上传数据库", modelName = UserOperationModuleEnum.DATABASE) @RequestMapping(value = "/batchImport", method = RequestMethod.POST) public ElectromagneticResult batchImport(FileChunkDTO fileChunkDTO) { return edFileInfoService.batchImport(fileChunkDTO); } - @UserOperation(value = "批量上传了数据库") + @UserOperation(value = "批量上传数据库") @RequestMapping(value = "/batchImport", method = RequestMethod.GET) public ElectromagneticResult checkChunkExist(FileChunkDTO fileChunkDTO) { return edFileInfoService.checkChunkExist(fileChunkDTO); } - @UserOperation(value = "查询了发布管理", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "查询发布管理", modelName = UserOperationModuleEnum.DATABASE) @RequestMapping(value = "/uploadRecord", method = RequestMethod.GET) public ElectromagneticResult uploadRecord(@RequestParam int pageNum, @RequestParam int pageSize) { return edFileInfoService.uploadRecord(pageNum, pageSize, DataOwnEnum.COMMON.code); } - @UserOperation(value = "查询了文件详细信息", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "查询文件详细信息", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.VIEW) @RequestMapping(value = "/fileDetail", method = RequestMethod.GET) public ElectromagneticResult detail(@RequestParam String id) { return edFileInfoService.detail(id); } - @UserOperation(value = "查询了子文件集", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "查询子文件集", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.VIEW) @RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET) public ElectromagneticResult queryChildFolder(@RequestParam String parentId) { return edFileInfoService.queryChildFolder(parentId, DataOwnEnum.COMMON.code); } - @UserOperation(value = "预览了文件", modelName = UserOperationModuleEnum.DATABASE) + @UserOperation(value = "预览文件", modelName = UserOperationModuleEnum.DATABASE) @RequiredPermission(value = FilePermission.DOWNLOAD) @RequestMapping(value = "preview", method = RequestMethod.GET) public ResponseEntity preview(@RequestParam String id, HttpServletResponse response) { 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 8351b28..80e13ae 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 @@ -5,6 +5,7 @@ import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; import cn.hutool.core.lang.tree.TreeUtil; +import cn.hutool.core.text.StrFormatter; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.json.JSONUtil; @@ -167,9 +168,9 @@ public class CommonService { public ElectromagneticResult addFolder(String parentId, String folderName, boolean maxLengthCheck, String folderId, String fileNote, int dataOwnCode) { // 验证名称是否合法 - Assert.isTrue(EleCommonUtil.isFileNameValid(folderName), NAME_VALID_MSG); + Assert.isTrue(EleCommonUtil.isFileNameValid(folderName), StrFormatter.format("{} {}", folderName, NAME_VALID_MSG)); // 检查名称是否存在 - Assert.isTrue(notExistSameFolder(parentId, folderName, dataOwnCode), "该名称已存在"); + Assert.isTrue(notExistSameFolder(parentId, folderName, dataOwnCode), StrFormatter.format("该名称 {} 已存在, 创建失败。", folderName)); LambdaQueryWrapper queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) .select(EdFileInfo::getId, EdFileInfo::getFilePath) @@ -179,7 +180,7 @@ public class CommonService { List paths = CollUtil.newArrayList(edFileInfo.getFilePath().split(MYSQL_FILE_PATH_SPLIT)); if (maxLengthCheck) { if (paths.size() >= prjFolderMaxLength) { - String info = "当前子集已达到最大层级,禁止创建子集。"; + String info = StrFormatter.format( "当前子集已达到最大层级,禁止创建子集,{} 创建失败。", folderName); log.error(info); return ElectromagneticResultUtil.fail("-1", info); } @@ -221,9 +222,9 @@ public class CommonService { // 保存到文件系统 String targetFilePath = getEleDataPath(dataOwnCode) + File.separator + getDbPath(paths) + File.separator + folderName; fileSystemService.createDirectory(targetFilePath); - return ElectromagneticResultUtil.success(true); + return ElectromagneticResultUtil.success(folderId); } catch (Exception e) { - String info = "添加失败"; + String info = StrFormatter.format("{} 添加失败,原因 {}", folderName, e.getMessage()); log.error(info, e); throw new BizException(info); } @@ -300,9 +301,9 @@ public class CommonService { EdFileInfo srcFileInfo = edFileInfoMapper.selectById(id); String srcPrjName = srcFileInfo.getFileName(); String srcFilePath = getFileSysPath(srcFileInfo.getFilePath(), dataOwnCode); + EdFileInfo fileInfo = edFileInfoMapper.selectOne(Wrappers.lambdaQuery().eq(EdFileInfo::getId, id)); try { // 这里要分两种情况,1是删除层级目录,2是删除用户创建的文件夹 - EdFileInfo fileInfo = edFileInfoMapper.selectOne(Wrappers.lambdaQuery().eq(EdFileInfo::getId, id)); String parentId = fileInfo.getParentId(); if (fileInfo.getDataOwn().equals(DataOwnEnum.SYS_PRJ.code)) { // 删除的是层级目录 long count = edFileInfoMapper.selectCount(Wrappers.lambdaQuery() @@ -311,7 +312,7 @@ public class CommonService { .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .like(EdFileInfo::getFilePath, MYSQL_FILE_PATH_SPLIT + id + MYSQL_FILE_PATH_SPLIT)); if (count > 0) { - String info = "禁止删除非空文件夹"; + String info = StrFormatter.format("删除文件 {} 失败,目录非空。", fileInfo.getFileName()); log.info(info); return ElectromagneticResultUtil.fail("-1", info); } else { @@ -345,7 +346,7 @@ public class CommonService { .eq(EdFileInfo::getParentId, id) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)); if (count > 0) { - String info = "禁止删除非空文件夹"; + String info = StrFormatter.format("删除文件 {} 失败,目录非空。", fileInfo.getFileName()); log.info(info); return ElectromagneticResultUtil.fail("-1", info); } else { @@ -359,9 +360,10 @@ public class CommonService { } } // fileSystemService.renameFile(srcFilePath, srcPrjName + "." + IdUtil.fastSimpleUUID() + DELETE_FLAG); + UserThreadLocal.setSuccessInfo(id, "删除目录 {} 成功", fileInfo.getFileName()); return ElectromagneticResultUtil.success(true); } catch (Exception e) { - String info = "删除子集异常"; + String info = StrFormatter.format("删除文件 {} 失败,目录非空。", fileInfo.getFileName()); log.error(info, e); throw new BizException(info); } 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 ab8c008..e09641a 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 @@ -35,7 +35,6 @@ import com.electromagnetic.industry.software.manage.pojo.resp.*; import com.electromagnetic.industry.software.manage.service.EdFileInfoService; import com.electromagnetic.industry.software.manage.service.FileSystemService; import com.electromagnetic.industry.software.manage.service.PermissionService; -import org.apache.ibatis.annotations.Param; import org.springframework.core.env.Environment; import org.springframework.core.io.FileSystemResource; import org.springframework.core.io.InputStreamResource; @@ -145,6 +144,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileInfoVO.class); resetFileSize(records); + UserThreadLocal.setSuccessInfo("", "查询搜索文件成功"); return ElectromagneticResultUtil.success(new FileInfoQueryPageVO(total, records)); } @@ -172,7 +172,9 @@ public class EdFileInfoServiceImpl extends ServiceImpl createFolder(CreateFolderDTO createFolderDTO, int dataOwnCode) { Assert.isTrue(EleCommonUtil.isFileNameValid(createFolderDTO.getNewFolderName()), NAME_VALID_MSG); String folderId = IdWorker.getSnowFlakeIdString(); - return commonService.addFolder(createFolderDTO.getParentId(), createFolderDTO.getNewFolderName(), false, folderId, createFolderDTO.getFileNote(), dataOwnCode); + ElectromagneticResult res = commonService.addFolder(createFolderDTO.getParentId(), createFolderDTO.getNewFolderName(), false, folderId, createFolderDTO.getFileNote(), dataOwnCode); + UserThreadLocal.setSuccessInfo(res.getData() + "", "创建文件夹成功"); + return res; } /** @@ -193,6 +195,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl delete(String id, int dataOwnCode) { EdFileInfo fileInfo = this.baseMapper.selectById(id); if (fileInfo.getDataType() == EleDataTypeEnum.FOLDER.code) { - return commonService.deleteFolder(id, dataOwnCode); + ElectromagneticResult res = commonService.deleteFolder(id, dataOwnCode); + UserThreadLocal.setSuccessInfo(id, "作废目录 {} 成功", fileInfo.getFileName()); + return res; } Date now = new Date(); String currentUserId = UserThreadLocal.getUserId(); @@ -216,6 +221,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl download(String id, HttpServletResponse response, int dataOwnCode) { - + String fileName = ""; try { EdFileInfo fileInfo = this.baseMapper.selectById(id); String fileSysPath = commonService.getFileSysPath(fileInfo.getFilePath(), dataOwnCode); Assert.isTrue(FileUtil.exist(fileSysPath), "下载文件不存在。"); FileSystemResource fileSystemResource = new FileSystemResource(fileSysPath); - String fileName = fileSystemResource.getFilename(); + fileName = fileSystemResource.getFilename(); HttpHeaders headers = new HttpHeaders(); headers.add("Cache-Control", "no-cache, no-store, must-revalidate"); headers.add("Pragma", "no-cache"); headers.add("Expires", "0"); - fileName = Base64.encode(fileName.substring(0, fileName.lastIndexOf("."))); - response.setHeader("content-disposition", "attachment;filename=" + fileName); + String newFileName = Base64.encode(fileName.substring(0, fileName.lastIndexOf("."))); + response.setHeader("content-disposition", "attachment;filename=" + newFileName); + UserThreadLocal.setSuccessInfo(id, "下载文件 {} 成功", fileName); // 构建响应实体(可以返回 updateFileInfo(UpdateFileInfoDTO updateFileInfoDTO, int dataOwnCode) { - Assert.isTrue(EleCommonUtil.isFileNameValid(updateFileInfoDTO.getFileName()), NAME_VALID_MSG); + String newFileName = updateFileInfoDTO.getFileName(); + Assert.isTrue(EleCommonUtil.isFileNameValid(newFileName), StrFormatter.format("{} {}", newFileName, NAME_VALID_MSG)); try { // 首先检查新名称是否存在 EdFileInfo fileInfo = this.baseMapper.selectById(updateFileInfoDTO.getId()); @@ -289,7 +297,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl map = edFileInfos.stream().collect(Collectors.toMap(EdFileInfo::getId, e -> e)); if (map.size() == 1) { if (!map.values().iterator().next().getId().equals(updateFileInfoDTO.getId())) { - throw new BizException("文件名已经存在"); + return ElectromagneticResultUtil.fail("-1", StrFormatter.format("文件名 {} 已经存在", newFileName)); } } else if (map.size() > 1) { log.warn("数据库中存在了两份同名同后缀的文件"); @@ -307,11 +315,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl fileVersionViewVOS = BeanUtil.copyToList(edFileInfos, FileVersionViewVO.class); + UserThreadLocal.setSuccessInfo(fileId, "查询版本信息成功"); return ElectromagneticResultUtil.success(fileVersionViewVOS); } @@ -849,18 +862,20 @@ public class EdFileInfoServiceImpl extends ServiceImpl handMoveConflict(String targetFolderId, Integer strategy, EdFileInfo srcFileInfo, EdFileInfo destFolderInfo, int dataOwnCode) { + private EdFileInfo handMoveConflict(String targetFolderId, Integer strategy, EdFileInfo srcFileInfo, EdFileInfo destFolderInfo, int dataOwnCode) { // 禁止同目录下移动和复制 if (srcFileInfo.getParentId().equals(destFolderInfo.getId())) { String info = "禁止相同文件夹下移动文件"; log.info(info); - return ElectromagneticResultUtil.fail("-1", info); + throw new BizException(info); } if (strategy == 2) { @@ -891,6 +906,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl edFileInfoPage = this.baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQuery); long total = edFileInfoPage.getTotal(); List uploadRecordDTOS = BeanUtil.copyToList(edFileInfoPage.getRecords(), UploadRecordDTO.class); + UserThreadLocal.setSuccessInfo("", "查看了发布管理"); return ElectromagneticResultUtil.success(new UploadRecordVO(total, uploadRecordDTOS)); } @@ -1005,15 +1026,16 @@ public class EdFileInfoServiceImpl extends ServiceImpl handCopyConflict(String targetFolderId, Integer strategy, EdFileInfo srcFileInfo, EdFileInfo destFolderInfo, int dataOwnCode) { + private EdFileInfo handCopyConflict(String targetFolderId, Integer strategy, EdFileInfo srcFileInfo, EdFileInfo destFolderInfo, int dataOwnCode) { // 禁止同目录下移动和复制 if (srcFileInfo.getParentId().equals(destFolderInfo.getId())) { String info = "禁止相同文件夹下复制文件"; log.info(info); - return ElectromagneticResultUtil.fail("-1", info); + throw new BizException(info); } if (strategy == 2) { @@ -1043,6 +1065,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl res = BeanUtil.copyToList(edFileInfos, ChildFolderVO.class); + UserThreadLocal.setSuccessInfo(parentId, "查询了子文件集"); return ElectromagneticResultUtil.success(res); } @@ -1239,6 +1264,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl fileSystemService.createDirectory(commonService.getEleDataPath(dataOwnCode) + File.separator + prjName); UserThreadLocal.setSuccessInfo(newPrjId, "创建 {} 项目成功。", prjName); } catch (Exception e) { - String info = StrFormatter.format("工程创建失败,具体为--->{}", e.getMessage()); + String info = StrFormatter.format("工程 {} 创建失败,具体为--->{}", prjName, e.getMessage()); log.error(info, e); throw new BizException(info, e); } @@ -226,7 +226,9 @@ public class EdPrjServiceImpl extends ServiceImpl Assert.isTrue(count == 0, StrFormatter.format("该层级目录下存在文件,不允许再定义层级目录。父目录id {},子集名称 {}", parentId, folderName)); int id = Integer.parseInt(this.baseMapper.maxPrjId()); String folderId = String.valueOf(id + 1); - return commonService.addFolder(parentId, folderName, true, folderId, null, dataOwnCode); + ElectromagneticResult electromagneticResult = commonService.addFolder(parentId, folderName, true, folderId, null, dataOwnCode); + UserThreadLocal.setSuccessInfo(electromagneticResult.getData() + "", "添加子集 {} 成功", folderName); + return electromagneticResult; } /** @@ -285,9 +287,7 @@ public class EdPrjServiceImpl extends ServiceImpl @Override @Transactional(rollbackFor = Exception.class) public ElectromagneticResult publish(String prjId, int dataOwnCode) { - EdFileInfo fileInfo = this.baseMapper.selectById(prjId); - try { Date now = new Date(); String currentUserId = UserThreadLocal.getUserId(); @@ -409,7 +409,7 @@ public class EdPrjServiceImpl extends ServiceImpl String targetSysFilePath = commonService.getFileSysPath(targetFile.getFilePath(), dataOwnCode); needSavePaths.add(targetSysFilePath); } else { - String info = "存在相同子集"; + String info = StrFormatter.format("层级沿用失败,源工程 {},目标工程 {},原因 存在相同子集", sourceId, targetId); log.error(info); throw new BizException(info); } @@ -418,9 +418,10 @@ public class EdPrjServiceImpl extends ServiceImpl for (String path : needSavePaths) { fileSystemService.createDirectory(path); } + UserThreadLocal.setSuccessInfo(targetId, "层级沿用成功"); return ElectromagneticResultUtil.success(true); } catch (Exception e) { - String info = StrFormatter.format("层级沿用失败"); + String info = StrFormatter.format("层级沿用失败,源工程 {},目标工程 {},原因 {}", sourceId, targetId, e.getMessage()); log.error(info, e); throw new BizException(info); } @@ -441,7 +442,7 @@ public class EdPrjServiceImpl extends ServiceImpl try { String parentId = this.baseMapper.selectById(id).getParentId(); // 首先检查同层是否有同名目录 - Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName, dataOwnCode), "子集名已经存在"); + Assert.isTrue(commonService.notExistSameFolder(parentId, newFolderName, dataOwnCode), StrFormatter.format("{} 子集名已经存在", newFolderName)); String currentUserId = UserThreadLocal.getUserId(); Date now = new Date(); EdFileInfo fileInfo = this.baseMapper.selectOne(Wrappers.lambdaQuery(EdFileInfo.class) @@ -453,9 +454,10 @@ public class EdPrjServiceImpl extends ServiceImpl .eq(EdFileInfo::getId, id) .set(EdFileInfo::getFileName, newFolderName)); fileSystemService.renameFile(sysFilePath, newFolderName); + UserThreadLocal.setSuccessInfo(id, "子集名称 {} 修改成功", newFolderName); return ElectromagneticResultUtil.success(true); } catch (Exception e) { - String info = StrFormatter.format("修改子集名称为{}失败", newFolderName); + String info = StrFormatter.format("修改子集名称为 {} 失败", newFolderName); log.error(info, e); throw new BizException(info); }