From 7965c2ae65b8ae7a283dc6b2a065959eafb6ba7e Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期一, 14 八月 2023 16:49:06 +0800
Subject: [PATCH] 单兵端巡检计划
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 97 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 83 insertions(+), 14 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 71ce6f2..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
@@ -1,5 +1,6 @@
package com.ruoyi.app.patrolplan.controller;
+import java.text.ParseException;
import java.util.List;
import java.util.Map;
import javax.annotation.Resource;
@@ -12,6 +13,9 @@
import com.ruoyi.alarmpoints.well.domain.ArdAlarmpointsWell;
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.service.IArdAppPatrolpointRecordService;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointService;
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -71,14 +75,19 @@
@Resource
IArdAlarmpointsWellService wellService;
+ @Resource
+ IArdAppPatrolpointRecordService recordService;
+
/**
- * 鏌ヨapp宸℃璁″垝鍒楄〃
+ * 绠＄悊绔�--鏌ヨapp宸℃璁″垝鍒楄〃
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:list')")
@GetMapping("/list")
- @ApiOperation("鏌ヨ鍏ㄩ儴宸℃鍒楄〃鍙婃悳绱㈢瓫閫�")
+ @ApiOperation("绠＄悊绔�--鏌ヨ鍏ㄩ儴宸℃鍒楄〃鍙婃悳绱㈢瓫閫�")
public Results list(ArdAppPatrolplan ardAppPatrolplan)
{
+ String userId = SecurityUtils.getUserId();
+ ardAppPatrolplan.setUserId(userId);
if(ardAppPatrolplan.getPageNum()==null || ardAppPatrolplan.getPageNum() == 0){
ardAppPatrolplan.setPageNum(1);
}
@@ -91,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);
@@ -127,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)
{
@@ -161,38 +170,98 @@
}
/**
- * 鏂板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)
- @PutMapping
- public AjaxResult edit(@RequestBody ArdAppPatrolplan ardAppPatrolplan)
+ @ApiOperation("绠＄悊绔�--淇敼鍗曟潯鏁版嵁")
+ @PutMapping("upd")
+ public Results edit(@RequestBody Map<String,Object> para)
{
- return toAjax(ardAppPatrolplanService.updateArdAppPatrolplan(ardAppPatrolplan));
+ return ardAppPatrolplanService.updateArdAppPatrolplan(para);
}
+ /**
+ * 宸℃鎵撳崱
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:record')")
+ @ApiOperation("宸℃鎵撳崱")
+ @PostMapping("record")
+ public Results edit(@RequestBody ArdAppPatrolpointRecord ardAppPatrolpointRecord) {
+ return recordService.record(ardAppPatrolpointRecord);
+ }
+ /**
+ * 绠＄悊绔�--宸℃鏃ュ巻
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordMonth')")
+ @ApiOperation("绠＄悊绔�--宸℃鏃ュ巻")
+ @PostMapping("recordMonth")
+ public Results recordMonth(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
+ return recordService.recordMonth(ardAppPatrolpointRecordParam);
+ }
+
+ /**
+ * 绠＄悊绔�--鐐瑰嚮鏃ュ巻鑾峰彇璇ヨ褰曚笅浜哄憳鎵撳崱璁板綍
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordDetails')")
+ @ApiOperation("绠＄悊绔�--鐐瑰嚮鏃ュ巻鑾峰彇璇ヨ褰曚笅浜哄憳鎵撳崱璁板綍")
+ @PostMapping("recordDetails")
+ public Results recordDetails(@RequestBody ArdAppPatrolpointRecordParam ardAppPatrolpointRecordParam) throws ParseException {
+ return recordService.recordDetails(ardAppPatrolpointRecordParam);
+ }
+
+ /**
+ * 绠＄悊绔�--鍗曚汉璇︽儏
+ */
+ @PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
+ @ApiOperation("绠＄悊绔�--鍗曚汉璇︽儏")
+ @PostMapping("recordSolo")
+ 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