xujunwei vor 1 Jahr
Ursprung
Commit
e6b54272c3

+ 9 - 0
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java

@@ -1,6 +1,10 @@
 package com.genersoft.iot.vmp.gb28181.transmit.callback;
 
+import cn.hutool.json.JSONUtil;
 import com.genersoft.iot.vmp.vmanager.bean.DeferredResultEx;
+import com.genersoft.iot.vmp.vmanager.gb28181.play.PlayController;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.context.request.async.DeferredResult;
@@ -18,6 +22,8 @@ import java.util.concurrent.ConcurrentHashMap;
 @SuppressWarnings(value = {"rawtypes", "unchecked"})
 @Component
 public class DeferredResultHolder {
+
+	private final static Logger logger = LoggerFactory.getLogger(DeferredResultHolder.class);
 	
 	public static final String CALLBACK_CMD_DEVICESTATUS = "CALLBACK_DEVICESTATUS";
 	
@@ -129,6 +135,7 @@ public class DeferredResultHolder {
 	 * @param msg
 	 */
 	public void invokeAllResult(RequestMessage msg) {
+		logger.info("xjw 6 {}", JSONUtil.toJsonStr(msg));
 		Map<String, DeferredResultEx> deferredResultMap = map.get(msg.getKey());
 		if (deferredResultMap == null) {
 			return;
@@ -139,11 +146,13 @@ public class DeferredResultHolder {
 				return;
 			}
 			Set<String> ids = deferredResultMap.keySet();
+			logger.info("xjw 7 {}", JSONUtil.toJsonStr(ids));
 			for (String id : ids) {
 				DeferredResultEx result = deferredResultMap.get(id);
 				if (result == null) {
 					return;
 				}
+				logger.info("xjw 8 {}", JSONUtil.toJsonStr(result.getFilter()));
 				if (result.getFilter() != null) {
 					Object handler = result.getFilter().handler(msg.getData());
 					result.getDeferredResult().setResult(handler);

+ 2 - 0
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -114,6 +114,7 @@ public class PlayController {
 		resultHolder.put(key, uuid, result);
 
 		playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
+			logger.info("xjw 4,{},{},{}",code, msg, JSONUtil.toJsonStr(data));
 			WVPResult<StreamContent> wvpResult = new WVPResult<>();
 			if (code == InviteErrorCode.SUCCESS.getCode()) {
 				wvpResult.setCode(ErrorCode.SUCCESS.getCode());
@@ -144,6 +145,7 @@ public class PlayController {
 				wvpResult.setCode(code);
 				wvpResult.setMsg(msg);
 			}
+			logger.info("xjw 5 {}",JSONUtil.toJsonStr(wvpResult));
 			requestMessage.setData(wvpResult);
 			// 此处必须释放所有请求
 			resultHolder.invokeAllResult(requestMessage);