From c8aaafaaf4b6ff674149db115a97e40ead5927bf Mon Sep 17 00:00:00 2001
From: zhangnaisong <2434969829@qq.com>
Date: 星期一, 08 七月 2024 16:57:00 +0800
Subject: [PATCH] 车辆挂接电磁锁bug修改提交
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 37 ++++++++++++++++++++++++++-----------
1 files changed, 26 insertions(+), 11 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 1bf372a..4d8fa15 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
@@ -7,12 +7,10 @@
import javax.servlet.http.HttpServletResponse;
import com.alibaba.fastjson2.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
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.*;
import com.ruoyi.app.patrolplan.service.IArdAppPatrolpointRecordService;
@@ -20,13 +18,11 @@
import com.ruoyi.app.patrolplan.service.IArdAppPatroluserService;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.system.service.ISysUserService;
import com.ruoyi.utils.result.Results;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.ir.annotations.Reference;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
@@ -235,10 +231,10 @@
}
/**
- * 绠＄悊绔�--鍗曚汉璇︽儏
+ * 鍗曚汉璇︽儏
*/
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:recordSolo')")
- @ApiOperation("绠＄悊绔�--鍗曚汉璇︽儏")
+ @ApiOperation("鍗曚汉璇︽儏")
@PostMapping("recordSolo")
public Results recordSolo(@RequestBody RecordSoloParam recordSoloParam) throws ParseException {
return recordService.recordSolo(recordSoloParam);
@@ -282,8 +278,8 @@
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeMonth')")
@ApiOperation("鍗曞叺绔�--宸℃鏃ュ巻")
@PostMapping("executeMonth")
- public Results executeMonth(@RequestBody RecordMonthParam recordMonthParam) throws ParseException {
- return recordService.executeMonth(recordMonthParam);
+ public Results executeMonth(@RequestBody RecordMonthExParam recordMonthExParam) throws ParseException {
+ return recordService.executeMonth(recordMonthExParam);
}
/**
@@ -292,18 +288,37 @@
@PreAuthorize("@ss.hasPermi('app:appPatrolplan:executeDetails')")
@ApiOperation("鍗曞叺绔�--鐐瑰嚮鏃ュ巻鑾峰彇璇ヤ汉鍛樹笅鎵�鏈夊湴鐐规墦鍗¤褰�")
@PostMapping("executeDetails")
- public Results executeDetails(@RequestBody RecordDetailsParam recordDetailsParam) throws ParseException {
- return recordService.executeDetails(recordDetailsParam);
+ public Results executeDetails(@RequestBody RecordDetailsExParam recordDetailsExParam) throws ParseException {
+ return recordService.executeDetails(recordDetailsExParam);
}
/**
* 鍗曞叺绔�--鍗曚汉璇︽儏
*/
@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