From 39efda779fcd5d613870e9024cda69da28e571b2 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 16 五月 2022 11:47:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into commercial
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
index 8d1f0c3..d4928ec 100644
--- a/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
+++ b/src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java
@@ -4,7 +4,7 @@
import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
import com.github.pagehelper.PageInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -25,7 +25,7 @@
private final static Logger logger = LoggerFactory.getLogger(ApiDeviceController.class);
@Autowired
- private IVideoManagerStorager storager;
+ private IVideoManagerStorage storager;
// @Autowired
// private SIPCommander cmder;
@@ -110,14 +110,14 @@
return result;
}
List<DeviceChannel> deviceChannels;
+ List<DeviceChannel> allDeviceChannelList = storager.queryChannelsByDeviceId(serial);
if (start == null || limit ==null) {
- deviceChannels = storager.queryChannelsByDeviceId(serial);
+ deviceChannels = allDeviceChannelList;
result.put("ChannelCount", deviceChannels.size());
}else {
- start ++;
- PageInfo pageResult = storager.queryChannelsByDeviceId(serial, null, null, null,start, limit);
- result.put("ChannelCount", pageResult.getList().size());
- deviceChannels = pageResult.getList();
+ deviceChannels = storager.queryChannelsByDeviceIdWithStartAndLimit(serial, null, null, null,start, limit);
+ int total = allDeviceChannelList.size();
+ result.put("ChannelCount", total);
}
JSONArray channleJSONList = new JSONArray();
--
Gitblit v1.8.0