From aeb302cc46f60a2f5825a0149a972d82837f0071 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 14 Nov 2025 09:52:19 +0800
Subject: [PATCH] 1.增加分组列表接口。
---
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java | 20 ++++++++++
ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java | 26 +++++++++++++
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java | 11 +++++
ard-route/src/main/java/com/ard/route/service/IArdRouteGroupService.java | 10 +++++
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 3 -
5 files changed, 68 insertions(+), 2 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java
index 346b808..03be3b1 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java
@@ -11,6 +11,7 @@
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
import com.ard.route.domain.route.ArdRouteGroup;
+import com.ard.route.domain.vo.ArdRouteGroupVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -111,4 +112,14 @@
}
}
+ /**
+ * 分组列表
+ */
+ @ApiOperation("分组列表")
+ @GetMapping("/groupList")
+ public TableDataInfo groupList(ArdRouteGroup ardRouteGroup) {
+ List<ArdRouteGroupVo> list = ardRouteGroupService.selectGroupList(ardRouteGroup);
+ return getDataTable(list);
+ }
+
}
diff --git a/ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java b/ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java
new file mode 100644
index 0000000..233ced2
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/domain/vo/ArdRouteGroupVo.java
@@ -0,0 +1,26 @@
+package com.ard.route.domain.vo;
+
+import com.ard.common.annotation.Excel;
+import com.ard.common.core.domain.BaseEntity;
+import com.ard.route.domain.route.ArdRouteInfo;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class ArdRouteGroupVo extends BaseEntity {
+
+ private static final long serialVersionUID = 1L;
+
+ /** ID */
+ private String id;
+
+ /** 分组名称 */
+ @Excel(name = "分组名称")
+ private String groupName;
+
+ /** 序列号 */
+ @Excel(name = "序列号")
+ private Integer serialNumber;
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupService.java
index 0b6678d..9415ba1 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupService.java
@@ -4,6 +4,7 @@
import java.util.Map;
import com.ard.route.domain.route.ArdRouteGroup;
+import com.ard.route.domain.vo.ArdRouteGroupVo;
/**
* 分组Service接口
@@ -60,4 +61,13 @@
* @return 结果
*/
public int deleteArdRouteGroupById(String id);
+
+ /**
+ * 分组列表
+ *
+ * @param ardRouteGroup 分组
+ * @return 分组集合
+ */
+ public List<ArdRouteGroupVo> selectGroupList(ArdRouteGroup ardRouteGroup);
+
}
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..61e1b6f 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,16 @@
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.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;
@@ -134,4 +137,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());
+ }
+
}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
index 22a6cd9..2d188dd 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java
@@ -97,8 +97,7 @@
} catch (IOException e) {
throw new RuntimeException(e);
}
- Integer droneType = subStringDroneType(ardRouteInfo.getAircraft());
- ardRouteInfo.getUavRouteReq().setDroneType(droneType);
+ ardRouteInfo.getUavRouteReq().setDroneType(subStringDroneType(ardRouteInfo.getAircraft()));
ardRouteInfo.setRouteData(routeData);
KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
ardRouteInfo.setPath(kmzResult.getPath());
--
Gitblit v1.9.3