From 277b4f8a32c2332bc067a263bcce2e763e8d13aa Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 21 Jan 2026 16:38:01 +0800
Subject: [PATCH] 1. 新增航线任务接口。 2. 新增查询航线任务列表接口。 3. 新增获取航线任务详细信息。 4. 新增航线任务接口。 5. 新增修改航线任务接口。 6. 新增删除航线任务接口。 7. 新增修改航线任务状态接口。 8. 优化查询分组业务逻辑。 9. 航线(kmz)对象增加航线任务ID信息。 10. 新增航线(kmz)业务增加航线任务数据加工校验相关业务逻辑。 11. 新增航向任务下航点信息业务相关接口。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java | 42 ++++++++++++++++++++++++++++++++++++------
1 files changed, 36 insertions(+), 6 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 186485f..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;
}
@@ -53,10 +57,19 @@
@DataScope(deptAlias = "d", userAlias = "u")
public List<ArdRouteGroup> selectArdRouteGroupList(ArdRouteGroup ardRouteGroup) {
List<ArdRouteGroup> list = ardRouteGroupMapper.selectArdRouteGroupList(ardRouteGroup);
- for (ArdRouteGroup routeGrouping : list) {
- routeGrouping.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupId(routeGrouping.getId()));
+ for (ArdRouteGroup routeGroup : list) {
+ 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;
}
/**
@@ -111,11 +124,11 @@
try {
// 先删除航线信息
int informationCount = ardRouteInfoMapper.deleteRouteInforByGroupIds(ids);
- result.put("informationCount", informationCount);
+ result.put("infoCount", informationCount);
// 再删除分组
- int groupingCount = ardRouteGroupMapper.deleteArdRouteGroupByIds(ids);
- result.put("groupingCount", groupingCount);
+ int groupCount = ardRouteGroupMapper.deleteArdRouteGroupByIds(ids);
+ result.put("groupCount", groupCount);
return result;
} catch (Exception e) {
@@ -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