浏览代码

feat: 错误码优化
1. 优化了服务端对于推流部分的提示

kindring 3 周之前
父节点
当前提交
1d45636efe

+ 3 - 3
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -242,7 +242,7 @@ public class PlayServiceImpl implements IPlayService {
             }, (code, msgStr) -> {
                 // invite点播超时
                 logger.warn("sip 点播超时");
-                wvpResult.setCode(ErrorCode.ERROR100.getCode());
+                wvpResult.setCode(ErrorCode.ERROR102.getCode());
                 if (code == 0) {
                     wvpResult.setMsg("点播超时,请稍候重试");
                 } else if (code == 1) {
@@ -291,12 +291,12 @@ public class PlayServiceImpl implements IPlayService {
         msg.setKey(DeferredResultHolder.CALLBACK_CMD_PLAY + device.getDeviceId() + channelId);
         //端口获取失败的ssrcInfo 没有必要发送点播指令
         if (ssrcInfo.getPort() <= 0) {
-            logger.info("[点播端口分配异常],deviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
+            logger.info("[点播端口分配异常] 可能是流已经创建未销毁成功,deviceId={},channelId={},ssrcInfo={}", device.getDeviceId(), channelId, ssrcInfo);
             dynamicTask.stop(timeOutTaskKey);
             // 释放ssrc
             mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
             streamSession.remove(device.getDeviceId(), channelId, ssrcInfo.getStream());
-            msg.setData(WVPResult.fail(ErrorCode.ERROR100.getCode(), "点播端口分配异常"));
+            msg.setData(WVPResult.fail(ErrorCode.ERROR101.getCode(), "点播端口分配异常, 流未销毁成功"));
             resultHolder.invokeAllResult(msg);
             return;
         }

+ 3 - 0
src/main/java/com/genersoft/iot/vmp/vmanager/bean/ErrorCode.java

@@ -6,6 +6,9 @@ package com.genersoft.iot.vmp.vmanager.bean;
 public enum ErrorCode {
     SUCCESS(0, "成功"),
     ERROR100(100, "失败"),
+    ERROR101(101, "点播端口分配异常"),
+    ERROR102(102, "点播超时, 未收到设备视频流"),
+
     ERROR400(400, "参数不全或者错误"),
     ERROR404(404, "资源未找到"),
     ERROR403(403, "无权限操作"),