From 1ccdcb4a890687d59b272f5397e8b41ae4ce2254 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期二, 07 十一月 2023 16:23:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/filter/controller/ArdAlarmFilterController.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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..2208a0e 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,17 @@
{
return toAjax(ardAlarmFilterService.updateArdAlarmFilter(ardAlarmFilter));
}
-
+ /**
+ * 鎭㈠鎶ヨ杩囨护
+ */
+ @ApiOperation("鎭㈠鎶ヨ杩囨护")
+ @PreAuthorize("@ss.hasPermi('alarm:filter:edit')")
+ @Log(title = "鎭㈠鎶ヨ杩囨护", businessType = BusinessType.UPDATE)
+ @PutMapping("/recovery/{ids}")
+ public AjaxResult recovery(@PathVariable String[] ids)
+ {
+ return toAjax(ardAlarmFilterService.RecoveryArdAlarmFilter(ids));
+ }
/**
* 鍒犻櫎鎶ヨ杩囨护
*/
--
Gitblit v1.9.3