diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java index d5c6aed..06ebf9b 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/SysEdFileInfoController.java @@ -202,5 +202,15 @@ public class SysEdFileInfoController { return ElectromagneticResultUtil.success(edFileInfoService.findFavorite(userId, fileInfoQueryDTO)); } + /** + * 展示当前用户收藏夹文件 + * + * @return + */ + @GetMapping("/flushDataStatus") + @UserOperation(value = "刷新文件状态", modelName = UserOperationModuleEnum.SYS_PRJ_DATABASE) + public ElectromagneticResult flushDataStatus(@RequestParam String id) { + return ElectromagneticResultUtil.success(edFileInfoService.flushDataStatus(id)); + } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java index c439773..53ae7c1 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdFileInfoService.java @@ -243,4 +243,6 @@ public interface EdFileInfoService { * @return */ ElectromagneticResult uploadFileAndRelation(String parentId, String id, MultipartFile file, String desc, int dataOwnCode); + + boolean flushDataStatus(String id); } 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 f9a311e..5774b1c 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 @@ -652,7 +652,7 @@ public class CommonService { .setSaveStatus(EleDataSaveStatusEnum.UPLOADING.code) .setDataOwn(dataOwnCode) .setFileName(mainName) - .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix)) + .setFileContent("") .setFileType(suffix) .setFileVersion(FILE_START_VERSION) .setFileSize(file.getSize()) @@ -708,7 +708,7 @@ public class CommonService { String timeStr = EleCommonUtil.getNowTimeStr(); newEdFileInfo.setFileName(mainName) .setFileType(suffix) - .setFileContent(EleCommonUtil.parse(file.getInputStream(), suffix)) + .setFileContent("") .setFileTime(timeStr) .setFileSize(file.getSize()) .setDataType(EleDataTypeEnum.FILE.code) 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 d74c549..5eb046f 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 @@ -313,7 +313,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl !StrUtil.equals(file.getColumn(), "file_content")) .eq(EdFileInfo::getId, targetFolderId)); - this.baseMapper.update(Wrappers.lambdaUpdate(EdFileInfo.class) - .set(EdFileInfo::getDataStatus, EleDataStatusEnum.OCCUPY.code) - .like(EdFileInfo::getFilePath, MYSQL_FILE_PATH_SPLIT + id)); if (count == 0) { // 没有同名文件 // 首先将信息保存到MySQL @@ -1006,10 +1003,13 @@ public class EdFileInfoServiceImpl extends ServiceImpl copyFile(String id, String targetFolderId, Integer strategy, int dataOwnCode) { + this.baseMapper.update(Wrappers.lambdaUpdate(EdFileInfo.class) + .set(EdFileInfo::getDataStatus, EleDataStatusEnum.OCCUPY.code) + .eq(EdFileInfo::getId, id)); Assert.isTrue(FileRepeatEnum.contains(strategy), "解决重名文件参数错误"); // 获取原文件mysql模型 EdFileInfo srcFileInfo = this.baseMapper.selectById1(id); @@ -1094,9 +1098,7 @@ public class EdFileInfoServiceImpl extends ServiceImpllambdaUpdate() + .set(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code) + .eq(EdFileInfo::getId, id)); + return true; + } + /** * 统一废除文件相关数据 diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java index c01f0e9..64c0fe0 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/util/EleCommonUtil.java @@ -114,10 +114,7 @@ public final class EleCommonUtil { public static String parse(InputStream inputStream, String fileType) { FileParse fileParse = PARSE_MAP.getOrDefault(fileType, null); - if (fileParse == null) { - return ""; - } - return fileParse.parseAllText(inputStream, fileType); + return fileParse == null ? "" : fileParse.parseAllText(inputStream, fileType); } private static boolean between(int start, int end, char value) {