From e8090bc84c04d929c750338df26aa2bf86e1efc8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 19 一月 2022 10:23:52 +0800
Subject: [PATCH] 修复bug与目录订阅添加最小值60
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 16 +++++++++++-----
1 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
index b9891ca..d83094e 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java
@@ -153,12 +153,15 @@
// 榛樿瓒呮椂鏃堕棿涓�30鍒嗛挓
DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(30*60*1000L);
result.onTimeout(()->{
- logger.warn(String.format("璁惧閫氶亾淇℃伅鍚屾瓒呮椂"));
+ logger.warn("璁惧[{}]閫氶亾淇℃伅鍚屾瓒呮椂", deviceId);
+ // 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
msg.setKey(key);
+ msg.setId(uuid);
WVPResult<Object> wvpResult = new WVPResult<>();
- wvpResult.setCode(0);
- wvpResult.setMsg("Timeout");
+ wvpResult.setCode(-1);
+ wvpResult.setData(device);
+ wvpResult.setMsg("鏇存柊瓒呮椂");
msg.setData(wvpResult);
resultHolder.invokeAllResult(msg);
@@ -170,8 +173,10 @@
cmder.catalogQuery(device, event -> {
RequestMessage msg = new RequestMessage();
msg.setKey(key);
+ msg.setId(uuid);
WVPResult<Object> wvpResult = new WVPResult<>();
- wvpResult.setCode(0);
+ wvpResult.setCode(-1);
+ wvpResult.setData(device);
wvpResult.setMsg(String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
msg.setData(wvpResult);
resultHolder.invokeAllResult(msg);
@@ -311,7 +316,8 @@
if (!StringUtils.isEmpty(device.getCharset())) deviceInStore.setCharset(device.getCharset());
if (!StringUtils.isEmpty(device.getMediaServerId())) deviceInStore.setMediaServerId(device.getMediaServerId());
- if (deviceInStore.getSubscribeCycleForCatalog() <=0 && device.getSubscribeCycleForCatalog() > 0) {
+ if ((deviceInStore.getSubscribeCycleForCatalog() <=0 && device.getSubscribeCycleForCatalog() > 0)
+ || deviceInStore.getSubscribeCycleForCatalog() != device.getSubscribeCycleForCatalog()) {
deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
// 寮�鍚闃�
deviceService.addCatalogSubscribe(deviceInStore);
--
Gitblit v1.8.0