From 7e48d847402d2ea4da85af582529de676f30dc38 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 五月 2023 17:56:56 +0800
Subject: [PATCH] Merge pull request #844 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/service/bean/PlayBackResult.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 8029b5a..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 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