From a8c424e49db9213e879bf6c44cebccdfddaa1808 Mon Sep 17 00:00:00 2001 From: BradyXu <brady_xu@outlook.com> Date: 星期日, 12 五月 2024 02:00:55 +0800 Subject: [PATCH] 修复sip绑定监听多网卡IP时,新增上级平台新增失败的问题,本地IP改成从配置的多IP下拉选择 --- src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java old mode 100644 new mode 100755 index 10a2759..d7da931 --- a/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java +++ b/src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java @@ -1,17 +1,23 @@ package com.genersoft.iot.vmp.service.bean; -import com.alibaba.fastjson.JSONObject; +import com.alibaba.fastjson2.JSONObject; import com.genersoft.iot.vmp.gb28181.event.SipSubscribe; -import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem; +import com.genersoft.iot.vmp.media.bean.MediaServer; -import javax.sip.RequestEvent; +import java.util.EventObject; + +/** + * @author lin + */ public class PlayBackResult<T> { - private int code; - private T data; - private MediaServerItem mediaServerItem; + private int code; + + private String msg; + private T data; + private MediaServer mediaServerItem; private JSONObject response; - private SipSubscribe.EventResult event; + private SipSubscribe.EventResult<EventObject> event; public int getCode() { return code; @@ -29,11 +35,11 @@ this.data = data; } - public MediaServerItem getMediaServerItem() { + public MediaServer getMediaServerItem() { return mediaServerItem; } - public void setMediaServerItem(MediaServerItem mediaServerItem) { + public void setMediaServerItem(MediaServer mediaServerItem) { this.mediaServerItem = mediaServerItem; } @@ -45,11 +51,19 @@ this.response = response; } - public SipSubscribe.EventResult getEvent() { + public SipSubscribe.EventResult<EventObject> getEvent() { return event; } - public void setEvent(SipSubscribe.EventResult event) { + public void setEvent(SipSubscribe.EventResult<EventObject> event) { this.event = event; } + + public String getMsg() { + return msg; + } + + public void setMsg(String msg) { + this.msg = msg; + } } -- Gitblit v1.8.0