From 42a2772d1aa7493bcc4fac3e24ee8eda4eebc23d Mon Sep 17 00:00:00 2001
From: xubinbin <1323875150@qq.com>
Date: 星期二, 12 十二月 2023 17:09:04 +0800
Subject: [PATCH] bugfix：请求头带token， SecurityUtils 获取用户id 一直为0 #1195
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamProxyMapper.java | 88 +++++++++++++++++++++++++++++++++-----------
1 files changed, 66 insertions(+), 22 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 414125b..6ad36ce
--- 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,6 +1,7 @@
package com.genersoft.iot.vmp.storager.dao;
-import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyDto;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaseInfo;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -10,37 +11,80 @@
@Repository
public interface StreamProxyMapper {
- @Insert("INSERT INTO stream_proxy (type, app, stream, url, src_url, dst_url, " +
- "timeout_ms, ffmpeg_cmd_key, rtp_type, enable_hls, enable_mp4, enable) VALUES" +
- "('${type}','${app}', '${stream}', '${url}', '${src_url}', '${dst_url}', " +
- "'${timeout_ms}', '${ffmpeg_cmd_key}', '${rtp_type}', ${enable_hls}, ${enable_mp4}, ${enable} )")
- int add(StreamProxyDto streamProxyDto);
+ @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, stream_key, enable_remove_none_reader, enable_disable_none_reader, create_time) VALUES" +
+ "(#{type}, #{name}, #{app}, #{stream}, #{mediaServerId}, #{url}, #{srcUrl}, #{dstUrl}, " +
+ "#{timeoutMs}, #{ffmpegCmdKey}, #{rtpType}, #{enableAudio}, #{enableMp4}, #{enable}, #{status}, #{streamKey}, " +
+ "#{enableRemoveNoneReader}, #{enableDisableNoneReader}, #{createTime} )")
+ int add(StreamProxyItem streamProxyDto);
- @Update("UPDATE stream_proxy " +
+ @Update("UPDATE wvp_stream_proxy " +
"SET type=#{type}, " +
+ "name=#{name}," +
"app=#{app}," +
"stream=#{stream}," +
"url=#{url}, " +
- "src_url=#{src_url}," +
- "dst_url=#{dst_url}, " +
- "timeout_ms=#{timeout_ms}, " +
- "ffmpeg_cmd_key=#{ffmpeg_cmd_key}, " +
- "rtp_type=#{rtp_type}, " +
- "enable_hls=#{enable_hls}, " +
+ "media_server_id=#{mediaServerId}, " +
+ "src_url=#{srcUrl}," +
+ "dst_url=#{dstUrl}, " +
+ "timeout_ms=#{timeoutMs}, " +
+ "ffmpeg_cmd_key=#{ffmpegCmdKey}, " +
+ "rtp_type=#{rtpType}, " +
+ "enable_audio=#{enableAudio}, " +
"enable=#{enable}, " +
- "enable_mp4=#{enable_mp4} " +
+ "status=#{status}, " +
+ "stream_key=#{streamKey}, " +
+ "enable_remove_none_reader=#{enableRemoveNoneReader}, " +
+ "enable_disable_none_reader=#{enableDisableNoneReader}, " +
+ "enable_mp4=#{enableMp4} " +
"WHERE app=#{app} AND stream=#{stream}")
- int update(StreamProxyDto streamProxyDto);
+ int update(StreamProxyItem streamProxyDto);
- @Delete("DELETE FROM stream_proxy WHERE app=#{app} AND stream=#{stream}")
+ @Delete("DELETE FROM wvp_stream_proxy WHERE app=#{app} AND stream=#{stream}")
int del(String app, String stream);
- @Select("SELECT * FROM stream_proxy")
- List<StreamProxyDto> selectAll();
+ @Select("SELECT st.*, pgs.gb_id, pgs.name, pgs.longitude, pgs.latitude FROM wvp_stream_proxy st LEFT join wvp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream order by st.create_time desc")
+ List<StreamProxyItem> selectAll();
- @Select("SELECT * FROM stream_proxy WHERE enable=${enable}")
- List<StreamProxyDto> selectForEnable(boolean enable);
+ @Select("SELECT st.*, pgs.gb_id, pgs.name, pgs.longitude, pgs.latitude, 'proxy' as streamType FROM wvp_stream_proxy st LEFT join wvp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable=#{enable} order by st.create_time desc")
+ List<StreamProxyItem> selectForEnable(boolean enable);
- @Select("SELECT * FROM stream_proxy WHERE app=#{app} AND stream=#{stream}")
- StreamProxyDto selectOne(String app, String stream);
+ @Select("SELECT st.*, pgs.gb_id, pgs.name, pgs.longitude, pgs.latitude FROM wvp_stream_proxy st LEFT join wvp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.app=#{app} AND st.stream=#{stream} order by st.create_time desc")
+ StreamProxyItem selectOne(@Param("app") String app, @Param("stream") String stream);
+
+ @Select("SELECT st.*, pgs.gb_id, pgs.name, pgs.longitude, pgs.latitude FROM wvp_stream_proxy st " +
+ "LEFT join wvp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream " +
+ "WHERE st.enable=#{enable} and st.media_server_id= #{id} order by st.create_time desc")
+ List<StreamProxyItem> selectForEnableInMediaServer( @Param("id") String id, @Param("enable") boolean enable);
+
+ @Select("SELECT st.*, pgs.gb_id, pgs.name, pgs.longitude, pgs.latitude FROM wvp_stream_proxy st " +
+ "LEFT join wvp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream " +
+ "WHERE st.media_server_id= #{id} order by st.create_time desc")
+ List<StreamProxyItem> selectInMediaServer(String id);
+
+ @Update("UPDATE wvp_stream_proxy " +
+ "SET status=#{status} " +
+ "WHERE media_server_id=#{mediaServerId}")
+ void updateStatusByMediaServerId(@Param("mediaServerId") String mediaServerId, @Param("status") boolean status);
+
+ @Update("UPDATE wvp_stream_proxy " +
+ "SET status=#{status} " +
+ "WHERE app=#{app} AND stream=#{stream}")
+ int updateStatus(@Param("app") String app, @Param("stream") String stream, @Param("status") boolean status);
+
+ @Delete("DELETE FROM wvp_stream_proxy WHERE enable_remove_none_reader=true AND media_server_id=#{mediaServerId}")
+ void deleteAutoRemoveItemByMediaServerId(String mediaServerId);
+
+ @Select("SELECT st.*, pgs.gb_id, pgs.name, pgs.longitude, pgs.latitude FROM wvp_stream_proxy st LEFT join wvp_gb_stream pgs on st.app = pgs.app AND st.stream = pgs.stream WHERE st.enable_remove_none_reader=true AND st.media_server_id=#{mediaServerId} order by st.create_time desc")
+ List<StreamProxyItem> selectAutoRemoveItemByMediaServerId(String mediaServerId);
+
+ @Select("select count(1) as total, sum(status) as online from wvp_stream_proxy")
+ 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