From 700e079156d633305b5e03c3a4e54b78a49add51 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期四, 21 九月 2023 09:29:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 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 27534a9..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
@@ -235,10 +235,10 @@
}
/**
- * 绠＄悊绔�--鍗曚汉璇︽儏
+ * 鍗曚汉璇︽儏
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
- @ApiOperation("绠＄悊绔�--鍗曚汉璇︽儏")
+ @ApiOperation("鍗曚汉璇︽儏")
@PostMapping("recordSolo")
public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
return recordService.recordSolo(recordSoloParam);
@@ -300,10 +300,29 @@
* 鍗曞叺绔�--鍗曚汉璇︽儏
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeSolo')")
- @ApiOperation("鍗曞叺绔�--鍗曚汉璇︽儏")
+// @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