From a508d8d6f3160cf0594a4e309e34df165e539f6d Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Tue, 31 Dec 2024 16:03:51 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=9F=A5=E8=AF=A2=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=8E=A5=E5=8F=A3=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EdFileInfoController.java      |  2 +-
 .../manage/pojo/req/FileInfoQueryDTO.java     | 20 ++++++++++++++++--
 .../manage/pojo/resp/FileProjectVO.java       | 17 +++++++++++++++
 .../software/manage/pojo/resp/ProjectVO.java  |  1 -
 .../serviceimpl/EdFileInfoServiceImpl.java    | 21 +++++++++++++++----
 .../service/serviceimpl/EdPrjServiceImpl.java |  2 +-
 6 files changed, 54 insertions(+), 9 deletions(-)
 create mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileProjectVO.java

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 85399b7..72ac00b 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
@@ -36,7 +36,7 @@ public class EdFileInfoController {
         return edFileInfoService.delete(id);
     }
 
-    @RequestMapping("info")
+    @RequestMapping("getFileInfoList")
     public ElectromagneticResult<?> info(@RequestBody FileInfoQueryDTO fileInfoQueryDTO) {
         return edFileInfoService.queryEdFileInfo(fileInfoQueryDTO);
     }
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 a56e18d..a6094ce 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
@@ -26,15 +26,31 @@ public class FileInfoQueryDTO {
     private String keyword;
 
     /**
-     * 文件类型 （0-文件夹 1-文件）
+     * 文件名排序 （0-升序，1-降序）
      */
-    private Integer dataType;
+    private Integer fileNameSort;
+
+    /**
+     * 文件类型 （0-升序，1-降序）
+     */
+    private Integer fileTypeSort;
+
+    /**
+     * 文件类型过滤
+     */
+    private String fileType;
 
     /**
      * 上传时间（0-升序，1-降序）
      */
     private Integer createdTime;
 
+    /**
+     * 修改时间（0-升序，1-降序）
+     */
+    private Integer updatedTime;
+
+
     /**
      * 版本号（0-升序，1-降序
      */
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
new file mode 100644
index 0000000..cb69db1
--- /dev/null
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/FileProjectVO.java
@@ -0,0 +1,17 @@
+package com.electromagnetic.industry.software.manage.pojo.resp;
+
+import lombok.Data;
+import lombok.experimental.FieldNameConstants;
+
+import java.util.List;
+
+@FieldNameConstants
+@Data
+public class FileProjectVO {
+    private String categoryId;
+    private String categoryName;
+    private String parentId;
+    private Integer dataStatus;
+
+    private List<FileProjectVO> children;
+}
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 b708341..eac9a69 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
@@ -15,5 +15,4 @@ public class ProjectVO {
     private Integer dataStatus;
 
     private List<ProjectVO> children = new ArrayList<>();
-
 }
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 a9fc237..dadd9f4 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,7 +17,6 @@ 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.cons.ElectromagneticConstants;
 import com.electromagnetic.industry.software.common.enums.*;
 import com.electromagnetic.industry.software.common.exception.BizException;
 import com.electromagnetic.industry.software.common.resp.ElectromagneticResult;
@@ -97,12 +96,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 .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.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(), 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)
+                .eq(StrUtil.isNotEmpty(fileInfoQueryDTO.getFileType()), EdFileInfo::getFileType, fileInfoQueryDTO.getFileType())
 
                 .orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
                 .orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime)
@@ -113,6 +112,15 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
                 .orderByAsc(Objects.equals(fileInfoQueryDTO.getFileSize(), 0), EdFileInfo::getFileSize)
                 .orderByDesc(Objects.equals(fileInfoQueryDTO.getFileSize(), 1), EdFileInfo::getFileSize)
 
+                .orderByAsc(Objects.equals(fileInfoQueryDTO.getFileNameSort(), 0), EdFileInfo::getFileName)
+                .orderByDesc(Objects.equals(fileInfoQueryDTO.getFileNameSort(), 1), EdFileInfo::getFileName)
+
+                .orderByAsc(Objects.equals(fileInfoQueryDTO.getUpdatedTime(), 0), EdFileInfo::getUpdatedTime)
+                .orderByDesc(Objects.equals(fileInfoQueryDTO.getUpdatedTime(), 1), EdFileInfo::getUpdatedTime)
+
+                .orderByAsc(Objects.equals(fileInfoQueryDTO.getFileTypeSort(), 0), EdFileInfo::getFileType)
+                .orderByDesc(Objects.equals(fileInfoQueryDTO.getFileTypeSort(), 1), EdFileInfo::getFileType)
+
                 .orderByAsc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 0), EdFileInfo::getCreatedTime)
                 .orderByDesc(Objects.equals(fileInfoQueryDTO.getCreatedTime(), 1), EdFileInfo::getCreatedTime);
         Page<EdFileInfo> edFileInfoPage = this.baseMapper.selectPage(new Page<>(fileInfoQueryDTO.getPageNum(), fileInfoQueryDTO.getPageSize()), queryWrapper);
@@ -157,7 +165,12 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
      */
     @Override
     public ElectromagneticResult<?> tree() {
-        return commonService.queryAllPrjInfo(false);
+//        List<ProjectVO> projectVOS = commonService.queryAllPrjInfo(false);
+//        List<FileProjectVO> res = new ArrayList<>();
+//        for (ProjectVO projectVO : projectVOS) {
+//
+//        }
+        return ElectromagneticResultUtil.success(commonService.queryAllPrjInfo(false));
     }
 
     /**
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 1c3e8a9..1cd8cc4 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
@@ -221,7 +221,7 @@ public class EdPrjServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileInfo>
      */
     @Override
     public ElectromagneticResult<?> queryAllPrjInfo() {
-        return commonService.queryAllPrjInfo(true);
+        return ElectromagneticResultUtil.success(commonService.queryAllPrjInfo(true));
     }
 
     /**