From ef497a4547843e1ade23d80f40bc682dca952ed0 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 06 Nov 2025 15:23:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev

---
 ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java |   64 +++++++++++++++++---------------
 1 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
index 1625807..b195861 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java
@@ -9,7 +9,9 @@
 import com.ard.common.utils.DateUtils;
 import com.ard.common.utils.uuid.IdUtils;
 import com.ard.route.domain.route.ArdRouteFile;
+import com.ard.route.domain.route.ArdRouteInformation;
 import com.ard.route.mapper.ArdRouteFileMapper;
+import com.ard.route.mapper.ArdRouteInformationMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ard.route.mapper.ArdRouteFolderMapper;
@@ -30,33 +32,35 @@
     private ArdRouteFolderMapper ardRouteFolderMapper;
 
     @Autowired
-    private ArdRouteFileMapper ardRouteFileMapper;
+    private ArdRouteInformationMapper ardRouteInformationMapper;
 
     /**
-     * 查询文件夹
+     * 查询分组
      * 
-     * @param id 文件夹主键
-     * @return 文件夹
+     * @param id 分组主键
+     * @return 分组
      */
     @Override
     public ArdRouteFolder selectArdRouteFolderById(String id) {
         ArdRouteFolder ardRouteFolder = ardRouteFolderMapper.selectArdRouteFolderById(id);
-        ardRouteFolder.setArdRouteFileLs(getArdRouteFiles(id));
+        ArdRouteInformation ardRouteInformation = new ArdRouteInformation();
+        ardRouteInformation.setFolderId(id);
+        ardRouteFolder.setArdRouteInformationLs(ardRouteInformationMapper.selectArdRouteInformationList(ardRouteInformation));
         return ardRouteFolder;
     }
 
     /**
-     * 查询文件夹列表
+     * 查询分组列表
      * 
-     * @param ardRouteFolder 文件夹
-     * @return 文件夹
+     * @param ardRouteFolder 分组
+     * @return 分组
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
     public List<ArdRouteFolder> selectArdRouteFolderList(ArdRouteFolder ardRouteFolder) {
         List<ArdRouteFolder> list = ardRouteFolderMapper.selectArdRouteFolderList(ardRouteFolder);
         for (ArdRouteFolder routeFolder : list) {
-            routeFolder.setArdRouteFileLs(getArdRouteFiles(routeFolder.getId()));
+            routeFolder.setArdRouteInformationLs(getArdRouteInformation(routeFolder.getId()));
         }
         return list;
     }
@@ -64,16 +68,16 @@
     /**
      * 查询文件列表
      */
-    private List<ArdRouteFile> getArdRouteFiles(String folderId) {
-        ArdRouteFile ardRouteFile = new ArdRouteFile();
-        ardRouteFile.setFolderId(folderId);
-        return ardRouteFileMapper.selectArdRouteFileList(ardRouteFile);
+    private List<ArdRouteInformation> getArdRouteInformation(String folderId) {
+        ArdRouteInformation ardRouteInformation = new ArdRouteInformation();
+        ardRouteInformation.setFolderId(folderId);
+        return ardRouteInformationMapper.selectArdRouteInformationList(ardRouteInformation);
     }
 
     /**
-     * 新增文件夹
+     * 新增分组
      * 
-     * @param ardRouteFolder 文件夹
+     * @param ardRouteFolder 分组
      * @return 结果
      */
     @Override
@@ -87,46 +91,46 @@
     }
 
     /**
-     * 修改文件夹
+     * 修改分组
      * 
-     * @param ardRouteFolder 文件夹
+     * @param ardRouteFolder 分组
      * @return 结果
      */
     @Override
     public int updateArdRouteFolder(ArdRouteFolder ardRouteFolder) {
-        // 不能修改默认文件夹
+        // 不能修改默认分组
         if ("0".equals(ardRouteFolder.getId())) {
-            throw new RuntimeException("不能修改默认文件夹");
+            throw new RuntimeException("不能修改默认分组");
         }
         ardRouteFolder.setUpdateTime(DateUtils.getNowDate());
         return ardRouteFolderMapper.updateArdRouteFolder(ardRouteFolder);
     }
 
     /**
-     * 批量删除文件夹
+     * 批量删除分组
      * 
-     * @param ids 需要删除的文件夹主键
+     * @param ids 需要删除的分组主键
      * @return 结果
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public Map<String, Integer> deleteArdRouteFolderByIds(String[] ids) {
-        // 检查是否包含默认文件夹，不能删除默认文件夹
+        // 检查是否包含默认分组，不能删除默认分组
         for (String id : ids) {
             if ("0".equals(id)) {
-                throw new RuntimeException("不能删除默认文件夹");
+                throw new RuntimeException("不能删除默认分组");
             }
         }
 
         Map<String, Integer> result = new HashMap<>();
         try {
-            // 先删除文件
-            int fileCount = ardRouteFileMapper.deleteRouteFileByFolderIds(ids);
-            result.put("file", fileCount);
+            // 先删除航线信息
+            int informationCount = ardRouteInformationMapper.deleteRouteInformationByFolderIds(ids);
+            result.put("informationCount", informationCount);
 
-            // 再删除文件夹
+            // 再删除分组
             int folderCount = ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
-            result.put("folder", folderCount);
+            result.put("folderCount", folderCount);
 
             return result;
         } catch (Exception e) {
@@ -135,9 +139,9 @@
     }
 
     /**
-     * 删除文件夹信息
+     * 删除分组信息
      * 
-     * @param id 文件夹主键
+     * @param id 分组主键
      * @return 结果
      */
     @Override

--
Gitblit v1.9.3