From f99c9cac6afc899c244aa66897cb3bf35a2da7d6 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期四, 13 一月 2022 16:24:37 +0800 Subject: [PATCH] 优化通道更新 --- src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 17 +++++++++++------ 1 files changed, 11 insertions(+), 6 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 729eca2..b9891ca 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 @@ -150,15 +150,18 @@ Device device = storager.queryVideoDevice(deviceId); String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + deviceId; String uuid = UUID.randomUUID().toString(); - DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(15*1000L); + // 榛樿瓒呮椂鏃堕棿涓�30鍒嗛挓 + DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(30*60*1000L); result.onTimeout(()->{ logger.warn(String.format("璁惧閫氶亾淇℃伅鍚屾瓒呮椂")); - // 閲婃斁rtpserver RequestMessage msg = new RequestMessage(); msg.setKey(key); - msg.setId(uuid); - msg.setData("Timeout"); + WVPResult<Object> wvpResult = new WVPResult<>(); + wvpResult.setCode(0); + wvpResult.setMsg("Timeout"); + msg.setData(wvpResult); resultHolder.invokeAllResult(msg); + }); // 绛夊緟鍏朵粬鐩稿悓璇锋眰杩斿洖鏃朵竴璧疯繑鍥� if (resultHolder.exist(key, null)) { @@ -167,8 +170,10 @@ cmder.catalogQuery(device, event -> { RequestMessage msg = new RequestMessage(); msg.setKey(key); - msg.setId(uuid); - msg.setData(String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg)); + WVPResult<Object> wvpResult = new WVPResult<>(); + wvpResult.setCode(0); + wvpResult.setMsg(String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg)); + msg.setData(wvpResult); resultHolder.invokeAllResult(msg); }); -- Gitblit v1.8.0