From dbdb9ca06d3a6a357abe52b393bb398f4e1e8a4a Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 六月 2023 15:58:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wvp-28181-2.0' into wvp-28181-2.0
---
sql/2.6.8升级2.6.9.sql | 4 --
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java | 8 ++--
src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java | 50 ++++++++++++------------
src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java | 14 +++---
4 files changed, 36 insertions(+), 40 deletions(-)
diff --git "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql" "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
index d6d3a6b..a6b9f12 100644
--- "a/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
+++ "b/sql/2.6.8\345\215\207\347\272\2472.6.9.sql"
@@ -180,10 +180,6 @@
change createTime create_time varchar(50) null;
alter table gb_stream
- add constraint gb_stream_pk
- primary key (gbStreamId);
-
-alter table gb_stream
change gbStreamId gb_stream_id int auto_increment;
alter table gb_stream
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 3a94f79..f59f57e 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -496,13 +496,13 @@
// 鎷夋祦浠ｇ悊
StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
if (streamProxyItem != null) {
- if (streamProxyItem.isEnable_remove_none_reader()) {
+ if (streamProxyItem.isEnableRemoveNoneReader()) {
// 鏃犱汉瑙傜湅鑷姩绉婚櫎
ret.put("close", true);
streamProxyService.del(param.getApp(), param.getStream());
- String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrc_url();
+ String url = streamProxyItem.getUrl() != null ? streamProxyItem.getUrl() : streamProxyItem.getSrcUrl();
logger.info("[{}/{}]<-[{}] 鎷夋祦浠ｇ悊鏃犱汉瑙傜湅宸茬粡绉婚櫎", param.getApp(), param.getStream(), url);
- } else if (streamProxyItem.isEnable_disable_none_reader()) {
+ } else if (streamProxyItem.isEnableDisableNoneReader()) {
// 鏃犱汉瑙傜湅鍋滅敤
ret.put("close", true);
// 淇敼鏁版嵁
@@ -587,7 +587,7 @@
} else {
// 鎷夋祦浠ｇ悊
StreamProxyItem streamProxyByAppAndStream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
- if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnable_disable_none_reader()) {
+ if (streamProxyByAppAndStream != null && streamProxyByAppAndStream.isEnableDisableNoneReader()) {
streamProxyService.start(param.getApp(), param.getStream());
}
DeferredResult<HookResult> result = new DeferredResult<>();
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
index b0e74e8..8637e3f 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java
@@ -16,7 +16,7 @@
@Schema(description = "娴両D")
private String stream;
@Schema(description = "娴佸獟浣撴湇鍔D")
- private String mediaServerId;
+ private String media_server_id;
@Schema(description = "鎷夋祦鍦板潃")
private String url;
@Schema(description = "鎷夋祦鍦板潃")
@@ -41,7 +41,7 @@
@Schema(description = "鏄惁 鏃犱汉瑙傜湅鏃惰嚜鍔ㄥ仠鐢�")
private boolean enable_disable_none_reader;
@Schema(description = "鍒涘缓鏃堕棿")
- private String createTime;
+ private String create_time;
public String getType() {
return type;
@@ -73,12 +73,12 @@
@Override
public String getMediaServerId() {
- return mediaServerId;
+ return media_server_id;
}
@Override
public void setMediaServerId(String mediaServerId) {
- this.mediaServerId = mediaServerId;
+ this.media_server_id = mediaServerId;
}
public String getUrl() {
@@ -89,43 +89,43 @@
this.url = url;
}
- public String getSrc_url() {
+ public String getSrcUrl() {
return src_url;
}
- public void setSrc_url(String src_url) {
+ public void setSrcUrl(String src_url) {
this.src_url = src_url;
}
- public String getDst_url() {
+ public String getDstUrl() {
return dst_url;
}
- public void setDst_url(String dst_url) {
+ public void setDstUrl(String dst_url) {
this.dst_url = dst_url;
}
- public int getTimeout_ms() {
+ public int getTimeoutMs() {
return timeout_ms;
}
- public void setTimeout_ms(int timeout_ms) {
+ public void setTimeoutMs(int timeout_ms) {
this.timeout_ms = timeout_ms;
}
- public String getFfmpeg_cmd_key() {
+ public String getFfmpegCmdKey() {
return ffmpeg_cmd_key;
}
- public void setFfmpeg_cmd_key(String ffmpeg_cmd_key) {
+ public void setFfmpegCmdKey(String ffmpeg_cmd_key) {
this.ffmpeg_cmd_key = ffmpeg_cmd_key;
}
- public String getRtp_type() {
+ public String getRtpType() {
return rtp_type;
}
- public void setRtp_type(String rtp_type) {
+ public void setRtpType(String rtp_type) {
this.rtp_type = rtp_type;
}
@@ -137,45 +137,45 @@
this.enable = enable;
}
- public boolean isEnable_mp4() {
+ public boolean isEnableMp4() {
return enable_mp4;
}
- public void setEnable_mp4(boolean enable_mp4) {
+ public void setEnableMp4(boolean enable_mp4) {
this.enable_mp4 = enable_mp4;
}
@Override
public String getCreateTime() {
- return createTime;
+ return create_time;
}
@Override
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
+ public void setCreateTime(String create_time) {
+ this.create_time = create_time;
}
- public boolean isEnable_remove_none_reader() {
+ public boolean isEnableRemoveNoneReader() {
return enable_remove_none_reader;
}
- public void setEnable_remove_none_reader(boolean enable_remove_none_reader) {
+ public void setEnableRemoveNoneReader(boolean enable_remove_none_reader) {
this.enable_remove_none_reader = enable_remove_none_reader;
}
- public boolean isEnable_disable_none_reader() {
+ public boolean isEnableDisableNoneReader() {
return enable_disable_none_reader;
}
- public void setEnable_disable_none_reader(boolean enable_disable_none_reader) {
+ public void setEnableDisableNoneReader(boolean enable_disable_none_reader) {
this.enable_disable_none_reader = enable_disable_none_reader;
}
- public boolean isEnable_audio() {
+ public boolean isEnableAudio() {
return enable_audio;
}
- public void setEnable_audio(boolean enable_audio) {
+ public void setEnableAudio(boolean enable_audio) {
this.enable_audio = enable_audio;
}
}
diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
index 3037e3f..f73392f 100644
--- a/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
+++ b/src/main/java/com/genersoft/iot/vmp/service/impl/StreamProxyServiceImpl.java
@@ -106,7 +106,7 @@
}
String dstUrl = String.format("rtmp://%s:%s/%s/%s", "127.0.0.1", mediaInfo.getRtmpPort(), param.getApp(),
param.getStream() );
- param.setDst_url(dstUrl);
+ param.setDstUrl(dstUrl);
StringBuffer resultMsg = new StringBuffer();
param.setMediaServerId(mediaInfo.getId());
boolean saveResult;
@@ -127,7 +127,7 @@
resultMsg.append(", 浣嗘槸鍚敤澶辫触锛岃妫�鏌ユ祦鍦板潃鏄惁鍙敤");
param.setEnable(false);
// 鐩存帴绉婚櫎
- if (param.isEnable_remove_none_reader()) {
+ if (param.isEnableRemoveNoneReader()) {
del(param.getApp(), param.getStream());
}else {
updateStreamProxy(param);
@@ -228,11 +228,11 @@
}
if ("default".equals(param.getType())){
result = zlmresTfulUtils.addStreamProxy(mediaServerItem, param.getApp(), param.getStream(), param.getUrl(),
- param.isEnable_audio(), param.isEnable_mp4(), param.getRtp_type());
+ param.isEnableAudio(), param.isEnableMp4(), param.getRtpType());
}else if ("ffmpeg".equals(param.getType())) {
- result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrc_url(), param.getDst_url(),
- param.getTimeout_ms() + "", param.isEnable_audio(), param.isEnable_mp4(),
- param.getFfmpeg_cmd_key());
+ result = zlmresTfulUtils.addFFmpegSource(mediaServerItem, param.getSrcUrl(), param.getDstUrl(),
+ param.getTimeoutMs() + "", param.isEnableAudio(), param.isEnableMp4(),
+ param.getFfmpegCmdKey());
}
return result;
}
@@ -286,7 +286,7 @@
updateStreamProxy(streamProxy);
}else {
logger.info("鍚敤浠ｇ悊澶辫触锛� {}/{}->{}({})", app, stream, jsonObject.getString("msg"),
- streamProxy.getSrc_url() == null? streamProxy.getUrl():streamProxy.getSrc_url());
+ streamProxy.getSrcUrl() == null? streamProxy.getUrl():streamProxy.getSrcUrl());
}
}
return result;
--
Gitblit v1.8.0