From 21e4a0b0f9bae6e4be7afde67a524e47c87dbad0 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 02 九月 2023 14:02:39 +0800
Subject: [PATCH] 优化

---
 ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java |   81 +++++++++++++++++++++++++++++++++++-----
 1 files changed, 71 insertions(+), 10 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 cb0da57..9f1d241 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
@@ -14,7 +14,7 @@
 import com.ruoyi.alarmpoints.well.service.IArdAlarmpointsWellService;
 import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpoint;
 import com.ruoyi.app.patrolplan.domain.ArdAppPatrolpointRecord;
-import com.ruoyi.app.patrolplan.domain.param.ArdAppPatrolpointRecordParam;
+import com.ruoyi.app.patrolplan.domain.param.*;
 import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
 import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
 import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
@@ -182,7 +182,7 @@
     }
 
     /**
-     * 绠＄悊绔�--鏌ヨ鍗曟潯鏁版嵁
+     *  绠＄悊绔�--鏌ヨ鍗曟潯鏁版嵁
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:oneById')")
     @PostMapping("/oneById/{id}")
@@ -220,8 +220,8 @@
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
     @ApiOperation("绠＄悊绔�--宸℃鏃ュ巻")
     @PostMapping("recordMonth")
-    public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
-        return recordService.recordMonth(ardAppPatrolpointRecordParam);
+    public Results recordMonth(@RequestBody RecordMonthParam recordMonthParam) throws ParseException {
+        return recordService.recordMonth(recordMonthParam);
     }
 
     /**
@@ -230,18 +230,18 @@
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordDetails')")
     @ApiOperation("绠＄悊绔�--鐐瑰嚮鏃ュ巻鑾峰彇璇ヨ褰曚笅浜哄憳鎵撳崱璁板綍")
     @PostMapping("recordDetails")
-    public Results recordDetails(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
-        return recordService.recordDetails(ardAppPatrolpointRecordParam);
+    public Results recordDetails(@RequestBody RecordDetailsParam recordDetailsParam) throws ParseException {
+        return recordService.recordDetails(recordDetailsParam);
     }
 
     /**
-     * 绠＄悊绔�--鍗曚汉璇︽儏
+     * 鍗曚汉璇︽儏
      */
     @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
-    @ApiOperation("绠＄悊绔�--鍗曚汉璇︽儏")
+    @ApiOperation("鍗曚汉璇︽儏")
     @PostMapping("recordSolo")
-    public Results recordSolo(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
-        return recordService.recordSolo(ardAppPatrolpointRecordParam);
+    public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
+        return recordService.recordSolo(recordSoloParam);
     }
 
     /**
@@ -264,4 +264,65 @@
         List<ArdAppPatrolplan> list = ardAppPatrolplanService.executeList(ardAppPatrolplan);
         return Results.succeed(new PageInfo<>(list));
     }
+
+    /**
+     *  鍗曞叺绔�--鏌ヨ鍗曟潯鏁版嵁
+     */
+    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeOneById')")
+    @PostMapping("/executeOneById/{id}")
+    @ApiOperation("鍗曞叺绔�--鏌ヨ鍗曟潯鏁版嵁")
+    public Results executeOneById(@PathVariable String id)
+    {
+        return ardAppPatrolplanService.executeOneById(id);
+    }
+
+    /**
+     * 鍗曞叺绔�--宸℃鏃ュ巻
+     */
+    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeMonth')")
+    @ApiOperation("鍗曞叺绔�--宸℃鏃ュ巻")
+    @PostMapping("executeMonth")
+    public Results executeMonth(@RequestBody RecordMonthExParam recordMonthExParam) throws ParseException {
+        return recordService.executeMonth(recordMonthExParam);
+    }
+
+    /**
+     * 鍗曞叺绔�--鐐瑰嚮鏃ュ巻鑾峰彇璇ヨ褰曚笅浜哄憳鎵撳崱璁板綍
+     */
+    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeDetails')")
+    @ApiOperation("鍗曞叺绔�--鐐瑰嚮鏃ュ巻鑾峰彇璇ヤ汉鍛樹笅鎵�鏈夊湴鐐规墦鍗¤褰�")
+    @PostMapping("executeDetails")
+    public Results executeDetails(@RequestBody RecordDetailsExParam recordDetailsExParam) throws ParseException {
+        return recordService.executeDetails(recordDetailsExParam);
+    }
+
+    /**
+     * 鍗曞叺绔�--鍗曚汉璇︽儏
+     */
+    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeSolo')")
+//    @ApiOperation("鍗曞叺绔�--鍗曚汉璇︽儏")
+    @PostMapping("executeSolo")
+    public Results executeSolo(@RequestBody RecordSoloExParam recordSoloExParam) throws ParseException {
+        return recordService.executeSolo(recordSoloExParam);
+    }
+
+    /**
+     * 鍗曞叺绔�--鎵撳崱鍓�
+     */
+    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordBefore')")
+    @ApiOperation("鍗曞叺绔�--鎵撳崱鍓�")
+    @PostMapping("recordBefore")
+    public Results recordBefore(@RequestBody RecordBeforeParam recordBeforeParam) throws ParseException {
+        return recordService.recordBefore(recordBeforeParam);
+    }
+
+    /**
+     * 鍗曞叺绔�--寰幆
+     */
+    @PreAuthorize("@ss.hasPermi('app:appPatrolplan:son')")
+    @ApiOperation("鍗曞叺绔�--寰幆")
+    @GetMapping("son")
+    public Results son(){
+        return recordService.son();
+    }
 }

--
Gitblit v1.9.3