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/globalAlarm/controller/GlobalAlarmController.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
index 11af8c0..a82868c 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java
@@ -8,9 +8,15 @@
import com.ruoyi.common.annotation.Anonymous;
import com.ruoyi.common.core.domain.AjaxResult;
import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.propertyeditors.CustomDateEditor;
+import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.List;
import java.util.Map;
@@ -32,7 +38,7 @@
IGlobalAlarmService globalAlarmService;
@PostMapping("/List")
- @ApiOperation(value = "鎶ヨ鏌ヨ鎺ュ彛",notes = "杩欓噷鍖呭惈浜嗘墍鏈夋姤璀︾被鍨嬬殑鏁版嵁")
+ @ApiOperation(value = "瀹炴椂鎶ヨ鑱氬悎鎺ュ彛",notes = "鎸夋姤璀﹀埛鏂版椂闂磋仛鍚堟煡璇�")
@ApiOperationSupport(includeParameters = {"command"},order = 1)
public AjaxResult selectAlarmLog(@RequestBody GlobalAlarmCondition condition) {
List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
@@ -52,4 +58,16 @@
Map<String, Integer> stringIntegerMap = globalAlarmService.selectAlarmLogsCount();
return AjaxResult.success(stringIntegerMap);
}
+ @GetMapping("/List")
+ @ApiOperation(value = "鍘嗗彶鎶ヨ鎶ヨ鑱氬悎鎺ュ彛",notes = "閫氳繃command鍜屾椂闂存煡璇㈠巻鍙叉暟鎹�")
+ @ApiOperationSupport(includeParameters = {"command","beginTime","endTime"},order = 4)
+ @ApiImplicitParams({
+ @ApiImplicitParam(name="command",value="鎶ヨ鏍囪瘑",dataType="integer",paramType="query",example="1001",required=true),
+ @ApiImplicitParam(name="beginTime",value="寮�濮嬫椂闂�",dataType="string",paramType="query",example="2023-06-15 00:00:00",required=true),
+ @ApiImplicitParam(name="endTime",value="缁撴潫鏃堕棿",dataType="string",paramType="query",example="2023-06-15 14:18:23",required=true),
+ })
+ public AjaxResult selectAlarmList(Integer command, String beginTime,String endTime) {
+ Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime);
+ return AjaxResult.success(alarmList);
+ }
}
--
Gitblit v1.9.3