From bf2639e4821122e0bf2d8b25b1de74e75bb6cff5 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Mon, 09 Mar 2026 14:30:01 +0800
Subject: [PATCH] 2026-03-09 标记功能接口调整： 1、目录表增加is_delete字段，用于标记目录是否可以删除；只要true/false； 2、目录数据库中增加“默认文件夹”数据，不可被删除；在删除目录中判断固定id为default_directory_00000001的数据不可删除。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java
index 61e1b6f..7fa2985 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java
@@ -9,6 +9,7 @@
import com.ard.common.utils.DateUtils;
import com.ard.common.utils.uuid.IdUtils;
import com.ard.route.domain.route.ArdRouteGroup;
+import com.ard.route.domain.route.ArdRouteInfo;
import com.ard.route.domain.vo.ArdRouteGroupVo;
import com.ard.route.mapper.ArdRouteGroupMapper;
import com.ard.route.mapper.ArdRouteInfoMapper;
@@ -42,7 +43,7 @@
@Override
public ArdRouteGroup selectArdRouteGroupById(String id) {
ArdRouteGroup ardRouteGroup = ardRouteGroupMapper.selectArdRouteGroupById(id);
- ardRouteGroup.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupId(id));
+ ardRouteGroup.setArdRouteInfoLS(checkRouteData(id));
return ardRouteGroup;
}
@@ -57,11 +58,20 @@
public List<ArdRouteGroup> selectArdRouteGroupList(ArdRouteGroup ardRouteGroup) {
List<ArdRouteGroup> list = ardRouteGroupMapper.selectArdRouteGroupList(ardRouteGroup);
for (ArdRouteGroup routeGroup : list) {
- routeGroup.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupId(routeGroup.getId()));
+ routeGroup.setArdRouteInfoLS(checkRouteData(routeGroup.getId()));
}
return list;
}
+ // 清空航线数据
+ private List<ArdRouteInfo> checkRouteData(String id){
+ List<ArdRouteInfo> routeInfos = ardRouteInfoMapper.selectArdRouteInfoByGroupId(id);
+ for (ArdRouteInfo ls : routeInfos) {
+ ls.setRouteData(null);
+ }
+ return routeInfos;
+ }
+
/**
* 新增分组
*
--
Gitblit v1.9.3