From b4cbe90b2f84798a6664bfb57c7dbbe16b3c3c51 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Tue, 04 Nov 2025 20:15:21 +0800
Subject: [PATCH] 1.文件业务权限管理优化。 2.文件夹业务权限管理优化。 3.航线信息接口业务逻辑优化。 4.解析kmz文件接口，异常处理。 5.增加解析kmz文件接口业务，符合智云3.0整体业务。 6.优化公共方法类。 7.新增文件异常处理优化。 8.解决文件夹查询异常报错。 9.根据前端业务增加业务字段。 10.修改代码注释。 11.抽取公共方法。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteFolderServiceImpl.java | 65 ++++++++++++++++++++++++++++++--
1 files changed, 60 insertions(+), 5 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 8837a9d..1625807 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
@@ -1,14 +1,21 @@
package com.ard.route.service.impl;
+import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.ard.common.annotation.DataScope;
+import com.ard.common.utils.DateUtils;
import com.ard.common.utils.uuid.IdUtils;
+import com.ard.route.domain.route.ArdRouteFile;
+import com.ard.route.mapper.ArdRouteFileMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.mapper.ArdRouteFolderMapper;
-import com.ard.route.domain.ArdRouteFolder;
+import com.ard.route.domain.route.ArdRouteFolder;
import com.ard.route.service.IArdRouteFolderService;
+import org.springframework.transaction.annotation.Transactional;
/**
* 文件夹Service业务层处理
@@ -22,6 +29,9 @@
@Autowired
private ArdRouteFolderMapper ardRouteFolderMapper;
+ @Autowired
+ private ArdRouteFileMapper ardRouteFileMapper;
+
/**
* 查询文件夹
*
@@ -30,7 +40,9 @@
*/
@Override
public ArdRouteFolder selectArdRouteFolderById(String id) {
- return ardRouteFolderMapper.selectArdRouteFolderById(id);
+ ArdRouteFolder ardRouteFolder = ardRouteFolderMapper.selectArdRouteFolderById(id);
+ ardRouteFolder.setArdRouteFileLs(getArdRouteFiles(id));
+ return ardRouteFolder;
}
/**
@@ -42,7 +54,20 @@
@Override
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdRouteFolder> selectArdRouteFolderList(ArdRouteFolder ardRouteFolder) {
- return ardRouteFolderMapper.selectArdRouteFolderList(ardRouteFolder);
+ List<ArdRouteFolder> list = ardRouteFolderMapper.selectArdRouteFolderList(ardRouteFolder);
+ for (ArdRouteFolder routeFolder : list) {
+ routeFolder.setArdRouteFileLs(getArdRouteFiles(routeFolder.getId()));
+ }
+ return list;
+ }
+
+ /**
+ * 查询文件列表
+ */
+ private List<ArdRouteFile> getArdRouteFiles(String folderId) {
+ ArdRouteFile ardRouteFile = new ArdRouteFile();
+ ardRouteFile.setFolderId(folderId);
+ return ardRouteFileMapper.selectArdRouteFileList(ardRouteFile);
}
/**
@@ -54,6 +79,10 @@
@Override
public int insertArdRouteFolder(ArdRouteFolder ardRouteFolder) {
ardRouteFolder.setId(IdUtils.simpleUUID());
+ ardRouteFolder.setCreateTime(DateUtils.getNowDate());
+ // 获取当前数据条数
+ int count = ardRouteFolderMapper.selectArdRouteFolderList(null).size();
+ ardRouteFolder.setSerialNumber(count + 1);
return ardRouteFolderMapper.insertArdRouteFolder(ardRouteFolder);
}
@@ -65,6 +94,11 @@
*/
@Override
public int updateArdRouteFolder(ArdRouteFolder ardRouteFolder) {
+ // 不能修改默认文件夹
+ if ("0".equals(ardRouteFolder.getId())) {
+ throw new RuntimeException("不能修改默认文件夹");
+ }
+ ardRouteFolder.setUpdateTime(DateUtils.getNowDate());
return ardRouteFolderMapper.updateArdRouteFolder(ardRouteFolder);
}
@@ -75,8 +109,29 @@
* @return 结果
*/
@Override
- public int deleteArdRouteFolderByIds(String[] ids) {
- return ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
+ @Transactional(rollbackFor = Exception.class)
+ public Map<String, Integer> deleteArdRouteFolderByIds(String[] ids) {
+ // 检查是否包含默认文件夹，不能删除默认文件夹
+ for (String id : ids) {
+ if ("0".equals(id)) {
+ throw new RuntimeException("不能删除默认文件夹");
+ }
+ }
+
+ Map<String, Integer> result = new HashMap<>();
+ try {
+ // 先删除文件
+ int fileCount = ardRouteFileMapper.deleteRouteFileByFolderIds(ids);
+ result.put("file", fileCount);
+
+ // 再删除文件夹
+ int folderCount = ardRouteFolderMapper.deleteArdRouteFolderByIds(ids);
+ result.put("folder", folderCount);
+
+ return result;
+ } catch (Exception e) {
+ throw e; // 抛出异常让事务回滚
+ }
}
/**
--
Gitblit v1.9.3