From 0572c25ae338931cb4d07407f6d010bb6d145416 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Thu, 13 Nov 2025 10:25:31 +0800
Subject: [PATCH] 1.分组管理名称修改folder-》grouping。 2.去掉多余File业务。 3.航线(kmz)业务 ArdRouteInformation修改ArdRouteInfor。 4.航线业务字段优化修改。 5.返回类型实体修改。 6.工具类优化方法优化。
---
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupingController.java | 39 +++++++++++++++++++--------------------
1 files changed, 19 insertions(+), 20 deletions(-)
diff --git a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupingController.java
similarity index 62%
rename from ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
rename to ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupingController.java
index f696a17..59105ee 100644
--- a/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteFolderController.java
+++ b/ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupingController.java
@@ -10,10 +10,10 @@
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -22,8 +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.domain.route.ArdRouteFolder;
-import com.ard.route.service.IArdRouteFolderService;
+import com.ard.route.service.IArdRouteGroupingService;
/**
* 分组Controller
@@ -33,20 +32,20 @@
*/
@Api(tags = "分组管理")
@RestController
-@RequestMapping("/route/folder")
-public class ArdRouteFolderController extends BaseController {
+@RequestMapping("/route/grouping")
+public class ArdRouteGroupingController extends BaseController {
@Autowired
- private IArdRouteFolderService ardRouteFolderService;
+ private IArdRouteGroupingService ardRouteGroupingService;
/**
* 查询分组列表
*/
@ApiOperation("查询分组列表")
@GetMapping("/list")
- public TableDataInfo list(ArdRouteFolder ardRouteFolder) {
+ public TableDataInfo list(ArdRouteGrouping ardRouteGrouping) {
//startPage();
- List<ArdRouteFolder> list = ardRouteFolderService.selectArdRouteFolderList(ardRouteFolder);
+ List<ArdRouteGrouping> list = ardRouteGroupingService.selectArdRouteGroupingList(ardRouteGrouping);
return getDataTable(list);
}
@@ -56,9 +55,9 @@
@ApiOperation("导出分组列表")
@Log(title = "分组", businessType = BusinessType.EXPORT)
@PostMapping("/export")
- public void export(HttpServletResponse response, ArdRouteFolder ardRouteFolder) {
- List<ArdRouteFolder> list = ardRouteFolderService.selectArdRouteFolderList(ardRouteFolder);
- ExcelUtil<ArdRouteFolder> util = new ExcelUtil<ArdRouteFolder>(ArdRouteFolder.class);
+ public void export(HttpServletResponse response, ArdRouteGrouping ardRouteGrouping) {
+ List<ArdRouteGrouping> list = ardRouteGroupingService.selectArdRouteGroupingList(ardRouteGrouping);
+ ExcelUtil<ArdRouteGrouping> util = new ExcelUtil<ArdRouteGrouping>(ArdRouteGrouping.class);
util.exportExcel(response, list, "分组数据");
}
@@ -68,7 +67,7 @@
@ApiOperation("获取分组详细信息")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id) {
- return success(ardRouteFolderService.selectArdRouteFolderById(id));
+ return success(ardRouteGroupingService.selectArdRouteGroupingById(id));
}
/**
@@ -77,9 +76,9 @@
@ApiOperation("新增分组")
@Log(title = "分组", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@RequestBody ArdRouteFolder ardRouteFolder) {
- ardRouteFolder.setCreateBy(getUsername());
- return toAjax(ardRouteFolderService.insertArdRouteFolder(ardRouteFolder));
+ public AjaxResult add(@RequestBody ArdRouteGrouping ardRouteGrouping) {
+ ardRouteGrouping.setCreateBy(getUsername());
+ return toAjax(ardRouteGroupingService.insertArdRouteGrouping(ardRouteGrouping));
}
/**
@@ -88,9 +87,9 @@
@ApiOperation("修改分组")
@Log(title = "分组", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ArdRouteFolder ardRouteFolder) {
- ardRouteFolder.setUpdateBy(getUsername());
- return toAjax(ardRouteFolderService.updateArdRouteFolder(ardRouteFolder));
+ public AjaxResult edit(@RequestBody ArdRouteGrouping ardRouteGrouping) {
+ ardRouteGrouping.setUpdateBy(getUsername());
+ return toAjax(ardRouteGroupingService.updateArdRouteGrouping(ardRouteGrouping));
}
/**
@@ -101,9 +100,9 @@
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids) {
try {
- Map<String, Integer> result = ardRouteFolderService.deleteArdRouteFolderByIds(ids);
+ Map<String, Integer> result = ardRouteGroupingService.deleteArdRouteGroupingByIds(ids);
if (!result.isEmpty()) {
- return AjaxResult.success("删除成功.分组删除" + result.get("folder") + "文件删除" + result.get("file"));
+ return AjaxResult.success("删除成功：分组删除" + result.get("groupingCount") + "，航线删除" + result.get("informationCount"));
} else {
return AjaxResult.success("没有删除分组信息。");
}
--
Gitblit v1.9.3