From bb8cdc0ec9e92e3b6e15692fbfff72822156f680 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 13 Nov 2025 13:32:41 +0800
Subject: [PATCH] 1.修改分组表名。 2.修改航线信息表字段名。
---
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java | 4
ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java | 8
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java | 34 +-
ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml | 16
ard-route/src/main/resources/mapper/ArdRouteGroupMapper.xml | 22 +-
ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java | 2
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteInfoServiceImpl.java | 22 +-
ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java | 4
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java | 8
ard-route/src/main/java/com/ard/route/mapper/ArdRouteGroupMapper.java | 63 ++++++
/dev/null | 137 -------------
ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java | 137 +++++++++++++
ard-route/src/main/java/com/ard/route/service/IArdRouteGroupService.java | 63 ++++++
ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java | 8
ard-route/src/main/java/com/ard/route/mapper/ArdRouteInfoMapper.java | 12
ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java | 2
16 files changed, 334 insertions(+), 208 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupingController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java
similarity index 69%
rename from ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupingController.java
rename to ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java
index 59105ee..8b93493 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupingController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java
@@ -10,7 +10,7 @@
import com.ard.common.core.page.TableDataInfo;
import com.ard.common.enums.BusinessType;
import com.ard.common.utils.poi.ExcelUtil;
-import com.ard.route.domain.route.ArdRouteGrouping;
+import com.ard.route.domain.route.ArdRouteGroup;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,7 +22,7 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.ard.route.service.IArdRouteGroupingService;
+import com.ard.route.service.IArdRouteGroupService;
/**
* 分组Controller
@@ -33,19 +33,19 @@
@Api(tags = "分组管理")
@RestController
@RequestMapping("/route/grouping")
-public class ArdRouteGroupingController extends BaseController {
+public class ArdRouteGroupController extends BaseController {
@Autowired
- private IArdRouteGroupingService ardRouteGroupingService;
+ private IArdRouteGroupService ardRouteGroupService;
/**
* 查询分组列表
*/
@ApiOperation("查询分组列表")
@GetMapping("/list")
- public TableDataInfo list(ArdRouteGrouping ardRouteGrouping) {
+ public TableDataInfo list(ArdRouteGroup ardRouteGroup) {
//startPage();
- List<ArdRouteGrouping> list = ardRouteGroupingService.selectArdRouteGroupingList(ardRouteGrouping);
+ List<ArdRouteGroup> list = ardRouteGroupService.selectArdRouteGroupList(ardRouteGroup);
return getDataTable(list);
}
@@ -55,9 +55,9 @@
@ApiOperation("导出分组列表")
@Log(title = "分组", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ArdRouteGrouping ardRouteGrouping) {
- List<ArdRouteGrouping> list = ardRouteGroupingService.selectArdRouteGroupingList(ardRouteGrouping);
- ExcelUtil<ArdRouteGrouping> util = new ExcelUtil<ArdRouteGrouping>(ArdRouteGrouping.class);
+ public void export(HttpServletResponse response, ArdRouteGroup ardRouteGroup) {
+ List<ArdRouteGroup> list = ardRouteGroupService.selectArdRouteGroupList(ardRouteGroup);
+ ExcelUtil<ArdRouteGroup> util = new ExcelUtil<ArdRouteGroup>(ArdRouteGroup.class);
util.exportExcel(response, list, "分组数据");
}
@@ -67,7 +67,7 @@
@ApiOperation("获取分组详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
- return success(ardRouteGroupingService.selectArdRouteGroupingById(id));
+ return success(ardRouteGroupService.selectArdRouteGroupById(id));
}
/**
@@ -76,9 +76,9 @@
@ApiOperation("新增分组")
@Log(title = "分组", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ArdRouteGrouping ardRouteGrouping) {
- ardRouteGrouping.setCreateBy(getUsername());
- return toAjax(ardRouteGroupingService.insertArdRouteGrouping(ardRouteGrouping));
+ public AjaxResult add(@RequestBody ArdRouteGroup ardRouteGroup) {
+ ardRouteGroup.setCreateBy(getUsername());
+ return toAjax(ardRouteGroupService.insertArdRouteGroup(ardRouteGroup));
}
/**
@@ -87,9 +87,9 @@
@ApiOperation("修改分组")
@Log(title = "分组", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ArdRouteGrouping ardRouteGrouping) {
- ardRouteGrouping.setUpdateBy(getUsername());
- return toAjax(ardRouteGroupingService.updateArdRouteGrouping(ardRouteGrouping));
+ public AjaxResult edit(@RequestBody ArdRouteGroup ardRouteGroup) {
+ ardRouteGroup.setUpdateBy(getUsername());
+ return toAjax(ardRouteGroupService.updateArdRouteGroup(ardRouteGroup));
}
/**
@@ -100,7 +100,7 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
try {
- Map<String, Integer> result = ardRouteGroupingService.deleteArdRouteGroupingByIds(ids);
+ Map<String, Integer> result = ardRouteGroupService.deleteArdRouteGroupByIds(ids);
if (!result.isEmpty()) {
return AjaxResult.success("删除成功：分组删除" + result.get("groupingCount") + "，航线删除" + result.get("informationCount"));
} else {
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
index 2a646b7..43906c3 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java
@@ -113,10 +113,10 @@
*/
@ApiOperation("修改航线分组ID")
@Log(title = "航线(kmz)", businessType = BusinessType.UPDATE)
- @PutMapping("/updateGroupingId/{id}/{groupingId}")
- public AjaxResult updateGroupingId(@PathVariable("id") String id,
- @PathVariable("groupingId") String groupingId) {
- return toAjax(ardRouteInfoService.updateRouteInfomationGroupingId(id,groupingId));
+ @PutMapping("/updateGroupId/{id}/{GroupId}")
+ public AjaxResult updateGroupId(@PathVariable("id") String id,
+ @PathVariable("GroupId") String GroupId) {
+ return toAjax(ardRouteInfoService.updateRouteInfomationGroupId(id,GroupId));
}
/**
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGrouping.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
similarity index 91%
rename from ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGrouping.java
rename to ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
index a63c7a1..1f8ef0a 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGrouping.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteGroup.java
@@ -13,7 +13,7 @@
* @date 2025-10-18
*/
@Data
-public class ArdRouteGrouping extends BaseEntity {
+public class ArdRouteGroup extends BaseEntity {
private static final long serialVersionUID = 1L;
diff --git a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
index 520e6a7..b8648a9 100644
--- a/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/route/ArdRouteInfo.java
@@ -25,11 +25,11 @@
/** 文件路径 */
@Excel(name = "文件路径")
- private String upPath;
+ private String path;
/** 分组ID */
@Excel(name = "分组ID")
- private String groupingId;
+ private String groupId;
/** 航线类型 */
@Excel(name = "航线类型")
diff --git a/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java b/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java
index 5237b82..8ef3508 100644
--- a/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java
+++ b/ard-route/src/main/java/com/ard/route/domain/vo/KmzResultVo.java
@@ -6,7 +6,7 @@
public class KmzResultVo {
/** 文件路径 */
- private String upPath;
+ private String path;
/** 返回数据 */
private String data;
diff --git a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteGroupMapper.java b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteGroupMapper.java
new file mode 100644
index 0000000..5118201
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteGroupMapper.java
@@ -0,0 +1,63 @@
+package com.ard.route.mapper;
+
+import java.util.List;
+
+import com.ard.route.domain.route.ArdRouteGroup;
+
+/**
+ * 分组Mapper接口
+ *
+ * @author xia
+ * @date 2025-10-18
+ */
+public interface ArdRouteGroupMapper {
+
+ /**
+ * 查询分组
+ *
+ * @param id 分组主键
+ * @return 分组
+ */
+ public ArdRouteGroup selectArdRouteGroupById(String id);
+
+ /**
+ * 查询分组列表
+ *
+ * @param ardRouteGroup 分组
+ * @return 分组集合
+ */
+ public List<ArdRouteGroup> selectArdRouteGroupList(ArdRouteGroup ardRouteGroup);
+
+ /**
+ * 新增分组
+ *
+ * @param ardRouteGroup 分组
+ * @return 结果
+ */
+ public int insertArdRouteGroup(ArdRouteGroup ardRouteGroup);
+
+ /**
+ * 修改分组
+ *
+ * @param ardRouteGroup 分组
+ * @return 结果
+ */
+ public int updateArdRouteGroup(ArdRouteGroup ardRouteGroup);
+
+ /**
+ * 删除分组
+ *
+ * @param id 分组主键
+ * @return 结果
+ */
+ public int deleteArdRouteGroupById(String id);
+
+ /**
+ * 批量删除分组
+ *
+ * @param ids 需要删除的数据主键集合
+ * @return 结果
+ */
+ public int deleteArdRouteGroupByIds(String[] ids);
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteGroupingMapper.java b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteGroupingMapper.java
deleted file mode 100644
index 67ea263..0000000
--- a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteGroupingMapper.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package com.ard.route.mapper;
-
-import java.util.List;
-import com.ard.route.domain.route.ArdRouteGrouping;
-
-/**
- * 分组Mapper接口
- *
- * @author xia
- * @date 2025-10-18
- */
-public interface ArdRouteGroupingMapper {
-
- /**
- * 查询分组
- *
- * @param id 分组主键
- * @return 分组
- */
- public ArdRouteGrouping selectArdRouteGroupingById(String id);
-
- /**
- * 查询分组列表
- *
- * @param ardRouteGrouping 分组
- * @return 分组集合
- */
- public List<ArdRouteGrouping> selectArdRouteGroupingList(ArdRouteGrouping ardRouteGrouping);
-
- /**
- * 新增分组
- *
- * @param ardRouteGrouping 分组
- * @return 结果
- */
- public int insertArdRouteGrouping(ArdRouteGrouping ardRouteGrouping);
-
- /**
- * 修改分组
- *
- * @param ardRouteGrouping 分组
- * @return 结果
- */
- public int updateArdRouteGrouping(ArdRouteGrouping ardRouteGrouping);
-
- /**
- * 删除分组
- *
- * @param id 分组主键
- * @return 结果
- */
- public int deleteArdRouteGroupingById(String id);
-
- /**
- * 批量删除分组
- *
- * @param ids 需要删除的数据主键集合
- * @return 结果
- */
- public int deleteArdRouteGroupingByIds(String[] ids);
-
-}
diff --git a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteInfoMapper.java b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteInfoMapper.java
index 6578008..d16ab7c 100644
--- a/ard-route/src/main/java/com/ard/route/mapper/ArdRouteInfoMapper.java
+++ b/ard-route/src/main/java/com/ard/route/mapper/ArdRouteInfoMapper.java
@@ -72,26 +72,26 @@
/**
* 根据所属分组ID，删除信息
*
- * @param groupingIds 所属文件夹ID
+ * @param GroupIds 所属文件夹ID
* @return 结果
*/
- public int deleteRouteInforByGroupingIds(String[] groupingIds);
+ public int deleteRouteInforByGroupIds(String[] GroupIds);
/**
* 查询航线(kmz)列表
*
- * @param groupingId 所属分组ID
+ * @param GroupId 所属分组ID
* @return 航线(kmz)集合
*/
- public List<ArdRouteInfo> selectArdRouteInfoByGroupingId(String groupingId);
+ public List<ArdRouteInfo> selectArdRouteInfoByGroupId(String GroupId);
/**
* 修改航线分组ID
*
* @param id ID
- * @param groupingId 分组ID
+ * @param GroupId 分组ID
* @return 结果
*/
- public int updateRouteInforGroupingId(@Param("id") String id, @Param("groupingId")String groupingId);
+ public int updateRouteInforGroupId(@Param("id") String id, @Param("GroupId")String GroupId);
}
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
new file mode 100644
index 0000000..0b6678d
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupService.java
@@ -0,0 +1,63 @@
+package com.ard.route.service;
+
+import java.util.List;
+import java.util.Map;
+
+import com.ard.route.domain.route.ArdRouteGroup;
+
+/**
+ * 分组Service接口
+ *
+ * @author xia
+ * @date 2025-10-18
+ */
+public interface IArdRouteGroupService {
+
+ /**
+ * 查询分组
+ *
+ * @param id 分组主键
+ * @return 分组
+ */
+ public ArdRouteGroup selectArdRouteGroupById(String id);
+
+ /**
+ * 查询分组列表
+ *
+ * @param ardRouteGroup 分组
+ * @return 分组集合
+ */
+ public List<ArdRouteGroup> selectArdRouteGroupList(ArdRouteGroup ardRouteGroup);
+
+ /**
+ * 新增分组
+ *
+ * @param ardRouteGroup 分组
+ * @return 结果
+ */
+ public int insertArdRouteGroup(ArdRouteGroup ardRouteGroup);
+
+ /**
+ * 修改分组
+ *
+ * @param ardRouteGroup 分组
+ * @return 结果
+ */
+ public int updateArdRouteGroup(ArdRouteGroup ardRouteGroup);
+
+ /**
+ * 批量删除分组
+ *
+ * @param ids 需要删除的分组主键集合
+ * @return 结果
+ */
+ public Map<String, Integer> deleteArdRouteGroupByIds(String[] ids);
+
+ /**
+ * 删除分组信息
+ *
+ * @param id 分组主键
+ * @return 结果
+ */
+ public int deleteArdRouteGroupById(String id);
+}
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupingService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupingService.java
deleted file mode 100644
index 4c48806..0000000
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteGroupingService.java
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.ard.route.service;
-
-import java.util.List;
-import java.util.Map;
-
-import com.ard.route.domain.route.ArdRouteGrouping;
-
-/**
- * 分组Service接口
- *
- * @author xia
- * @date 2025-10-18
- */
-public interface IArdRouteGroupingService {
-
- /**
- * 查询分组
- *
- * @param id 分组主键
- * @return 分组
- */
- public ArdRouteGrouping selectArdRouteGroupingById(String id);
-
- /**
- * 查询分组列表
- *
- * @param ardRouteGrouping 分组
- * @return 分组集合
- */
- public List<ArdRouteGrouping> selectArdRouteGroupingList(ArdRouteGrouping ardRouteGrouping);
-
- /**
- * 新增分组
- *
- * @param ardRouteGrouping 分组
- * @return 结果
- */
- public int insertArdRouteGrouping(ArdRouteGrouping ardRouteGrouping);
-
- /**
- * 修改分组
- *
- * @param ardRouteGrouping 分组
- * @return 结果
- */
- public int updateArdRouteGrouping(ArdRouteGrouping ardRouteGrouping);
-
- /**
- * 批量删除分组
- *
- * @param ids 需要删除的分组主键集合
- * @return 结果
- */
- public Map<String, Integer> deleteArdRouteGroupingByIds(String[] ids);
-
- /**
- * 删除分组信息
- *
- * @param id 分组主键
- * @return 结果
- */
- public int deleteArdRouteGroupingById(String id);
-}
diff --git a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
index e7f47ea..ea45b09 100644
--- a/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
+++ b/ard-route/src/main/java/com/ard/route/service/IArdRouteInfoService.java
@@ -82,10 +82,10 @@
* 修改航线分组ID
*
* @param id ID
- * @param groupingId 分组ID
+ * @param GroupId 分组ID
* @return 结果
*/
- public int updateRouteInfomationGroupingId(String id,String groupingId);
+ public int updateRouteInfomationGroupId(String id,String GroupId);
/**
* 判断行点是否在禁飞区
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
new file mode 100644
index 0000000..186485f
--- /dev/null
+++ b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupServiceImpl.java
@@ -0,0 +1,137 @@
+package com.ard.route.service.impl;
+
+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.ArdRouteGroup;
+import com.ard.route.mapper.ArdRouteGroupMapper;
+import com.ard.route.mapper.ArdRouteInfoMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.ard.route.service.IArdRouteGroupService;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * 文件夹Service业务层处理
+ *
+ * @author xia
+ * @date 2025-10-18
+ */
+@Service
+public class ArdRouteGroupServiceImpl implements IArdRouteGroupService {
+
+ @Autowired
+ private ArdRouteGroupMapper ardRouteGroupMapper;
+
+ @Autowired
+ private ArdRouteInfoMapper ardRouteInfoMapper;
+
+ /**
+ * 查询分组
+ *
+ * @param id 分组主键
+ * @return 分组
+ */
+ @Override
+ public ArdRouteGroup selectArdRouteGroupById(String id) {
+ ArdRouteGroup ardRouteGroup = ardRouteGroupMapper.selectArdRouteGroupById(id);
+ ardRouteGroup.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupId(id));
+ return ardRouteGroup;
+ }
+
+ /**
+ * 查询分组列表
+ *
+ * @param ardRouteGroup 分组
+ * @return 分组
+ */
+ @Override
+ @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()));
+ }
+ return list;
+ }
+
+ /**
+ * 新增分组
+ *
+ * @param ardRouteGroup 分组
+ * @return 结果
+ */
+ @Override
+ public int insertArdRouteGroup(ArdRouteGroup ardRouteGroup) {
+ ardRouteGroup.setId(IdUtils.simpleUUID());
+ ardRouteGroup.setCreateTime(DateUtils.getNowDate());
+ // 获取当前数据条数
+ int count = ardRouteGroupMapper.selectArdRouteGroupList(null).size();
+ ardRouteGroup.setSerialNumber(count + 1);
+ return ardRouteGroupMapper.insertArdRouteGroup(ardRouteGroup);
+ }
+
+ /**
+ * 修改分组
+ *
+ * @param ardRouteGroup 分组
+ * @return 结果
+ */
+ @Override
+ public int updateArdRouteGroup(ArdRouteGroup ardRouteGroup) {
+ // 不能修改默认分组
+ if ("0".equals(ardRouteGroup.getId())) {
+ throw new RuntimeException("不能修改默认分组");
+ }
+ ardRouteGroup.setUpdateTime(DateUtils.getNowDate());
+ return ardRouteGroupMapper.updateArdRouteGroup(ardRouteGroup);
+ }
+
+ /**
+ * 批量删除分组
+ *
+ * @param ids 需要删除的分组主键
+ * @return 结果
+ */
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Map<String, Integer> deleteArdRouteGroupByIds(String[] ids) {
+ // 检查是否包含默认分组，不能删除默认分组
+ for (String id : ids) {
+ if ("0".equals(id)) {
+ throw new RuntimeException("不能删除默认分组");
+ }
+ }
+
+ Map<String, Integer> result = new HashMap<>();
+ try {
+ // 先删除航线信息
+ int informationCount = ardRouteInfoMapper.deleteRouteInforByGroupIds(ids);
+ result.put("informationCount", informationCount);
+
+ // 再删除分组
+ int groupingCount = ardRouteGroupMapper.deleteArdRouteGroupByIds(ids);
+ result.put("groupingCount", groupingCount);
+
+ return result;
+ } catch (Exception e) {
+ throw e; // 抛出异常让事务回滚
+ }
+ }
+
+ /**
+ * 删除分组信息
+ *
+ * @param id 分组主键
+ * @return 结果
+ */
+ @Override
+ public int deleteArdRouteGroupById(String id) {
+ return ardRouteGroupMapper.deleteArdRouteGroupById(id);
+ }
+
+}
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupingServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupingServiceImpl.java
deleted file mode 100644
index 45e0cf1..0000000
--- a/ard-route/src/main/java/com/ard/route/service/impl/ArdRouteGroupingServiceImpl.java
+++ /dev/null
@@ -1,137 +0,0 @@
-package com.ard.route.service.impl;
-
-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.ArdRouteGrouping;
-import com.ard.route.mapper.ArdRouteGroupingMapper;
-import com.ard.route.mapper.ArdRouteInfoMapper;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.ard.route.service.IArdRouteGroupingService;
-import org.springframework.transaction.annotation.Transactional;
-
-/**
- * 文件夹Service业务层处理
- *
- * @author xia
- * @date 2025-10-18
- */
-@Service
-public class ArdRouteGroupingServiceImpl implements IArdRouteGroupingService {
-
- @Autowired
- private ArdRouteGroupingMapper ardRouteGroupingMapper;
-
- @Autowired
- private ArdRouteInfoMapper ardRouteInfoMapper;
-
- /**
- * 查询分组
- *
- * @param id 分组主键
- * @return 分组
- */
- @Override
- public ArdRouteGrouping selectArdRouteGroupingById(String id) {
- ArdRouteGrouping ardRouteGrouping = ardRouteGroupingMapper.selectArdRouteGroupingById(id);
- ardRouteGrouping.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupingId(id));
- return ardRouteGrouping;
- }
-
- /**
- * 查询分组列表
- *
- * @param ardRouteGrouping 分组
- * @return 分组
- */
- @Override
- @DataScope(deptAlias = "d", userAlias = "u")
- public List<ArdRouteGrouping> selectArdRouteGroupingList(ArdRouteGrouping ardRouteGrouping) {
- List<ArdRouteGrouping> list = ardRouteGroupingMapper.selectArdRouteGroupingList(ardRouteGrouping);
- for (ArdRouteGrouping routeGrouping : list) {
- routeGrouping.setArdRouteInfoLS(ardRouteInfoMapper.selectArdRouteInfoByGroupingId(routeGrouping.getId()));
- }
- return list;
- }
-
- /**
- * 新增分组
- *
- * @param ardRouteGrouping 分组
- * @return 结果
- */
- @Override
- public int insertArdRouteGrouping(ArdRouteGrouping ardRouteGrouping) {
- ardRouteGrouping.setId(IdUtils.simpleUUID());
- ardRouteGrouping.setCreateTime(DateUtils.getNowDate());
- // 获取当前数据条数
- int count = ardRouteGroupingMapper.selectArdRouteGroupingList(null).size();
- ardRouteGrouping.setSerialNumber(count + 1);
- return ardRouteGroupingMapper.insertArdRouteGrouping(ardRouteGrouping);
- }
-
- /**
- * 修改分组
- *
- * @param ardRouteGrouping 分组
- * @return 结果
- */
- @Override
- public int updateArdRouteGrouping(ArdRouteGrouping ardRouteGrouping) {
- // 不能修改默认分组
- if ("0".equals(ardRouteGrouping.getId())) {
- throw new RuntimeException("不能修改默认分组");
- }
- ardRouteGrouping.setUpdateTime(DateUtils.getNowDate());
- return ardRouteGroupingMapper.updateArdRouteGrouping(ardRouteGrouping);
- }
-
- /**
- * 批量删除分组
- *
- * @param ids 需要删除的分组主键
- * @return 结果
- */
- @Override
- @Transactional(rollbackFor = Exception.class)
- public Map<String, Integer> deleteArdRouteGroupingByIds(String[] ids) {
- // 检查是否包含默认分组，不能删除默认分组
- for (String id : ids) {
- if ("0".equals(id)) {
- throw new RuntimeException("不能删除默认分组");
- }
- }
-
- Map<String, Integer> result = new HashMap<>();
- try {
- // 先删除航线信息
- int informationCount = ardRouteInfoMapper.deleteRouteInforByGroupingIds(ids);
- result.put("informationCount", informationCount);
-
- // 再删除分组
- int groupingCount = ardRouteGroupingMapper.deleteArdRouteGroupingByIds(ids);
- result.put("groupingCount", groupingCount);
-
- return result;
- } catch (Exception e) {
- throw e; // 抛出异常让事务回滚
- }
- }
-
- /**
- * 删除分组信息
- *
- * @param id 分组主键
- * @return 结果
- */
- @Override
- public int deleteArdRouteGroupingById(String id) {
- return ardRouteGroupingMapper.deleteArdRouteGroupingById(id);
- }
-
-}
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 0cc3de2..012a363 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
@@ -86,8 +86,8 @@
public String insertArdRouteInfo(ArdRouteInfo ardRouteInfo) {
ardRouteInfo.setId(IdUtils.simpleUUID());
ardRouteInfo.setCreateTime(DateUtils.getNowDate());
- if (ardRouteInfo.getGroupingId() == null){
- ardRouteInfo.setGroupingId("0");
+ if (ardRouteInfo.getGroupId() == null){
+ ardRouteInfo.setGroupId("0");
}
// 航线数据
byte[] routeData;
@@ -98,9 +98,9 @@
}
ardRouteInfo.setRouteData(routeData);
KmzResultVo kmzResult = routeService.buildKmz(ardRouteInfo.getUavRouteReq(), ardRouteInfo.getName());
- ardRouteInfo.setUpPath(kmzResult.getUpPath());
+ ardRouteInfo.setPath(kmzResult.getPath());
ardRouteInfoMapper.insertArdRouteInfo(ardRouteInfo);
- return kmzResult.getUpPath();
+ return kmzResult.getPath();
}
/**
@@ -123,7 +123,7 @@
if ("更新航线kmz文件失败".equals(kmzResult.getData())) {
return 0;
}
- ardRouteInfo.setUpPath(kmzResult.getUpPath());
+ ardRouteInfo.setPath(kmzResult.getPath());
return ardRouteInfoMapper.updateArdRouteInfo(ardRouteInfo);
}
@@ -138,7 +138,7 @@
// 删除航线(kmz)文件
for (String id : ids) {
ArdRouteInfo information = ardRouteInfoMapper.selectArdRouteInfoById(id);
- ossService.deleteObject("kmz", subStringMinioUrlName(information.getUpPath()));
+ ossService.deleteObject("kmz", subStringMinioUrlName(information.getPath()));
}
return ardRouteInfoMapper.deleteArdRouteInfoByIds(ids);
}
@@ -166,8 +166,8 @@
String url = ossService.upload("kmz",file);
ArdRouteInfo information = new ArdRouteInfo();
information.setName(file.getOriginalFilename());
- information.setUpPath(url);
- information.setGroupingId("0"); // 默认分组
+ information.setPath(url);
+ information.setGroupId("0"); // 默认分组
insertRouteInfomation(information);
return MinioUploadResult.builder()
.url(url)
@@ -194,12 +194,12 @@
* 修改航线分组ID
*
* @param id ID
- * @param groupingId 分组ID
+ * @param GroupId 分组ID
* @return 结果
*/
@Override
- public int updateRouteInfomationGroupingId(String id, String groupingId) {
- return ardRouteInfoMapper.updateRouteInforGroupingId(id, groupingId);
+ public int updateRouteInfomationGroupId(String id, String GroupId) {
+ return ardRouteInfoMapper.updateRouteInforGroupId(id, GroupId);
}
/**
diff --git a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
index 9cbc064..4981863 100644
--- a/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
+++ b/ard-route/src/main/java/com/ard/route/service/impl/UavRouteServiceImpl.java
@@ -67,7 +67,7 @@
}
// 获取文件
- String minioUrlName = subStringMinioUrlName(routeInformation.getUpPath());
+ String minioUrlName = subStringMinioUrlName(routeInformation.getPath());
try (InputStream inputStream = ossService.getObject(kmzPath,minioUrlName);
ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
ArchiveEntry entry;
@@ -194,7 +194,7 @@
} catch (Exception e) {
throw new RuntimeException(e);
}
- result.setUpPath(localFilePath + fileName + ".kmz");
+ result.setPath(localFilePath + fileName + ".kmz");
return result;
}else {
try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
@@ -221,7 +221,7 @@
new ByteArrayInputStream(baos.toByteArray())
);
String kmzFilePath = ossService.upload(kmzPath,multipartFile);
- result.setUpPath(kmzFilePath);
+ result.setPath(kmzFilePath);
return result;
} catch (Exception e) {
throw new RuntimeException("KMZ文件生成或上传失败", e);
@@ -264,7 +264,7 @@
}
// 获取文件
- String minioUrl = subStringMinioUrlName(routeInformation.getUpPath());
+ String minioUrl = subStringMinioUrlName(routeInformation.getPath());
try (InputStream inputStream = ossService.getObject(kmzPath,minioUrl);
ArchiveInputStream archiveInputStream = new ZipArchiveInputStream(inputStream)){
ArchiveEntry entry;
diff --git a/ard-route/src/main/resources/mapper/ArdRouteGroupingMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteGroupMapper.xml
similarity index 81%
rename from ard-route/src/main/resources/mapper/ArdRouteGroupingMapper.xml
rename to ard-route/src/main/resources/mapper/ArdRouteGroupMapper.xml
index a8b7943..8c05b63 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteGroupingMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteGroupMapper.xml
@@ -2,9 +2,9 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ard.route.mapper.ArdRouteGroupingMapper">
+<mapper namespace="com.ard.route.mapper.ArdRouteGroupMapper">
- <resultMap type="ArdRouteGrouping" id="ArdRouteGroupingResult">
+ <resultMap type="ArdRouteGroup" id="ArdRouteGroupResult">
<result property="id" column="id" />
<result property="groupingName" column="grouping_name" />
<result property="serialNumber" column="serial_number" />
@@ -14,7 +14,7 @@
<result property="updateTime" column="update_time" />
</resultMap>
- <sql id="selectArdRouteGroupingVo">
+ <sql id="selectArdRouteGroupVo">
select id,
grouping_name,
serial_number,
@@ -25,8 +25,8 @@
from ard_route_grouping
</sql>
- <select id="selectArdRouteGroupingList" parameterType="ArdRouteGrouping" resultMap="ArdRouteGroupingResult">
- <include refid="selectArdRouteGroupingVo"/>
+ <select id="selectArdRouteGroupList" parameterType="ArdRouteGroup" resultMap="ArdRouteGroupResult">
+ <include refid="selectArdRouteGroupVo"/>
<where>
<if test="groupingName != null and groupingName != ''"> and grouping_name like concat('%', #{groupingName}, '%')</if>
<if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if>
@@ -37,12 +37,12 @@
order by serial_number asc
</select>
- <select id="selectArdRouteGroupingById" parameterType="String" resultMap="ArdRouteGroupingResult">
- <include refid="selectArdRouteGroupingVo"/>
+ <select id="selectArdRouteGroupById" parameterType="String" resultMap="ArdRouteGroupResult">
+ <include refid="selectArdRouteGroupVo"/>
where id = #{id}
</select>
- <insert id="insertArdRouteGrouping" parameterType="ArdRouteGrouping">
+ <insert id="insertArdRouteGroup" parameterType="ArdRouteGroup">
insert into ard_route_grouping
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
@@ -64,7 +64,7 @@
</trim>
</insert>
- <update id="updateArdRouteGrouping" parameterType="ArdRouteGrouping">
+ <update id="updateArdRouteGroup" parameterType="ArdRouteGroup">
update ard_route_grouping
<trim prefix="SET" suffixOverrides=",">
<if test="groupingName != null">grouping_name = #{groupingName},</if>
@@ -77,11 +77,11 @@
where id = #{id}
</update>
- <delete id="deleteArdRouteGroupingById" parameterType="String">
+ <delete id="deleteArdRouteGroupById" parameterType="String">
delete from ard_route_grouping where id = #{id}
</delete>
- <delete id="deleteArdRouteGroupingByIds" parameterType="String">
+ <delete id="deleteArdRouteGroupByIds" parameterType="String">
delete from ard_route_grouping where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index c5ed37c..bf931bc 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -8,7 +8,7 @@
<result property="id" column="id" />
<result property="name" column="name" />
<result property="upPath" column="up_path" />
- <result property="groupingId" column="grouping_id" />
+ <result property="GroupId" column="grouping_id" />
<result property="type" column="type" />
<result property="aircraft" column="aircraft" />
<result property="payload" column="payload" />
@@ -59,7 +59,7 @@
<if test="id != null">id,</if>
<if test="name != null">name,</if>
<if test="upPath != null">up_path,</if>
- <if test="groupingId != null">grouping_id,</if>
+ <if test="GroupId != null">grouping_id,</if>
<if test="type != null">type,</if>
<if test="aircraft != null">aircraft,</if>
<if test="payload != null">payload,</if>
@@ -74,7 +74,7 @@
<if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
<if test="upPath != null">#{upPath},</if>
- <if test="groupingId != null">#{groupingId},</if>
+ <if test="GroupId != null">#{GroupId},</if>
<if test="type != null">#{type},</if>
<if test="aircraft != null">#{aircraft},</if>
<if test="payload != null">#{payload},</if>
@@ -121,24 +121,24 @@
where file_name = #{fileName}
</select>
- <delete id="deleteRouteInforByGroupingIds" parameterType="String">
+ <delete id="deleteRouteInforByGroupIds" parameterType="String">
delete from ard_route_info where grouping_id in
<foreach item="groupingIId" collection="array" open="(" separator="," close=")">
#{groupingIId}
</foreach>
</delete>
- <select id="selectArdRouteInfoByGroupingId" parameterType="String" resultMap="ArdRouteInfoResult">
+ <select id="selectArdRouteInfoByGroupId" parameterType="String" resultMap="ArdRouteInfoResult">
select id,name,up_path,grouping_id,type,aircraft,payload,is_import,create_by,create_time,update_by,update_time from ard_route_info
<where>
- <if test="groupingId != null "> and grouping_id = #{groupingId}</if>
+ <if test="GroupId != null "> and grouping_id = #{GroupId}</if>
</where>
</select>
- <update id="updateRouteInforGroupingId">
+ <update id="updateRouteInforGroupId">
update ard_route_info
<trim prefix="SET" suffixOverrides=",">
- <if test="groupingId != null">grouping_id = #{groupingId},</if>
+ <if test="GroupId != null">grouping_id = #{GroupId},</if>
</trim>
where id = #{id}
</update>
diff --git a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
index af5185c..3a32dd1 100644
--- a/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
+++ b/ard-sample/src/main/java/com/ard/sample/wayline/service/impl/WaylineJobServiceImpl.java
@@ -199,12 +199,12 @@
// get file url
// URL url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
URL url= null;
- String minioUrl = subStringMinioUrlName(ardRouteOpt.getUpPath());
+ String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
String md5 = "";
try (InputStream inputStream = _ossService.getObject(kmzPath,minioUrl))
{
md5 = DigestUtils.md5Hex(inputStream);
- url = new URL(ardRouteOpt.getUpPath());
+ url = new URL(ardRouteOpt.getPath());
}
catch (Exception e) {
return ResponseResult.error("机场任务航线文件地址错误！" + e.getMessage());
@@ -517,12 +517,12 @@
// get file url
URL url = null;
- String minioUrl = subStringMinioUrlName(ardRouteOpt.getUpPath());
+ String minioUrl = subStringMinioUrlName(ardRouteOpt.getPath());
String md5 = "";
try (InputStream inputStream = _ossService.getObject(kmzPath,minioUrl))
{
md5 = DigestUtils.md5Hex(inputStream);
- url = new URL(ardRouteOpt.getUpPath());
+ url = new URL(ardRouteOpt.getPath());
// }
// try {
// url = waylineFileService.getObjectUrl(waylineFile.get().getWaylineId());
--
Gitblit v1.9.3