From a9def54df656c38fd6c78ef59fb8d116852adfca Mon Sep 17 00:00:00 2001 From: chenxudong Date: Mon, 30 Dec 2024 09:47:22 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E9=80=9A=E4=BA=86=E9=83=A8?= =?UTF-8?q?=E5=88=86=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../manage/pojo/models/BaseModel.java | 2 +- .../manage/pojo/models/EdFileInfo.java | 2 +- .../manage/pojo/other/FileInfoDTO.java | 7 +++-- .../manage/pojo/req/FileInfoQueryDTO.java | 2 +- .../service/serviceimpl/CommonService.java | 4 +-- .../serviceimpl/EdFileInfoServiceImpl.java | 26 +++++++++---------- .../service/serviceimpl/EdPrjServiceImpl.java | 8 +++--- 7 files changed, 26 insertions(+), 25 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java index f094a1b..e2cf96c 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/BaseModel.java @@ -25,7 +25,7 @@ public class BaseModel { * 最后更新时间 */ @TableField(value = "updated_time") - private Date updateTime; + private Date updatedTime; /** * 最后更新人 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 eb3c86e..d78e23a 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 @@ -123,7 +123,7 @@ public class EdFileInfo extends BaseModel { Date now = new Date(); this.setUpdatedBy(userId); this.setId(newFileDbId); - this.setUpdateTime(now); + this.setUpdatedTime(now); this.setCreatedTime(now); this.setFileTime(fileTime); this.setCreatedBy(userId); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java index 1849880..ac0d14b 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java @@ -1,5 +1,6 @@ package com.electromagnetic.industry.software.manage.pojo.other; +import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; import java.util.Date; @@ -29,9 +30,11 @@ public class FileInfoDTO { private String fileSize; - private Date updateTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date updatedTime; - private Date createTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createdTime; private String fileCode; diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/FileInfoQueryDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/FileInfoQueryDTO.java index ab6d61a..a56e18d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/FileInfoQueryDTO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/FileInfoQueryDTO.java @@ -28,7 +28,7 @@ public class FileInfoQueryDTO { /** * 文件类型 （0-文件夹 1-文件） */ - private Integer fileType; + private Integer dataType; /** * 上传时间（0-升序，1-降序） 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 188584a..f364ac1 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 @@ -193,7 +193,7 @@ public class CommonService { .setFilePath(path) .setSort(names.size() + 1) .setCreatedTime(now) - .setUpdateTime(now) + .setUpdatedTime(now) .setCreatedBy(currentUserId) .setUpdatedBy(currentUserId); edFileInfoMapper.insert(fileInfo); @@ -280,7 +280,7 @@ public class CommonService { edFileInfoMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) .set(EdFileInfo::getSort, i + 1) .set(EdFileInfo::getUpdatedBy, currentUserId) - .set(EdFileInfo::getUpdateTime, now) + .set(EdFileInfo::getUpdatedTime, now) .eq(EdFileInfo::getId, tmp)); } } 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 7f29252..a362f54 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 @@ -17,10 +17,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.electromagnetic.industry.software.common.enums.EffectFlagEnum; -import com.electromagnetic.industry.software.common.enums.EleDataSaveStatusEnum; -import com.electromagnetic.industry.software.common.enums.EleDataTypeEnum; -import com.electromagnetic.industry.software.common.enums.PublishEnum; +import com.electromagnetic.industry.software.common.enums.*; import com.electromagnetic.industry.software.common.exception.BizException; import com.electromagnetic.industry.software.common.resp.ElectromagneticResult; import com.electromagnetic.industry.software.common.util.*; @@ -95,15 +92,16 @@ public class EdFileInfoServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) .select() + .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getParentId, fileInfoQueryDTO.getParentId()) .like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileName, fileInfoQueryDTO.getKeyword()) .like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileNote, fileInfoQueryDTO.getKeyword()) - .eq(Objects.equals(fileInfoQueryDTO.getFileType(), 0), EdFileInfo::getFileType, 0) - .eq(Objects.equals(fileInfoQueryDTO.getFileType(), 1), EdFileInfo::getFileType, 1) + .eq(Objects.equals(fileInfoQueryDTO.getDataType(), EleDataTypeEnum.FOLDER.code), EdFileInfo::getFileType, EleDataTypeEnum.FOLDER.code) + .eq(Objects.equals(fileInfoQueryDTO.getDataType(), EleDataTypeEnum.FILE.code), EdFileInfo::getFileType, EleDataTypeEnum.FILE.code) - .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), 0), EdFileInfo::getDataStatus, 0) - .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), 1), EdFileInfo::getDataStatus, 1) - .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), 2), EdFileInfo::getDataStatus, 2) + .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.NOT_PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code) + .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.PUBLISHED.code), EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code) + .eq(Objects.equals(fileInfoQueryDTO.getDataStatus(), EleDataStatusEnum.OCCUPY.code), EdFileInfo::getDataStatus, EleDataStatusEnum.OCCUPY.code) .orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime) .orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime) @@ -424,7 +422,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl deepCopyDb = JSONUtil.toList(JSONUtil.toJsonStr(dbFileInfos), EdFileInfo.class); EdFileInfo importEffectFile = deepCopyV.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst().get(); EdFileInfo dbEffectFile = deepCopyDb.stream().filter(e -> e.getEffectFlag().equals(EffectFlagEnum.EFFECT.code)).findFirst().get(); - String effectId = importEffectFile.getUpdateTime().after(dbEffectFile.getUpdateTime()) ? importEffectFile.getId() : dbEffectFile.getId(); + String effectId = importEffectFile.getUpdatedTime().after(dbEffectFile.getUpdatedTime()) ? importEffectFile.getId() : dbEffectFile.getId(); Map importVersionRelation = getVersionRelation(deepCopyV); Map dbVersionRelation = getVersionRelation(deepCopyDb); dbVersionRelation.putAll(importVersionRelation); @@ -433,7 +431,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl versionView(String fileId) { List edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) - .select(EdFileInfo::getId, EdFileInfo::getFileId, EdFileInfo::getFileVersion, EdFileInfo::getPreVersion, EdFileInfo::getFileCode, EdFileInfo::getEffectFlag) + .select(EdFileInfo::getId, EdFileInfo::getFileId, EdFileInfo::getFileVersion, EdFileInfo::getPreVersion, EdFileInfo::getFileCode, EdFileInfo::getEffectFlag, EdFileInfo::getFileName) .eq(EdFileInfo::getFileId, fileId)); List fileVersionViewVOS = BeanUtil.copyToList(edFileInfos, FileVersionViewVO.class); return ElectromagneticResultUtil.success(fileVersionViewVOS); @@ -905,7 +903,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl .setSort(1) .setFileCode(commonService.createFileCode(newPrjId, EleDataTypeEnum.FOLDER.desc, FILE_START_VERSION, nowTimeStr)) .setCreatedTime(now) - .setUpdateTime(now) + .setUpdatedTime(now) .setCreatedBy(currentUserId) .setUpdatedBy(currentUserId); this.save(fileInfo); @@ -152,7 +152,7 @@ public class EdPrjServiceImpl extends ServiceImpl .eq(EdFileInfo::getId, prjId) .set(EdFileInfo::getFileName, newPrjName) .set(EdFileInfo::getUpdatedBy, UserThreadLocal.getUserId()) - .set(EdFileInfo::getUpdateTime, new Date())); + .set(EdFileInfo::getUpdatedTime, new Date())); fileSystemService.renameFile(commonService.getEleDataPath(), oldPrjName, newPrjName); } catch (Exception e) { String info = StrFormatter.format("修改工程名异常--->{}，{}", newPrjName, e.getMessage()); @@ -335,7 +335,7 @@ public class EdPrjServiceImpl extends ServiceImpl .setFilePath(targetParentFile.getFilePath() + MYSQL_FILE_PATH_SPLIT + newFolderId) .setSort(targetTmpEdFiles.size() + 1) .setCreatedTime(now) - .setUpdateTime(now) + .setUpdatedTime(now) .setCreatedBy(currentUserId) .setUpdatedBy(currentUserId); this.save(targetFile); @@ -376,7 +376,7 @@ public class EdPrjServiceImpl extends ServiceImpl .eq(EdFileInfo::getId, id)); String sysFilePath = commonService.getFileSysPath(fileInfo.getFilePath()); this.baseMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) - .set(EdFileInfo::getUpdateTime, now) + .set(EdFileInfo::getUpdatedTime, now) .set(EdFileInfo::getUpdatedBy, currentUserId) .eq(EdFileInfo::getId, id) .set(EdFileInfo::getFileName, newFolderName)); From b02ae363ab6fd2d2f6c46a1f8a538aad8cbdcdd3 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Mon, 30 Dec 2024 10:28:48 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=83=A8=E5=88=86?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../software/manage/controller/ProjectController.java | 4 ++-- .../industry/software/manage/service/EdPrjService.java | 2 +- .../manage/service/serviceimpl/EdFileInfoServiceImpl.java | 2 +- .../software/manage/service/serviceimpl/EdPrjServiceImpl.java | 3 ++- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java index 99dce33..74827a9 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/ProjectController.java @@ -45,8 +45,8 @@ public class ProjectController { } @RequestMapping("modifyFolder") - public ElectromagneticResult modifyFolder(@RequestParam String newFolderName, @RequestParam String id, @RequestParam String parentId) { - return edPrjService.modifyFolder(id, newFolderName, parentId); + public ElectromagneticResult modifyFolder(@RequestParam String newFolderName, @RequestParam String id) { + return edPrjService.modifyFolder(id, newFolderName); } @RequestMapping("deleteFolder") diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdPrjService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdPrjService.java index 7ce09c3..00a2d2a 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdPrjService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/EdPrjService.java @@ -88,5 +88,5 @@ public interface EdPrjService { * @param newFolderName * @return */ - ElectromagneticResult modifyFolder(String id, String newFolderName, String parentId); + ElectromagneticResult modifyFolder(String id, String newFolderName); } 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 a362f54..9ad93e8 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 @@ -258,7 +258,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl */ @Override @Transactional(rollbackFor = Exception.class) - public ElectromagneticResult modifyFolder(String id, String newFolderName, String parentId) { + public ElectromagneticResult modifyFolder(String id, String newFolderName) { try { + String parentId = this.baseMapper.selectById(id).getParentId(); // 首先检查同层是否有同名目录 if (commonService.checkSameFolder(parentId, newFolderName)) { String info = "存在同名子集，禁止修改"; From c126bb3c17e6d859cd289baae803c23267e5e1d0 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Mon, 30 Dec 2024 11:04:05 +0800 Subject: [PATCH 3/4] filse size reset --- .../software/manage/pojo/other/FileInfoDTO.java | 4 +++- .../serviceimpl/EdFileInfoServiceImpl.java | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java index ac0d14b..d344440 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/FileInfoDTO.java @@ -28,7 +28,9 @@ public class FileInfoDTO { private Integer saveStatus; - private String fileSize; + private long fileSize; + + private String fileSizeShow; @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date updatedTime; 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 9ad93e8..ccef5e6 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 @@ -117,9 +117,24 @@ public class EdFileInfoServiceImpl extends ServiceImpl edFileInfoPage = this.baseMapper.selectPage(new Page<>(fileInfoQueryDTO.getPageNum(), fileInfoQueryDTO.getPageSize()), queryWrapper); long total = edFileInfoPage.getTotal(); List records = BeanUtil.copyToList(edFileInfoPage.getRecords(), FileInfoDTO.class); + resetFileSize(records); return ElectromagneticResultUtil.success(new FileInfoQueryPageVO(total, records)); } + private void resetFileSize(List records) { + for (FileInfoDTO fileInfoDTO : records) { + if (fileInfoDTO.getFileSize() < 1024) { + fileInfoDTO.setFileSizeShow(fileInfoDTO.getFileSize() + "B"); + } else if (fileInfoDTO.getFileSize() < 1024 * 1024) { + fileInfoDTO.setFileSizeShow(String.format("%.2f KB", fileInfoDTO.getFileSize() / 1024.0)); + } else if (fileInfoDTO.getFileSize() < 1024 * 1024 * 1024) { + fileInfoDTO.setFileSizeShow(String.format("%.2f MB", fileInfoDTO.getFileSize() / (1024.0 * 1024))); + } else { + fileInfoDTO.setFileSizeShow(String.format("%.2f GB", fileInfoDTO.getFileSize() / (1024.0 * 1024 * 1024))); + } + } + } + /** * 新建文件夹 * From 26e0038a0cfc9b33825e6a76669e92ccbe974845 Mon Sep 17 00:00:00 2001 From: chenxudong Date: Mon, 30 Dec 2024 14:43:26 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=B1=82=E7=BA=A7?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=90=8E=E7=9A=84=E4=B8=AD=E9=97=B4=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../industry/software/manage/pojo/resp/ProjectVO.java | 1 + .../manage/service/serviceimpl/CommonService.java | 9 +++++---- .../manage/service/serviceimpl/EdPrjServiceImpl.java | 10 +++++++++- .../software/common/enums/EleDataStatusEnum.java | 3 ++- 4 files changed, 17 insertions(+), 6 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ProjectVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ProjectVO.java index 71be337..b708341 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ProjectVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ProjectVO.java @@ -12,6 +12,7 @@ public class ProjectVO { private String fileName; private String parentId; private int sort; + private Integer dataStatus; private List children = new ArrayList<>(); 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 f364ac1..8b99c00 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 @@ -187,8 +187,8 @@ public class CommonService { .setFileTime(nowTimeStr) .setPrjDir(isPrjDir) .setDataType(EleDataTypeEnum.FOLDER.code) - .setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) - .setEffectFlag(EffectFlagEnum.EFFECT.code) + .setDataStatus(isPrjDir ? EleDataStatusEnum.NOT_PUBLISHED.code : EleDataStatusEnum.PUBLISHED.code) + .setEffectFlag(isPrjDir ? EffectFlagEnum.NOT_EFFECTIVE.code : EffectFlagEnum.EFFECT.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setFilePath(path) .setSort(names.size() + 1) @@ -262,15 +262,16 @@ public class CommonService { log.info(info); return ElectromagneticResultUtil.fail("-1", info); } else { - // 先逻辑删除文件夹 + // 先设置dataStatus状态为删除状态 edFileInfoMapper.update(null, Wrappers.lambdaUpdate() .eq(EdFileInfo::getId, id) .set(EdFileInfo::getSort, -1) - .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)); + .set(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)); // 层级文件夹重排序 List edFileInfos1 = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) .select(EdFileInfo::getId, EdFileInfo::getSort) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) + .ne(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code) .eq(EdFileInfo::getParentId, parentId) .orderByAsc(EdFileInfo::getSort)); Date now = new Date(); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java index b1d4afb..388f9c3 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java @@ -257,8 +257,16 @@ public class EdPrjServiceImpl extends ServiceImpl @Transactional(rollbackFor = Exception.class) public ElectromagneticResult publish(String prjId) { try { + + // 将已经处于删除状态设置成逻辑删除 + this.update(Wrappers.lambdaUpdate(EdFileInfo.class) + .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code) + .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code) + .likeRight(EdFileInfo::getFilePath, prjId)); + // 其余置为发布状态 LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(EdFileInfo.class) - .set(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code) + .set(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code) + .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .likeRight(EdFileInfo::getFilePath, prjId); this.update(updateWrapper); return ElectromagneticResultUtil.success(true); diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EleDataStatusEnum.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EleDataStatusEnum.java index 36a977f..5e36b87 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EleDataStatusEnum.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EleDataStatusEnum.java @@ -7,7 +7,8 @@ public enum EleDataStatusEnum { NOT_PUBLISHED(0, "未发布"), PUBLISHED(1, "已发布"), - OCCUPY(2, "占用"); + OCCUPY(2, "占用"), + DELETED(3, "已删除"); public final int code; public final String desc;