From d41f0d191aa44c3571e3706724c33c4b81eb554e Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Mon, 13 Jan 2025 14:18:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A0=B9=E6=8D=AEid=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=85=B6=E4=B8=8B=E8=87=AA=E5=AE=9A=E4=B9=89=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E5=A4=B9=E7=9A=84=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/EdFileInfoController.java      |  5 +++++
 .../manage/pojo/resp/ChildFolderVO.java       |  9 ++++++++
 .../manage/service/EdFileInfoService.java     |  7 ++++++
 .../serviceimpl/EdFileInfoServiceImpl.java    | 22 +++++++++++++++----
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ChildFolderVO.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 319d71a..68ca844 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
@@ -122,4 +122,9 @@ public class EdFileInfoController {
     public ElectromagneticResult<?> detail(@RequestParam String id) {
         return edFileInfoService.detail(id);
     }
+
+    @RequestMapping(value = "/queryChildFolder", method = RequestMethod.GET)
+    public ElectromagneticResult<?> queryChildFolder(@RequestParam String parentId) {
+        return edFileInfoService.queryChildFolder(parentId);
+    }
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ChildFolderVO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ChildFolderVO.java
new file mode 100644
index 0000000..daa02f3
--- /dev/null
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/resp/ChildFolderVO.java
@@ -0,0 +1,9 @@
+package com.electromagnetic.industry.software.manage.pojo.resp;
+
+import lombok.Data;
+
+@Data
+public class ChildFolderVO {
+    private String id;
+    private String fileName;
+}
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 ca44fbe..e92d942 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
@@ -157,4 +157,11 @@ public interface EdFileInfoService {
      * 获取文件的层级Id
      */
     String getCategoryId (String id);
+
+    /**
+     * 根据父id查询其下自定义的文件夹
+     * @param parentId
+     * @return
+     */
+    ElectromagneticResult<?> queryChildFolder(String parentId);
 }
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 6730e8e..7859c06 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
@@ -27,10 +27,7 @@ import com.electromagnetic.industry.software.manage.pojo.models.EdFileInfo;
 import com.electromagnetic.industry.software.manage.pojo.other.FileInfoVO;
 import com.electromagnetic.industry.software.manage.pojo.other.UploadRecordDTO;
 import com.electromagnetic.industry.software.manage.pojo.req.*;
-import com.electromagnetic.industry.software.manage.pojo.resp.FileInfoQueryPageVO;
-import com.electromagnetic.industry.software.manage.pojo.resp.FileProjectVO;
-import com.electromagnetic.industry.software.manage.pojo.resp.FileVersionViewVO;
-import com.electromagnetic.industry.software.manage.pojo.resp.UploadRecordVO;
+import com.electromagnetic.industry.software.manage.pojo.resp.*;
 import com.electromagnetic.industry.software.manage.service.EdFileInfoService;
 import com.electromagnetic.industry.software.manage.service.FileSystemService;
 import com.electromagnetic.industry.software.manage.service.PermissionService;
@@ -1147,4 +1144,21 @@ public class EdFileInfoServiceImpl extends ServiceImpl<EdFileInfoMapper, EdFileI
         return file.getFileCode().substring(0, 6);
     }
 
+    /**
+     * 根据父id查询其下自定义的文件夹
+     *
+     * @param parentId
+     * @return
+     */
+    @Override
+    public ElectromagneticResult<?> queryChildFolder(String parentId) {
+
+        List<EdFileInfo> edFileInfos = this.baseMapper.selectList(Wrappers.lambdaQuery(EdFileInfo.class).select(EdFileInfo::getId, EdFileInfo::getFileName)
+                .eq(EdFileInfo::getPrjDir, Boolean.FALSE)
+                .eq(EdFileInfo::getParentId, parentId)
+                .eq(EdFileInfo::getEffectFlag, EffectFlagEnum.EFFECT.code));
+        List<ChildFolderVO> res = BeanUtil.copyToList(edFileInfos, ChildFolderVO.class);
+        return ElectromagneticResultUtil.success(res);
+    }
+
 }