chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增层级定义后的中间状态

This commit is contained in:
chenxudong 2024-12-30 14:43:26 +08:00
parent c126bb3c17
commit 26e0038a0c
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ProjectVO.java
View File

@ -12,6 +12,7 @@ public class ProjectVO {
private String fileName; private String fileName;
private String parentId; private String parentId;
private int sort; private int sort;
private Integer dataStatus;
private List<ProjectVO> children = new ArrayList<>(); private List<ProjectVO> children = new ArrayList<>();

9
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/CommonService.java
View File

@ -187,8 +187,8 @@ public class CommonService {
.setFileTime(nowTimeStr) .setFileTime(nowTimeStr)
.setPrjDir(isPrjDir) .setPrjDir(isPrjDir)
.setDataType(EleDataTypeEnum.FOLDER.code) .setDataType(EleDataTypeEnum.FOLDER.code)
.setDataStatus(EleDataStatusEnum.NOT_PUBLISHED.code) .setDataStatus(isPrjDir ? EleDataStatusEnum.NOT_PUBLISHED.code : EleDataStatusEnum.PUBLISHED.code)
.setEffectFlag(EffectFlagEnum.EFFECT.code) .setEffectFlag(isPrjDir ? EffectFlagEnum.NOT_EFFECTIVE.code : EffectFlagEnum.EFFECT.code)
.setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code) .setSaveStatus(EleDataSaveStatusEnum.SUCCESS.code)
.setFilePath(path) .setFilePath(path)
.setSort(names.size() + 1) .setSort(names.size() + 1)
@ -262,15 +262,16 @@ public class CommonService {
log.info(info); log.info(info);
return ElectromagneticResultUtil.fail("-1", info); return ElectromagneticResultUtil.fail("-1", info);
} else { } else {
// 先逻辑删除文件夹 // 先设置dataStatus状态为删除状态
edFileInfoMapper.update(null, Wrappers.<EdFileInfo>lambdaUpdate() edFileInfoMapper.update(null, Wrappers.<EdFileInfo>lambdaUpdate()
.eq(EdFileInfo::getId, id) .eq(EdFileInfo::getId, id)
.set(EdFileInfo::getSort, -1) .set(EdFileInfo::getSort, -1)
.set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code)); .set(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code));
// 层级文件夹重排序 // 层级文件夹重排序
List<EdFileInfo> edFileInfos1 = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) List<EdFileInfo> edFileInfos1 = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class)
.select(EdFileInfo::getId, EdFileInfo::getSort) .select(EdFileInfo::getId, EdFileInfo::getSort)
.eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code)
.ne(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)
.eq(EdFileInfo::getParentId, parentId) .eq(EdFileInfo::getParentId, parentId)
.orderByAsc(EdFileInfo::getSort)); .orderByAsc(EdFileInfo::getSort));
Date now = new Date(); Date now = new Date();

10
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/EdPrjServiceImpl.java
View File

@ -257,8 +257,16 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
public ElectromagneticResult<?> publish(String prjId) { public ElectromagneticResult<?> publish(String prjId) {
try { 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<EdFileInfo> updateWrapper = Wrappers.lambdaUpdate(EdFileInfo.class) LambdaUpdateWrapper<EdFileInfo> 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); .likeRight(EdFileInfo::getFilePath, prjId);
this.update(updateWrapper); this.update(updateWrapper);
return ElectromagneticResultUtil.success(true); return ElectromagneticResultUtil.success(true);

3
electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/enums/EleDataStatusEnum.java
View File

@ -7,7 +7,8 @@ public enum EleDataStatusEnum {
NOT_PUBLISHED(0, "未发布"), NOT_PUBLISHED(0, "未发布"),
PUBLISHED(1, "已发布"), PUBLISHED(1, "已发布"),
OCCUPY(2, "占用"); OCCUPY(2, "占用"),
DELETED(3, "已删除");
public final int code; public final int code;
public final String desc; public final String desc;