From d474bf929e3787b6ac88cfb5b2ee242844a0339b Mon Sep 17 00:00:00 2001
From: dengming <dengming@ctfo.com>
Date: 星期四, 10 三月 2022 15:24:50 +0800
Subject: [PATCH] 删除多余依赖包com.google.guava:30.0-jre，项目引用了版本31
---
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiDeviceController.java | 9 +++++----
1 files changed, 5 insertions(+), 4 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 2a021a2..2e96fbe 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
@@ -110,13 +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 {
- PageInfo<DeviceChannel> pageResult = storager.queryChannelsByDeviceId(serial, null, null, null,start/limit, limit);
- result.put("ChannelCount", pageResult.getTotal());
- 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