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 72ac00b..b77e726 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 @@ -103,4 +103,9 @@ public class EdFileInfoController { public ElectromagneticResult checkChunkExist(FileChunkDTO fileChunkDTO) { return edFileInfoService.checkChunkExist(fileChunkDTO); } + + @RequestMapping(value = "/uploadRecord", method = RequestMethod.GET) + public ElectromagneticResult uploadRecord(@RequestParam int pageNum, @RequestParam int pageSize) { + return edFileInfoService.uploadRecord(pageNum, pageSize); + } } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/UploadRecordDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/UploadRecordDTO.java new file mode 100644 index 0000000..642ac9b --- /dev/null +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/other/UploadRecordDTO.java @@ -0,0 +1,14 @@ +package com.electromagnetic.industry.software.manage.pojo.other; + +import lombok.Data; + +import java.util.Date; + +@Data +public class UploadRecordDTO { + private String id; + private String fileName; + private Integer saveStatus; + private Date createdTime; + +} diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileProjectVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileProjectVO.java index 1e12942..b6a6901 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileProjectVO.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileProjectVO.java @@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.pojo.resp; import lombok.Data; import lombok.experimental.FieldNameConstants; +import java.util.ArrayList; import java.util.List; @FieldNameConstants @@ -14,5 +15,5 @@ public class FileProjectVO { private Integer dataStatus; private Integer sort; - private List children; + private List children = new ArrayList<>(); } diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UploadRecordVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UploadRecordVO.java new file mode 100644 index 0000000..ec98ea2 --- /dev/null +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/UploadRecordVO.java @@ -0,0 +1,17 @@ +package com.electromagnetic.industry.software.manage.pojo.resp; + +import com.electromagnetic.industry.software.manage.pojo.other.UploadRecordDTO; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Data +@AllArgsConstructor +@NoArgsConstructor +public class UploadRecordVO { + private long total; + List records = new ArrayList<>(); +} 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 23a8287..7b4721b 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 @@ -138,4 +138,10 @@ public interface EdFileInfoService { * @return */ ElectromagneticResult copyFile(String id, String targetFolderId, Integer strategy); + + /** + * 发布管理 + * @return + */ + ElectromagneticResult uploadRecord(int pageNum, int pageSize); } 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 52786ae..f6c241a 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 @@ -3,6 +3,7 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.codec.Base64; import cn.hutool.core.collection.CollUtil; +import cn.hutool.core.collection.ListUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.IoUtil; import cn.hutool.core.lang.Assert; @@ -24,6 +25,7 @@ import com.electromagnetic.industry.software.common.util.*; import com.electromagnetic.industry.software.manage.mapper.EdFileInfoMapper; import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo; import com.electromagnetic.industry.software.manage.pojo.other.FileInfoDTO; +import com.electromagnetic.industry.software.manage.pojo.other.UploadRecordDTO; import com.electromagnetic.industry.software.manage.pojo.req.FileChunkDTO; import com.electromagnetic.industry.software.manage.pojo.req.FileChunkResultDTO; import com.electromagnetic.industry.software.manage.pojo.req.FileInfoQueryDTO; @@ -31,6 +33,7 @@ import com.electromagnetic.industry.software.manage.pojo.req.UpdateFileInfoDTO; import com.electromagnetic.industry.software.manage.pojo.resp.FileInfoQueryPageVO; import com.electromagnetic.industry.software.manage.pojo.resp.FileVersionViewVO; import com.electromagnetic.industry.software.manage.pojo.resp.ProjectVO; +import com.electromagnetic.industry.software.manage.pojo.resp.UploadRecordVO; import com.electromagnetic.industry.software.manage.service.EdFileInfoService; import com.electromagnetic.industry.software.manage.service.FileSystemService; import org.springframework.beans.factory.annotation.Autowired; @@ -93,6 +96,7 @@ public class EdFileInfoServiceImpl extends ServiceImpl queryWrapper = Wrappers.lambdaQuery(EdFileInfo.class) .select() + .eq(EdFileInfo::getSaveStatus, EleDataSaveStatusEnum.SUCCESS.code) .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code) .eq(EdFileInfo::getParentId, fileInfoQueryDTO.getParentId()) .like(StrUtil.isNotEmpty(fileInfoQueryDTO.getKeyword()), EdFileInfo::getFileName, fileInfoQueryDTO.getKeyword()) @@ -623,11 +627,14 @@ public class EdFileInfoServiceImpl extends ServiceImpl uploadRecord(int pageNum, int pageSize) { + + List prjIds = ListUtil.list(false, "100001", "100002"); //TODO 从权限处获取该用户有哪些工程的权限,这里先写静态,方便调试 + List res = new ArrayList<>(); + LambdaQueryWrapper lambdaQuery = Wrappers.lambdaQuery(EdFileInfo.class) + .select(EdFileInfo::getId, EdFileInfo::getFileName, EdFileInfo::getSaveStatus, EdFileInfo::getCreatedTime) + .eq(EdFileInfo::getDataType, EleDataTypeEnum.FILE.code).likeRight(EdFileInfo::getFilePath, prjIds.get(0)); + for (int i = 1; i < pageSize; i++) { + lambdaQuery.or().likeRight(EdFileInfo::getFilePath, prjIds.get(i)); + } + Page edFileInfoPage = this.baseMapper.selectPage(new Page<>(pageNum, pageSize), lambdaQuery); + long total = edFileInfoPage.getTotal(); + List uploadRecordDTOS = BeanUtil.copyToList(edFileInfoPage.getRecords(), UploadRecordDTO.class); + return ElectromagneticResultUtil.success(new UploadRecordVO(total, uploadRecordDTOS)); + } + private ElectromagneticResult handCopyConflict(String targetFolderId, Integer strategy, EdFileInfo srcFileInfo, EdFileInfo destFolderInfo) { // 禁止同目录下移动和复制 if (srcFileInfo.getParentId().equals(destFolderInfo.getId())) {