From e94cb6da040c03cbb33d96c0fb438c76bc20c6ac Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期一, 14 八月 2023 17:11:45 +0800
Subject: [PATCH] 优化拉流列表和协议

---
 ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java |   45 +++++++++++++++++++++++++++++++++------------
 1 files changed, 33 insertions(+), 12 deletions(-)

diff --git a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
index 9ad4413..cb0da57 100644
--- a/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
+++ b/ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java
@@ -79,11 +79,11 @@
     IArdAppPatrolpointRecordService recordService;
 
     /**
-     * 鏌ヨapp宸℃璁″垝鍒楄〃
+     * 绠＄悊绔�--鏌ヨapp宸℃璁″垝鍒楄〃
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')")
     @GetMapping("/list")
-    @ApiOperation("鏌ヨ鍏ㄩ儴宸℃鍒楄〃鍙婃悳绱㈢瓫閫�")
+    @ApiOperation("绠＄悊绔�--鏌ヨ鍏ㄩ儴宸℃鍒楄〃鍙婃悳绱㈢瓫閫�")
     public Results list(ArdAppPatrolplan ardAppPatrolplan)
     {
         String userId = SecurityUtils.getUserId();
@@ -100,12 +100,12 @@
     }
 
     /**
-     * 瀵煎嚭app宸℃璁″垝鍒楄〃
+     * 绠＄悊绔�--瀵煎嚭app宸℃璁″垝鍒楄〃
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:export')")
     @Log(title = "app宸℃璁″垝", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    @ApiOperation("瀵煎嚭鍏ㄩ儴宸℃鍒楄〃")
+    @ApiOperation("绠＄悊绔�--瀵煎嚭鍏ㄩ儴宸℃鍒楄〃")
     public void export(HttpServletResponse response, ArdAppPatrolplan ardAppPatrolplan)
     {
         List<ArdAppPatrolplan> list = ardAppPatrolplanService.selectArdAppPatrolplanList(ardAppPatrolplan);
@@ -136,12 +136,12 @@
     }
 
     /**
-     * 鍒犻櫎app宸℃璁″垝
+     * 绠＄悊绔�--鍒犻櫎app宸℃璁″垝
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:remove')")
     @Log(title = "app宸℃璁″垝", businessType = BusinessType.DELETE)
     @DeleteMapping("/{id}")
-    @ApiOperation("鍒犻櫎app宸℃璁″垝")
+    @ApiOperation("绠＄悊绔�--鍒犻櫎app宸℃璁″垝")
     //public Results remove(@PathVariable String id)
     public AjaxResult remove(@PathVariable String id)
     {
@@ -170,34 +170,34 @@
     }
 
     /**
-     * 鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�
+     * 绠＄悊绔�--鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:insertArdAppPatrolplan')")
     @Log(title = "app宸℃璁″垝", businessType = BusinessType.INSERT)
     @PostMapping("/insertArdAppPatrolplan")
-    @ApiOperation("鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�")
+    @ApiOperation("绠＄悊绔�--鏂板app宸℃璁″垝鍙婁汉鍛樼偣浣�")
     public AjaxResult addArdAppPatrolplan(@RequestBody Map<String,Object> para)
     {
         return toAjax(ardAppPatrolplanService.insertArdAppPatrolplan(para));
     }
 
     /**
-     * 鏌ヨ鍗曟潯鏁版嵁
+     * 绠＄悊绔�--鏌ヨ鍗曟潯鏁版嵁
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:oneById')")
     @PostMapping("/oneById/{id}")
-    @ApiOperation("鏌ヨ鍗曟潯鏁版嵁")
+    @ApiOperation("绠＄悊绔�--鏌ヨ鍗曟潯鏁版嵁")
     public Results oneById(@PathVariable String id)
     {
         return ardAppPatrolplanService.oneById(id);
     }
 
     /**
-     * 淇敼app宸℃璁″垝
+     * 绠＄悊绔�--淇敼app宸℃璁″垝
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:edit')")
     @Log(title = "app宸℃璁″垝", businessType = BusinessType.UPDATE)
-    @ApiOperation("淇敼鍗曟潯鏁版嵁")
+    @ApiOperation("绠＄悊绔�--淇敼鍗曟潯鏁版嵁")
     @PutMapping("upd")
     public Results edit(@RequestBody Map<String,Object> para)
     {
@@ -243,4 +243,25 @@
     public Results recordSolo(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
         return recordService.recordSolo(ardAppPatrolpointRecordParam);
     }
+
+    /**
+     * 鍗曞叺绔�--鏌ヨapp宸℃璁″垝鍒楄〃
+     */
+    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeList')")
+    @GetMapping("/executeList")
+    @ApiOperation("鍗曞叺绔�--鏌ヨ璇ョ敤鎴蜂笅鎵�鏈夋墽琛岃鍒掑強鎼滅储绛涢��")
+    public Results executeList(ArdAppPatrolplan ardAppPatrolplan)
+    {
+        String userId = SecurityUtils.getUserId();
+        ardAppPatrolplan.setUserId(userId);
+        if(ardAppPatrolplan.getPageNum()==null || ardAppPatrolplan.getPageNum() == 0){
+            ardAppPatrolplan.setPageNum(1);
+        }
+        if(ardAppPatrolplan.getPageSize()==null || ardAppPatrolplan.getPageSize() == 0){
+            ardAppPatrolplan.setPageSize(10);
+        }
+        PageHelper.startPage(ardAppPatrolplan.getPageNum(),ardAppPatrolplan.getPageSize());
+        List<ArdAppPatrolplan> list = ardAppPatrolplanService.executeList(ardAppPatrolplan);
+        return Results.succeed(new PageInfo<>(list));
+    }
 }

--
Gitblit v1.9.3