From 3cd13607fe569164f6ab5284558ab8e258852940 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Sat, 15 Nov 2025 15:38:19 +0800
Subject: [PATCH] 2025-11-15 zwy 航线任务模块更改; 1、航线文件从夏吉建航线表中取; 2、修改增加循环任务功能; 3、增加字段及字段注释,对应JSON字段; 4、航线任务列表,增加筛选功能;根据不同条件查询结果。
---
ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteGroupController.java | 15 +++++++++++++--
1 files changed, 13 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 8b93493..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;
@@ -32,7 +33,7 @@
*/
@Api(tags = "分组管理")
@RestController
-@RequestMapping("/route/grouping")
+@RequestMapping("/route/group")
public class ArdRouteGroupController extends BaseController {
@Autowired
@@ -102,7 +103,7 @@
try {
Map<String, Integer> result = ardRouteGroupService.deleteArdRouteGroupByIds(ids);
if (!result.isEmpty()) {
- return AjaxResult.success("删除成功:分组删除" + result.get("groupingCount") + ",航线删除" + result.get("informationCount"));
+ return AjaxResult.success("删除成功:分组删除" + result.get("groupCount") + ",航线删除" + result.get("infoCount"));
} else {
return AjaxResult.success("没有删除分组信息。");
}
@@ -111,4 +112,14 @@
}
}
+ /**
+ * 分组列表
+ */
+ @ApiOperation("分组列表")
+ @GetMapping("/groupList")
+ public TableDataInfo groupList(ArdRouteGroup ardRouteGroup) {
+ List<ArdRouteGroupVo> list = ardRouteGroupService.selectGroupList(ardRouteGroup);
+ return getDataTable(list);
+ }
+
}
--
Gitblit v1.9.3