From 46a35f95b4caddb52ec886ce0ee7d9f81fbf8bb6 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 13 九月 2023 12:55:18 +0800
Subject: [PATCH] 修改电子围栏历史报警按alarm_time逆序返回数据
---
ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java
index 71e23c3..0b7e7a6 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/global/controller/GlobalAlarmController.java
@@ -45,6 +45,13 @@
List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogs(condition);
return AjaxResult.success(result);
}
+ @GetMapping("/AllList")
+ @ApiOperation(value = "瀹炴椂鎶ヨ鑱氬悎鎺ュ彛(all)",notes = "鎸夋姤璀﹀埛鏂版椂闂磋仛鍚堟煡璇�")
+ @ApiOperationSupport(includeParameters = {"command"},order = 1)
+ public AjaxResult selectAlarmLogAll() {
+ List<GlobalAlarmData> result = globalAlarmService.selectAlarmLogsAll();
+ return AjaxResult.success(result);
+ }
@PostMapping("/view")
@ApiOperation(value = "鏌ョ湅鎶ヨ鎺ュ彛",notes = "鎸囧畾鏌ョ湅鏌愪釜鎶ヨ鏁版嵁")
@ApiOperationSupport(includeParameters = {"command","id"},order = 3)
@@ -62,11 +69,11 @@
@GetMapping("/List")
@ApiOperation(value = "鍘嗗彶鎶ヨ鑱氬悎鎺ュ彛",notes = "閫氳繃command鍜屾椂闂存煡璇㈠巻鍙叉暟鎹�")
@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),
- @ApiImplicitParam(name="pageNum",value="椤电爜",dataType="integer",paramType="query",example="1",required=true),
- @ApiImplicitParam(name="pageSize",value="椤垫暟閲�",dataType="integer",paramType="query",example="10",required=true)
+ @ApiImplicitParam(name="command",value="鎶ヨ鏍囪瘑",dataType="integer",paramType="query",example="1001",required=true,dataTypeClass = Integer.class),
+ @ApiImplicitParam(name="beginTime",value="寮�濮嬫椂闂�",dataType="string",paramType="query",example="2023-06-15 00:00:00",required=true,dataTypeClass = String.class),
+ @ApiImplicitParam(name="endTime",value="缁撴潫鏃堕棿",dataType="string",paramType="query",example="2023-06-15 14:18:23",required=true,dataTypeClass = String.class),
+ @ApiImplicitParam(name="pageNum",value="椤电爜",dataType="integer",paramType="query",example="1",required=true,dataTypeClass = Integer.class),
+ @ApiImplicitParam(name="pageSize",value="椤垫暟閲�",dataType="integer",paramType="query",example="10",required=true,dataTypeClass = Integer.class)
})
public TableDataInfo selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
startPage();
--
Gitblit v1.9.3