From 8fdd10d1c2723ead1d2c3b232f64f292ba3ce1cc Mon Sep 17 00:00:00 2001
From: che_shuai <che_shuai@massclouds>
Date: 星期一, 24 七月 2023 14:10:46 +0800
Subject: [PATCH] 修复在国标级联选择通道时，如果添加通道到跟平台根目录（即平台本身），无法触发目录变更事件问题.详见 https://github.com/648540858/wvp-GB28181-pro/issues/958
---
src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 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
index 10a2759..0a332ef 100644
--- 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 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 MediaServerItem mediaServerItem;
private JSONObject response;
- private SipSubscribe.EventResult event;
+ private SipSubscribe.EventResult<EventObject> event;
public int getCode() {
return code;
@@ -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