From c6202b3b2754ce81234940caa108ca24448ac9ca Mon Sep 17 00:00:00 2001
From: szy833 <1037966925@qq.com>
Date: 星期六, 15 一月 2022 22:29:59 +0800
Subject: [PATCH] feat(): 增加拉框放大，缩小。接收下级设备控制信令增加200返回。
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 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..bc8b61b 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);
--
Gitblit v1.8.0