From 98505f497a12382b259f643232f2c6c63f5004f8 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 24 六月 2023 10:40:23 +0800
Subject: [PATCH] 增加历史报警数据按command和时间区间查询
---
ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java b/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
index dec9207..07dc745 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
@@ -1,12 +1,17 @@
package com.ruoyi.alarm.config.controller;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.xiaoymin.knife4j.annotations.DynamicParameter;
+import com.github.xiaoymin.knife4j.annotations.DynamicParameters;
import com.ruoyi.alarm.config.domain.ArdAlarmTypeConfig;
import com.ruoyi.alarm.config.service.IArdAlarmTypeConfigService;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
@@ -42,7 +47,7 @@
/**
* 鏌ヨ鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:list')")
+ //@PreAuthorize("@ss.hasPermi('alarm:alarmConfig:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈鍒楄〃")
public TableDataInfo list(ArdAlarmTypeConfig ardAlarmTypeConfig)
@@ -77,14 +82,12 @@
/**
* 鎵归噺鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:add')")
@Log(title = "鎵归噺閰嶇疆鎶ヨ绫诲瀷", businessType = BusinessType.INSERT)
@PostMapping("/batchConfig")
@ApiOperation("鎵归噺閰嶇疆鎶ヨ绫诲瀷")
- public AjaxResult addBatch(@RequestBody List<Integer> commands)
+ public AjaxResult addBatch(@RequestBody Map<String,Object> map)
{
- ardAlarmTypeConfigService.deleteArdAlarmTypeConfigByCurrentUserId();
- return AjaxResult.success(ardAlarmTypeConfigService.insertArdAlarmTypeConfig(commands));
+ return AjaxResult.success(ardAlarmTypeConfigService.insertArdAlarmTypeConfig(map));
}
/**
--
Gitblit v1.9.3