From 7d5a5b6c8fa20720a01986e9498a4cee6ec3674b Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 30 五月 2023 13:24:46 +0800
Subject: [PATCH] 删除2.6.8升级2.6.9.sql文件中给表gb_stream添加主键sql，保证升级脚本能正常执行。
---
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java
index 36a0363..ef77225 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java
@@ -1,5 +1,8 @@
package com.genersoft.iot.vmp.media.zlm.dto;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnPublishHookParam;
+import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;
+
/**
* 娴佺殑閴存潈淇℃伅
* @author lin
@@ -102,13 +105,13 @@
return streamAuthorityInfo;
}
- public static StreamAuthorityInfo getInstanceByHook(MediaItem mediaItem) {
+ public static StreamAuthorityInfo getInstanceByHook(OnStreamChangedHookParam onStreamChangedHookParam) {
StreamAuthorityInfo streamAuthorityInfo = new StreamAuthorityInfo();
- streamAuthorityInfo.setApp(mediaItem.getApp());
- streamAuthorityInfo.setStream(mediaItem.getStream());
- streamAuthorityInfo.setId(mediaItem.getMediaServerId());
- streamAuthorityInfo.setOriginType(mediaItem.getOriginType());
- streamAuthorityInfo.setOriginTypeStr(mediaItem.getOriginTypeStr());
+ streamAuthorityInfo.setApp(onStreamChangedHookParam.getApp());
+ streamAuthorityInfo.setStream(onStreamChangedHookParam.getStream());
+ streamAuthorityInfo.setId(onStreamChangedHookParam.getMediaServerId());
+ streamAuthorityInfo.setOriginType(onStreamChangedHookParam.getOriginType());
+ streamAuthorityInfo.setOriginTypeStr(onStreamChangedHookParam.getOriginTypeStr());
return streamAuthorityInfo;
}
}
--
Gitblit v1.8.0