From 5d36c2a3379eeabd353d6b9d0f5ab65559b68f9d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 18 四月 2024 17:51:56 +0800
Subject: [PATCH] 临时提交

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java |   74 +++++++++++++++++++++++++++++++++---
 1 files changed, 67 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
old mode 100644
new mode 100755
index 1a73a20..6befe46
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamPushItem.java
@@ -1,10 +1,10 @@
 package com.genersoft.iot.vmp.media.zlm.dto;
 
 import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
 import com.genersoft.iot.vmp.utils.DateUtil;
 import io.swagger.v3.oas.annotations.media.Schema;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.util.unit.DataUnit;
 
 import java.util.List;
 
@@ -59,7 +59,7 @@
      * 瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷
      */
     @Schema(description = "瀹㈡埛绔拰鏈嶅姟鍣ㄧ綉缁滀俊鎭紝鍙兘涓簄ull绫诲瀷")
-    private MediaItem.OriginSock originSock;
+    private OnStreamChangedHookParam.OriginSock originSock;
 
     /**
      * 浜х敓婧愮被鍨嬬殑瀛楃涓叉弿杩�
@@ -83,7 +83,7 @@
      * 闊宠棰戣建閬�
      */
     @Schema(description = "闊宠棰戣建閬�")
-    private List<MediaItem.MediaTrack> tracks;
+    private List<OnStreamChangedHookParam.MediaTrack> tracks;
 
     /**
      * 闊宠棰戣建閬�
@@ -223,11 +223,11 @@
         this.originType = originType;
     }
 
-    public MediaItem.OriginSock getOriginSock() {
+    public OnStreamChangedHookParam.OriginSock getOriginSock() {
         return originSock;
     }
 
-    public void setOriginSock(MediaItem.OriginSock originSock) {
+    public void setOriginSock(OnStreamChangedHookParam.OriginSock originSock) {
         this.originSock = originSock;
     }
 
@@ -256,11 +256,11 @@
         this.aliveSecond = aliveSecond;
     }
 
-    public List<MediaItem.MediaTrack> getTracks() {
+    public List<OnStreamChangedHookParam.MediaTrack> getTracks() {
         return tracks;
     }
 
-    public void setTracks(List<MediaItem.MediaTrack> tracks) {
+    public void setTracks(List<OnStreamChangedHookParam.MediaTrack> tracks) {
         this.tracks = tracks;
     }
 
@@ -325,5 +325,65 @@
     public void setSelf(boolean self) {
         this.self = self;
     }
+
+//    @Override
+//    public Integer getGbStreamId() {
+//        return super.getGbStreamId();
+//    }
+//
+//    @Override
+//    public void setGbStreamId(Integer gbStreamId) {
+//        super.setGbStreamId(gbStreamId);
+//    }
+//
+//
+//    public String getGbId() {
+//        return super.getGbId();
+//    }
+//
+//    public void setGbId(String gbId) {
+//       super.setGbId(gbId);
+//    }
+//
+//    public String getName() {
+//        return super.getName();
+//    }
+//
+//    public void setName(String name) {
+//        super.setName(name);
+//    }
+//
+//    public double getLongitude() {
+//        return super.getLongitude();
+//    }
+//
+//    public void setLongitude(double longitude) {
+//        super.setLongitude(longitude);
+//    }
+//
+//    public double getLatitude() {
+//        return super.getLatitude();
+//    }
+//
+//    public void setLatitude(double latitude) {
+//        super.setLatitude(latitude);
+//    }
+//
+//    public String getStreamType() {
+//        return super.getStreamType();
+//    }
+//
+//    public void setStreamType(String streamType) {
+//        super.setStreamType(streamType);
+//    }
+//
+//    public boolean isStatus() {
+//        return super.isStatus();
+//    }
+//
+//    public void setStatus(boolean status) {
+//        super.setStatus(status);
+//    }
+
 }
 

--
Gitblit v1.8.0