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/service/impl/GlobalAlarmServiceImpl.java | 8 +++++++-
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java | 2 +-
ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java | 3 ---
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml | 1 +
ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java | 3 ++-
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/controller/GlobalAlarmController.java | 16 +++++++++++-----
ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml | 1 +
ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml | 1 +
8 files changed, 24 insertions(+), 11 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);
}
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
index a9aaef8..edc5628 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/IGlobalAlarmService.java
@@ -19,5 +19,5 @@
Object updateAlarmViewTime(GlobalAlarmCondition condition);
public void receiveAlarm(String topic,String message);
public Map<String,Integer> selectAlarmLogsCount();
- Object selectAlarmList(Integer command, String beginTime, String endTime);
+ Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize);
}
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index 6c3b90b..0327572 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -369,7 +369,7 @@
}
@Override
- public Object selectAlarmList(Integer command, String beginTime, String endTime) {
+ public Object selectAlarmList(Integer command, String beginTime, String endTime,Integer pageNum,Integer pageSize) {
Map<String, Object> params = new HashMap<>();
params.put("beginTime", beginTime);
params.put("endTime", endTime);
@@ -377,16 +377,22 @@
case 1001:
ArdAlarmStealelec aas = new ArdAlarmStealelec();
aas.setParams(params);
+ aas.setPageNum(pageNum);
+ aas.setPageSize(pageSize);
List<ArdAlarmStealelec> ardAlarmStealelecs = ardAlarmStealelecMapper.selectArdAlarmStealelecList(aas);
return ardAlarmStealelecs;
case 1002:
ArdAlarmCamera aac = new ArdAlarmCamera();
aac.setParams(params);
+ aac.setPageNum(pageNum);
+ aac.setPageSize(pageSize);
List<ArdAlarmCamera> ardAlarmCameras = ardAlarmCameraMapper.selectArdAlarmCameraList(aac);
return ardAlarmCameras;
case 1014:
ArdAlarmTube aat = new ArdAlarmTube();
aat.setParams(params);
+ aat.setPageNum(pageNum);
+ aat.setPageSize(pageSize);
List<ArdAlarmTube> ardAlarmTubes = ardAlarmTubeMapper.selectArdAlarmTubeList(aat);
return ardAlarmTubes;
}
diff --git a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
index 1d423f6..4cebdd7 100644
--- a/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/camera/controller/ArdCamerasController.java
@@ -8,9 +8,7 @@
import com.ruoyi.device.camera.domain.CameraCmd;
import com.ruoyi.device.camera.service.IArdCamerasService;
import com.ruoyi.device.hiksdk.service.impl.HikClientServiceImpl;
-import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.system.service.ISysDeptService;
import com.ruoyi.inspect.service.IArdVideoInspectTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -29,7 +27,6 @@
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.core.page.TableDataInfo;
-
import java.util.*;
/**
diff --git a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
index 925ef86..22e153f 100644
--- a/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
+++ b/ard-work/src/main/java/com/ruoyi/device/hiksdk/controller/SdkController.java
@@ -238,7 +238,8 @@
@ApiOperation(value = "鑾峰彇鑱氱劍妯″紡", notes = "1鎵嬪姩2鑷姩")
@PostMapping("/getFocusMode")
- public @ResponseBody AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
+ public @ResponseBody
+ AjaxResult getFocusMode(@RequestBody CameraCmd cmd) {
String focusMode = sdk.getFocusMode(cmd);
return AjaxResult.success(focusMode);
}
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
index 941a0f1..a2ac369 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
@@ -52,6 +52,7 @@
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
<if test="deptId != null "> and dept_id = #{deptId}</if>
</where>
+ order by alarm_time desc
</select>
<select id="selectArdAlarmCameraById" parameterType="String" resultMap="ArdAlarmCameraResult">
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
index a4944c6..d19ef6b 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
@@ -31,6 +31,7 @@
AND start_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
</if>
</where>
+ order by start_time desc
</select>
<select id="selectByPrimaryKey" parameterType="java.lang.String" resultMap="BaseResultMap">
select
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index fa71583..b81216b 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -73,6 +73,7 @@
<if test="recordUrl != null and recordUrl != ''">and record_url = #{recordUrl}</if>
<if test="viewTime != null ">and view_time = #{viewTime}</if>
</where>
+ order by alarm_time desc
</select>
<select id="selectArdAlarmTubeById" parameterType="String" resultMap="ArdAlarmTubeResult">
--
Gitblit v1.9.3