From cda7fa013ec9f9b420a0f70975131731fd0063fb Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 05 十月 2023 17:21:07 +0800
Subject: [PATCH] 增加恢复报警过滤接口
---
ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java | 15 ++++++++++++++-
ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java | 2 +-
2 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java b/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
index 4410492..d053fc8 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java
@@ -1,8 +1,10 @@
package com.ruoyi.alarm.filter.controller;
+import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.utils.DateUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -97,7 +99,18 @@
{
return toAjax(ardAlarmFilterService.updateArdAlarmFilter(ardAlarmFilter));
}
-
+ /**
+ * 鎭㈠鎶ヨ杩囨护
+ */
+ @ApiOperation("鎭㈠鎶ヨ杩囨护")
+ @PreAuthorize("@ss.hasPermi('alarm:filter:edit')")
+ @Log(title = "鎭㈠鎶ヨ杩囨护", businessType = BusinessType.UPDATE)
+ @PutMapping
+ public AjaxResult recovery(@RequestBody ArdAlarmFilter ardAlarmFilter)
+ {
+ ardAlarmFilter.setEndTime(DateUtils.covertTime(new Date()));
+ return toAjax(ardAlarmFilterService.updateArdAlarmFilter(ardAlarmFilter));
+ }
/**
* 鍒犻櫎鎶ヨ杩囨护
*/
diff --git a/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java b/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
index b5cba4a..dc7f2be 100644
--- a/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
+++ b/ard-work/src/main/java/com/ruoyi/scheduling/controller/SchedulingController.java
@@ -20,7 +20,7 @@
import java.util.Map;
/**
- * @Description:
+ * @Description: 涓�閿皟搴�
* @ClassName: SchedulingController
* @Author: 鍒樿嫃涔�
* @Date: 2023骞�08鏈�17鏃�11:05:59
--
Gitblit v1.9.3