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 | 131 +++++++++++++++++++++++++++++++++++++------
1 files changed, 111 insertions(+), 20 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 0c428c8..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;
@@ -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)
{
@@ -215,23 +215,114 @@
}
/**
- * 宸℃鏃ュ巻
+ * 绠＄悊绔�--宸℃鏃ュ巻
*/
@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);
}
/**
- * 宸℃鏃ュ巻
+ * 绠＄悊绔�--鐐瑰嚮鏃ュ巻鑾峰彇璇ヨ褰曚笅浜哄憳鎵撳崱璁板綍
*/
- @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
+ @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("鍗曚汉璇︽儏")
+ @PostMapping("recordSolo")
+ public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
+ return recordService.recordSolo(recordSoloParam);
+ }
+
+ /**
+ * 鍗曞叺绔�--鏌ヨ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));
+ }
+
+ /**
+ * 鍗曞叺绔�--鏌ヨ鍗曟潯鏁版嵁
+ */
+ @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