Pre Merge pull request !34 from WangXuewen/master

Merge pull request #2140 from plainheart/fix/preset-query-limit
修复预置位列表查询仅返回10条数据的问题
2026-06-29 21:47:50 +08:00 · 2026-05-07 02:10:04 +00:00 · 2026-05-07 10:09:44 +08:00 · 2026-05-06 16:46:55 +08:00 · 2024-12-12 17:37:36 +08:00
1 changed files with 4 additions and 2 deletions
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/PresetQueryResponseMessageHandler.java
@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.DelayQueue;
 import java.util.concurrent.TimeUnit;

+import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getInteger;
 import static com.genersoft.iot.vmp.gb28181.utils.XmlUtil.getText;

 /**
@ -81,7 +82,8 @@ public class PresetQueryResponseMessageHandler extends SIPRequestProcessorParent
                }
                return;
            }
-            int num = Integer.parseInt(presetListNumElement.attributeValue("Num"));
+        	Integer sumNum = getInteger(rootElement, "SumNum");
+        	int	num = sumNum == null ? Integer.parseInt(presetListNumElement.attributeValue("Num")) : sumNum.intValue();
            List<Preset> presetQuerySipReqList = new ArrayList<>();
            if (num > 0) {
                for (Iterator<Element> presetIterator = presetListNumElement.elementIterator(); presetIterator.hasNext(); ) {
Author	SHA1	Message	Date
WangXuewen	c11a7c993f	Pre Merge pull request !34 from WangXuewen/master	2026-05-07 02:10:04 +00:00
648540858	6f1f8d0d60	Merge pull request #2140 from plainheart/fix/preset-query-limit 修复预置位列表查询仅返回10条数据的问题	2026-05-07 10:09:44 +08:00
plainheart	02ab74dbae	修复 commit `93724bac98` 错误地将 648540858/wvp-GB28181-pro#1946 修复预置位列表查询只能返回10条数据BUG逻辑删除的问题	2026-05-06 16:46:55 +08:00
wangxw	b05f770a57	解决sql错误，启动是PGSQL查询报错integer=boolean	2024-12-12 17:37:36 +08:00