From 77337135d875cf3ee046e7ca2e3992924d3b6e79 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期二, 22 八月 2023 09:40:52 +0800
Subject: [PATCH] 一键调度增加按多边形获取人车相机

---
 ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java |   18 +++++++-----------
 1 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
index 2208a01..b3a69c0 100644
--- a/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/task/controller/ArdAppTaskController.java
@@ -43,8 +43,7 @@
 public class ArdAppTaskController extends BaseController {
     @Autowired
     private IArdAppTaskService ardAppTaskService;
-    @Autowired
-    private ISysUserService sysUserService;
+
 
     /**
      * 鏌ヨapp浠诲姟绠$悊鍒楄〃
@@ -61,14 +60,10 @@
     @ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔″垪琛�")
     @PreAuthorize("@ss.hasPermi('app:task:list')")
     @GetMapping("/listWithDetail")
-    public AjaxResult userlist(ArdAppTask ardAppTask) {
-        Integer pageNum = ardAppTask.getPageNum();
-        Integer pageSize = ardAppTask.getPageSize();
-        List<ArdAppTask> ardAppTasks = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
-        /*鍒嗛〉鏂瑰紡1*/
-        JpaPageHelper.startPage(pageNum,pageSize);
-        JpaPageInfo pageInfo = new JpaPageInfo(ardAppTasks);
-        return AjaxResult.success(pageInfo);
+    public TableDataInfo userlist(ArdAppTask ardAppTask) {
+        startPage();
+        List<ArdAppTask> list = ardAppTaskService.selectArdAppTaskListWithDetail(ardAppTask);
+        return getDataTable(list);
     }
 
     @ApiOperation("鍗曞叺绔� - 涓嬪彂缁欐垜鐨勪换鍔¤鎯�")
@@ -94,9 +89,10 @@
     /**
      * 鑾峰彇app浠诲姟绠$悊璇︾粏淇℃伅
      */
+    @ApiOperation("鎸囨尌绔�-鑾峰彇app浠诲姟绠$悊璇︾粏淇℃伅")
     @PreAuthorize("@ss.hasPermi('app:task:query')")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfoWithPic(@PathVariable("id") String id) {
+    public AjaxResult getInfo(@PathVariable("id") String id) {
         return success(ardAppTaskService.selectArdAppTaskById(id));
     }
 

--
Gitblit v1.9.3