From 2e05d59e2820b879ead4efd30be2b8cda399e485 Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期五, 11 八月 2023 11:31:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/app/patrolplan/controller/ArdAppPatrolplanController.java | 26 ++++++++++++++++++++++++++
1 files changed, 26 insertions(+), 0 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 18d3b7e..5dd4f92 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;
@@ -70,6 +74,9 @@
@Resource
IArdAlarmpointsWellService wellService;
+
+ @Resource
+ IArdAppPatrolpointRecordService recordService;
/**
* 鏌ヨapp宸℃璁″垝鍒楄〃
@@ -197,5 +204,24 @@
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);
+ }
}
--
Gitblit v1.9.3