From 67af71cb4de71b1267e6300b7581cb6ccc8aa1d3 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期六, 24 六月 2023 16:00:17 +0800
Subject: [PATCH] 优化ptz的websocket推送
---
ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
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 70ebb7c..175017b 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
@@ -364,12 +364,12 @@
int count1001 = ardAlarmStealelecMapper.selectCountByStartTime(refreshTime);
countMap.put("1001", count1001);
int count1014 = ardAlarmTubeMapper.selectCountByStartTime(refreshTime);
- countMap.put("1014 ", count1014);
+ countMap.put("1014", count1014);
return countMap;
}
@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,12 +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;
}
--
Gitblit v1.9.3