From 0c8751da4d4bcf63289fc7cbd90aa5635ceb3984 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 24 六月 2023 11:45:01 +0800
Subject: [PATCH] 增加报警历史查询分页功能
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 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 be557cd..445ba49 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
@@ -6,7 +6,9 @@
import com.ruoyi.alarm.globalAlarm.domain.GlobalAlarmData;
import com.ruoyi.alarm.globalAlarm.service.IGlobalAlarmService;
import com.ruoyi.common.annotation.Anonymous;
+import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -20,6 +22,8 @@
import java.util.List;
import java.util.Map;
+import static com.ruoyi.common.utils.PageUtils.startPage;
+
/**
* @ClassName: globalAlarmController
* @Description:
@@ -32,7 +36,7 @@
@Api(tags = "鎶ヨ鏁版嵁姹囨�绘帴鍙�")
@ApiSupport(author = "鍒樿嫃涔�")
@Anonymous
-public class GlobalAlarmController {
+public class GlobalAlarmController extends BaseController {
@Resource
IGlobalAlarmService globalAlarmService;
@@ -60,14 +64,16 @@
}
@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),
+ @ApiImplicitParam(name="pageNum",value="椤电爜",dataType="integer",paramType="query",example="1",required=true),
+ @ApiImplicitParam(name="pageSize",value="椤垫暟閲�",dataType="integer",paramType="query",example="10",required=true)
})
- public AjaxResult selectAlarmList(Integer command, String beginTime,String endTime) {
- Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime);
- return AjaxResult.success(alarmList);
+ public TableDataInfo selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
+ startPage();
+ Object alarmList = globalAlarmService.selectAlarmList(command,beginTime,endTime, pageNum, pageSize);
+ return getDataTable((List)alarmList);
}
}
--
Gitblit v1.9.3