From ffb0fcb9072a043c333837fa83bd976b03fea091 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 02 十二月 2021 09:30:57 +0800
Subject: [PATCH] Merge pull request #259 from hotcoffie/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/device/DeviceQuery.java | 117 +++++++++++++++++++++++++++++++++++++---------------------
1 files changed, 74 insertions(+), 43 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 cb08ba3..729eca2 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
@@ -1,11 +1,21 @@
package com.genersoft.iot.vmp.vmanager.gb28181.device;
+import com.alibaba.fastjson.JSONObject;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
+import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
import com.genersoft.iot.vmp.gb28181.transmit.callback.RequestMessage;
+import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
+import com.genersoft.iot.vmp.service.IDeviceService;
import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
import com.github.pagehelper.PageInfo;
-import io.swagger.annotations.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -15,15 +25,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.context.request.async.DeferredResult;
-import com.alibaba.fastjson.JSONObject;
-import com.genersoft.iot.vmp.gb28181.bean.Device;
-import com.genersoft.iot.vmp.gb28181.event.DeviceOffLineDetector;
-import com.genersoft.iot.vmp.gb28181.transmit.callback.DeferredResultHolder;
-import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-
-import javax.sip.message.Response;
-import java.io.UnsupportedEncodingException;
+import java.util.UUID;
@Api(tags = "鍥芥爣璁惧鏌ヨ", value = "鍥芥爣璁惧鏌ヨ")
@SuppressWarnings("rawtypes")
@@ -49,6 +51,9 @@
@Autowired
private DeviceOffLineDetector offLineDetector;
+ @Autowired
+ private IDeviceService deviceService;
+
/**
* 浣跨敤ID鏌ヨ鍥芥爣璁惧
* @param deviceId 鍥芥爣ID
@@ -61,9 +66,9 @@
@GetMapping("/devices/{deviceId}")
public ResponseEntity<Device> devices(@PathVariable String deviceId){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ瑙嗛璁惧API璋冪敤锛宒eviceId锛�" + deviceId);
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ瑙嗛璁惧API璋冪敤锛宒eviceId锛�" + deviceId);
+// }
Device device = storager.queryVideoDevice(deviceId);
return new ResponseEntity<>(device,HttpStatus.OK);
@@ -83,9 +88,9 @@
@GetMapping("/devices")
public PageInfo<Device> devices(int page, int count){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ鎵�鏈夎棰戣澶嘇PI璋冪敤");
+// }
return storager.queryVideoDeviceList(page, count);
}
@@ -116,9 +121,9 @@
@RequestParam(required = false) String query,
@RequestParam(required = false) Boolean online,
@RequestParam(required = false) Boolean channelType) {
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ瑙嗛璁惧閫氶亾API璋冪敤");
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ瑙嗛璁惧閫氶亾API璋冪敤");
+// }
if (StringUtils.isEmpty(query)) {
query = null;
}
@@ -143,23 +148,31 @@
logger.debug("璁惧閫氶亾淇℃伅鍚屾API璋冪敤锛宒eviceId锛�" + deviceId);
}
Device device = storager.queryVideoDevice(deviceId);
- cmder.catalogQuery(device, event -> {
- Response response = event.getResponse();
- RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_CATALOG+deviceId);
- msg.setData(String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase()));
- resultHolder.invokeResult(msg);
- });
- DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(15*1000L);
+ String key = DeferredResultHolder.CALLBACK_CMD_CATALOG + deviceId;
+ String uuid = UUID.randomUUID().toString();
+ DeferredResult<ResponseEntity<Device>> result = new DeferredResult<ResponseEntity<Device>>(15*1000L);
result.onTimeout(()->{
logger.warn(String.format("璁惧閫氶亾淇℃伅鍚屾瓒呮椂"));
// 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_CATALOG+deviceId);
+ msg.setKey(key);
+ msg.setId(uuid);
msg.setData("Timeout");
- resultHolder.invokeResult(msg);
+ resultHolder.invokeAllResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_CATALOG+deviceId, result);
+ // 绛夊緟鍏朵粬鐩稿悓璇锋眰杩斿洖鏃朵竴璧疯繑鍥�
+ if (resultHolder.exist(key, null)) {
+ return result;
+ }
+ cmder.catalogQuery(device, event -> {
+ RequestMessage msg = new RequestMessage();
+ msg.setKey(key);
+ msg.setId(uuid);
+ msg.setData(String.format("鍚屾閫氶亾澶辫触锛岄敊璇爜锛� %s, %s", event.statusCode, event.msg));
+ resultHolder.invokeAllResult(msg);
+ });
+
+ resultHolder.put(key, uuid, result);
return result;
}
@@ -225,9 +238,9 @@
@RequestParam(required = false) String online,
@RequestParam(required = false) Boolean channelType){
- if (logger.isDebugEnabled()) {
- logger.debug("鏌ヨ鎵�鏈夎棰戦�氶亾API璋冪敤");
- }
+// if (logger.isDebugEnabled()) {
+// logger.debug("鏌ヨ鎵�鏈夎棰戦�氶亾API璋冪敤");
+// }
DeviceChannel deviceChannel = storager.queryChannel(deviceId,channelId);
if (deviceChannel == null) {
PageInfo<DeviceChannel> deviceChannelPageResult = new PageInfo<>();
@@ -292,6 +305,18 @@
if (!StringUtils.isEmpty(device.getName())) deviceInStore.setName(device.getName());
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) {
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ // 寮�鍚闃�
+ deviceService.addCatalogSubscribe(deviceInStore);
+ }
+ if (deviceInStore.getSubscribeCycleForCatalog() > 0 && device.getSubscribeCycleForCatalog() <= 0) {
+ deviceInStore.setSubscribeCycleForCatalog(device.getSubscribeCycleForCatalog());
+ // 鍙栨秷璁㈤槄
+ deviceService.removeCatalogSubscribe(deviceInStore);
+ }
+
storager.updateDevice(deviceInStore);
cmder.deviceInfoQuery(deviceInStore);
}
@@ -316,11 +341,13 @@
logger.debug("璁惧鐘舵�佹煡璇PI璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
+ String uuid = UUID.randomUUID().toString();
+ String key = DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId;
cmder.deviceStatusQuery(device, event -> {
- Response response = event.getResponse();
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId);
- msg.setData(String.format("鑾峰彇璁惧鐘舵�佸け璐ワ紝閿欒鐮侊細 %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("鑾峰彇璁惧鐘舵�佸け璐ワ紝閿欒鐮侊細 %s, %s", event.statusCode, event.msg));
resultHolder.invokeResult(msg);
});
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String>>(2*1000L);
@@ -328,11 +355,12 @@
logger.warn(String.format("鑾峰彇璁惧鐘舵�佽秴鏃�"));
// 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData("Timeout. Device did not response to this command.");
resultHolder.invokeResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId, result);
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_DEVICESTATUS + deviceId, uuid, result);
return result;
}
@@ -369,11 +397,13 @@
logger.debug("璁惧鎶ヨ鏌ヨAPI璋冪敤");
}
Device device = storager.queryVideoDevice(deviceId);
+ String key = DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId;
+ String uuid = UUID.randomUUID().toString();
cmder.alarmInfoQuery(device, startPriority, endPriority, alarmMethod, alarmType, startTime, endTime, event -> {
- Response response = event.getResponse();
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId);
- msg.setData(String.format("璁惧鎶ヨ鏌ヨ澶辫触锛岄敊璇爜锛� %s, %s", response.getStatusCode(), response.getReasonPhrase()));
+ msg.setId(uuid);
+ msg.setKey(key);
+ msg.setData(String.format("璁惧鎶ヨ鏌ヨ澶辫触锛岄敊璇爜锛� %s, %s",event.statusCode, event.msg));
resultHolder.invokeResult(msg);
});
DeferredResult<ResponseEntity<String>> result = new DeferredResult<ResponseEntity<String >> (3 * 1000L);
@@ -381,11 +411,12 @@
logger.warn(String.format("璁惧鎶ヨ鏌ヨ瓒呮椂"));
// 閲婃斁rtpserver
RequestMessage msg = new RequestMessage();
- msg.setId(DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId);
+ msg.setId(uuid);
+ msg.setKey(key);
msg.setData("璁惧鎶ヨ鏌ヨ瓒呮椂");
resultHolder.invokeResult(msg);
});
- resultHolder.put(DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId, result);
+ resultHolder.put(DeferredResultHolder.CALLBACK_CMD_ALARM + deviceId, uuid, result);
return result;
}
--
Gitblit v1.8.0