From b8b5a3895e741d5348ecdd39ad2e5cbd443f8e89 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 01 Apr 2026 12:17:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java | 34 ++++++++++++++++++++++++++++++++--
1 files changed, 32 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 4c852fa..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
@@ -3,13 +3,17 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.stream.Collectors;
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.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;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.ard.route.service.IArdRouteGroupService;
@@ -39,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;
}
@@ -54,9 +58,18 @@
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;
}
/**
@@ -134,4 +147,21 @@
return ardRouteGroupMapper.deleteArdRouteGroupById(id);
}
+ /**
+ * 分组列表
+ *
+ * @param ardRouteGroup 分组
+ * @return 分组集合
+ */
+ @Override
+ public List<ArdRouteGroupVo> selectGroupList(ArdRouteGroup ardRouteGroup) {
+ return ardRouteGroupMapper.selectArdRouteGroupList(ardRouteGroup).stream()
+ .map(entity -> {
+ ArdRouteGroupVo vo = new ArdRouteGroupVo();
+ BeanUtils.copyProperties(entity, vo);
+ return vo;
+ })
+ .collect(Collectors.toList());
+ }
+
}
--
Gitblit v1.9.3