修复拉流代理的ffmpeg代理方式

src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamProxyItem.java

@@ -16,32 +16,30 @@ public class StreamProxyItem extends GbStream {
     @Schema(description = "流ID")
     private String stream;
     @Schema(description = "流媒体服务ID")
-    private String media_server_id;
+    private String mediaServerId;
     @Schema(description = "拉流地址")
     private String url;
     @Schema(description = "拉流地址")
-    private String src_url;
+    private String srcUrl;
     @Schema(description = "目标地址")
-    private String dst_url;
+    private String dstUrl;
     @Schema(description = "超时时间")
-    private int timeout_ms;
+    private int timeoutMs;
     @Schema(description = "ffmpeg模板KEY")
-    private String ffmpeg_cmd_key;
+    private String ffmpegCmdKey;
     @Schema(description = "rtsp拉流时，拉流方式，0：tcp，1：udp，2：组播")
-    private String rtp_type;
+    private String rtpType;
     @Schema(description = "是否启用")
     private boolean enable;
     @Schema(description = "是否启用音频")
-    private boolean enable_audio;
+    private boolean enableAudio;
     @Schema(description = "是否启用MP4")
-    private boolean enable_mp4;
+    private boolean enableMp4;
     @Schema(description = "是否 无人观看时删除")
-    private boolean enable_remove_none_reader;
+    private boolean enableRemoveNoneReader;
 
     @Schema(description = "是否 无人观看时自动停用")
-    private boolean enable_disable_none_reader;
-    @Schema(description = "创建时间")
-    private String create_time;
+    private boolean enableDisableNoneReader;
 
     public String getType() {
         return type;
@@ -73,12 +71,12 @@ public class StreamProxyItem extends GbStream {
 
     @Override
     public String getMediaServerId() {
-        return media_server_id;
+        return mediaServerId;
     }
 
     @Override
     public void setMediaServerId(String mediaServerId) {
-        this.media_server_id = mediaServerId;
+        this.mediaServerId = mediaServerId;
     }
 
     public String getUrl() {
@@ -90,43 +88,43 @@ public class StreamProxyItem extends GbStream {
     }
 
     public String getSrcUrl() {
-        return src_url;
+        return srcUrl;
     }
 
     public void setSrcUrl(String src_url) {
-        this.src_url = src_url;
+        this.srcUrl = src_url;
     }
 
     public String getDstUrl() {
-        return dst_url;
+        return dstUrl;
     }
 
     public void setDstUrl(String dst_url) {
-        this.dst_url = dst_url;
+        this.dstUrl = dst_url;
     }
 
     public int getTimeoutMs() {
-        return timeout_ms;
+        return timeoutMs;
     }
 
     public void setTimeoutMs(int timeout_ms) {
-        this.timeout_ms = timeout_ms;
+        this.timeoutMs = timeout_ms;
     }
 
     public String getFfmpegCmdKey() {
-        return ffmpeg_cmd_key;
+        return ffmpegCmdKey;
     }
 
     public void setFfmpegCmdKey(String ffmpeg_cmd_key) {
-        this.ffmpeg_cmd_key = ffmpeg_cmd_key;
+        this.ffmpegCmdKey = ffmpeg_cmd_key;
     }
 
     public String getRtpType() {
-        return rtp_type;
+        return rtpType;
     }
 
     public void setRtpType(String rtp_type) {
-        this.rtp_type = rtp_type;
+        this.rtpType = rtp_type;
     }
 
     public boolean isEnable() {
@@ -138,44 +136,36 @@ public class StreamProxyItem extends GbStream {
     }
 
     public boolean isEnableMp4() {
-        return enable_mp4;
+        return enableMp4;
     }
 
     public void setEnableMp4(boolean enable_mp4) {
-        this.enable_mp4 = enable_mp4;
-    }
-
-    @Override
-    public String getCreateTime() {
-        return create_time;
-    }
-
-    @Override
-    public void setCreateTime(String create_time) {
-        this.create_time = create_time;
+        this.enableMp4 = enable_mp4;
     }
 
     public boolean isEnableRemoveNoneReader() {
-        return enable_remove_none_reader;
+        return enableRemoveNoneReader;
     }
 
     public void setEnableRemoveNoneReader(boolean enable_remove_none_reader) {
-        this.enable_remove_none_reader = enable_remove_none_reader;
+        this.enableRemoveNoneReader = enable_remove_none_reader;
     }
 
     public boolean isEnableDisableNoneReader() {
-        return enable_disable_none_reader;
+        return enableDisableNoneReader;
     }
 
     public void setEnableDisableNoneReader(boolean enable_disable_none_reader) {
-        this.enable_disable_none_reader = enable_disable_none_reader;
+        this.enableDisableNoneReader = enable_disable_none_reader;
     }
 
     public boolean isEnableAudio() {
-        return enable_audio;
+        return enableAudio;
     }
 
     public void setEnableAudio(boolean enable_audio) {
-        this.enable_audio = enable_audio;
+        this.enableAudio = enable_audio;
     }
+
+
 }

src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java

@@ -13,9 +13,9 @@ public interface StreamProxyMapper {
 
     @Insert("INSERT INTO wvp_stream_proxy (type, name, app, stream,media_server_id, url, src_url, dst_url, " +
             "timeout_ms, ffmpeg_cmd_key, rtp_type, enable_audio, enable_mp4, enable, status, enable_remove_none_reader, enable_disable_none_reader, create_time) VALUES" +
-            "(#{type}, #{name}, #{app}, #{stream}, #{mediaServerId}, #{url}, #{src_url}, #{dst_url}, " +
-            "#{timeout_ms}, #{ffmpeg_cmd_key}, #{rtp_type}, #{enable_audio}, #{enable_mp4}, #{enable}, #{status}, " +
-            "#{enable_remove_none_reader}, #{enable_disable_none_reader}, #{createTime} )")
+            "(#{type}, #{name}, #{app}, #{stream}, #{mediaServerId}, #{url}, #{srcUrl}, #{dstUrl}, " +
+            "#{timeoutMs}, #{ffmpegCmdKey}, #{rtpType}, #{enableAudio}, #{enableMp4}, #{enable}, #{status}, " +
+            "#{enableRemoveNoneReader}, #{enableDisableNoneReader}, #{createTime} )")
     int add(StreamProxyItem streamProxyDto);
 
     @Update("UPDATE wvp_stream_proxy " +
@@ -25,17 +25,17 @@ public interface StreamProxyMapper {
             "stream=#{stream}," +
             "url=#{url}, " +
             "media_server_id=#{mediaServerId}, " +
-            "src_url=#{src_url}," +
-            "dst_url=#{dst_url}, " +
-            "timeout_ms=#{timeout_ms}, " +
-            "ffmpeg_cmd_key=#{ffmpeg_cmd_key}, " +
-            "rtp_type=#{rtp_type}, " +
-            "enable_audio=#{enable_audio}, " +
+            "src_url=#{srcUrl}," +
+            "dst_url=#{dstUrl}, " +
+            "timeout_ms=#{timeoutMs}, " +
+            "ffmpeg_cmd_key=#{ffmpegCmdKey}, " +
+            "rtp_type=#{rtpType}, " +
+            "enable_audio=#{enableAudio}, " +
             "enable=#{enable}, " +
             "status=#{status}, " +
-            "enable_remove_none_reader=#{enable_remove_none_reader}, " +
-            "enable_disable_none_reader=#{enable_disable_none_reader}, " +
-            "enable_mp4=#{enable_mp4} " +
+            "enable_remove_none_reader=#{enableRemoveNoneReader}, " +
+            "enable_disable_none_reader=#{enableDisableNoneReader}, " +
+            "enable_mp4=#{enableMp4} " +
             "WHERE app=#{app} AND stream=#{stream}")
     int update(StreamProxyItem streamProxyDto);