From 1b81080f6f7da35d2af7d194a5aa7be720d1eaa4 Mon Sep 17 00:00:00 2001
From: yangjunyi <yangjunyi@huali-tec.com>
Date: 星期二, 29 八月 2023 14:23:28 +0800
Subject: [PATCH] 修复通道目录同步异常问题
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java | 35 +++++++++++++++++++++--------------
1 files changed, 21 insertions(+), 14 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java
old mode 100644
new mode 100755
index ec6d870..a5a80c4
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
-import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -13,9 +13,9 @@
@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 @@
"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);
@@ -78,5 +78,12 @@
List<StreamProxyItem> selectAutoRemoveItemByMediaServerId(String mediaServerId);
@Select("select count(1) as total, sum(status) as online from wvp_stream_proxy")
- ResourceBaceInfo getOverview();
+ ResourceBaseInfo getOverview();
+
+ @Select("select count(1) from wvp_stream_proxy")
+
+ int getAllCount();
+
+ @Select("select count(1) from wvp_stream_proxy where status = true")
+ int getOnline();
}
--
Gitblit v1.8.0