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 8ca82d5..dbc356c 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 @@ -275,6 +275,8 @@ public class CommonService { public ElectromagneticResult deleteFolder(String id) { // 如果文件夹下存在文件(包括文件夹和已经逻辑删除的文件),则不允许删除。后面管理员选择会有物理删除文件夹和文件的功能,此时MySQL和文件系统则会进行物理删除该文件。 + Date now = new Date(); + String currentUserId = UserThreadLocal.getUserId(); try { // 这里要分两种情况,1是删除层级目录,2是删除用户创建的文件夹 EdFileInfo fileInfo = edFileInfoMapper.selectOne(Wrappers.lambdaQuery().eq(EdFileInfo::getId, id)); @@ -293,6 +295,8 @@ public class CommonService { edFileInfoMapper.update(null, Wrappers.lambdaUpdate() .eq(EdFileInfo::getId, id) .set(EdFileInfo::getSort, -1) + .set(EdFileInfo::getUpdatedBy, currentUserId) + .set(EdFileInfo::getUpdatedTime, now) .set(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code)); // 层级文件夹重排序 List edFileInfos1 = edFileInfoMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class) @@ -300,9 +304,9 @@ public class CommonService { .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .ne(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code) .eq(EdFileInfo::getParentId, parentId) + .orderByAsc(EdFileInfo::getSort)); - Date now = new Date(); - String currentUserId = UserThreadLocal.getUserId(); + for (int i = 0; i < edFileInfos1.size(); i++) { String tmp = edFileInfos1.get(i).getId(); edFileInfoMapper.update(null, Wrappers.lambdaUpdate(EdFileInfo.class) @@ -325,6 +329,8 @@ public class CommonService { // 逻辑文件夹重排序 edFileInfoMapper.update(null, Wrappers.lambdaUpdate() .eq(EdFileInfo::getId, id) + .set(EdFileInfo::getUpdatedBy, currentUserId) + .set(EdFileInfo::getUpdatedTime, now) .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.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 ad95bce..ca4c227 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 @@ -62,7 +62,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl @Override @Transactional(rollbackFor = Exception.class) public ElectromagneticResult folderResort(List folderResortDTOList) { + Date now = new Date(); + String currentUserId = UserThreadLocal.getUserId(); try { for (FolderResortDTO folderResortDTO : folderResortDTOList) { LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(EdFileInfo.class) .set(EdFileInfo::getSort, folderResortDTO.getSort()) + .set(EdFileInfo::getUpdatedBy, currentUserId) + .set(EdFileInfo::getUpdatedTime, now) .eq(EdFileInfo::getId, folderResortDTO.getId()); this.update(updateWrapper); } @@ -252,16 +256,21 @@ public class EdPrjServiceImpl extends ServiceImpl @Transactional(rollbackFor = Exception.class) public ElectromagneticResult publish(String prjId) { try { - + Date now = new Date(); + String currentUserId = UserThreadLocal.getUserId(); // 将已经处于删除状态设置成逻辑删除 this.update(Wrappers.lambdaUpdate(EdFileInfo.class) .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.DELETED.code) .set(EdFileInfo::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code) + .set(EdFileInfo::getUpdatedBy, currentUserId) + .set(EdFileInfo::getUpdatedTime, now) .likeRight(EdFileInfo::getFilePath, prjId)); // 其余置为发布状态 LambdaUpdateWrapper updateWrapper = Wrappers.lambdaUpdate(EdFileInfo.class) .set(EdFileInfo::getDataStatus, EleDataStatusEnum.PUBLISHED.code) .eq(EdFileInfo::getDataStatus, EleDataStatusEnum.NOT_PUBLISHED.code) + .set(EdFileInfo::getUpdatedBy, currentUserId) + .set(EdFileInfo::getUpdatedTime, now) .likeRight(EdFileInfo::getFilePath, prjId); this.update(updateWrapper); return ElectromagneticResultUtil.success(true);