From 7e48d847402d2ea4da85af582529de676f30dc38 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期一, 08 五月 2023 17:56:56 +0800
Subject: [PATCH] Merge pull request #844 from xiaoQQya/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 43 +++++++++++++++++++++++++------------------
1 files changed, 25 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
index 675a8bc..492dfe3 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java
@@ -3,6 +3,7 @@
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import com.genersoft.iot.vmp.service.bean.StreamPushItemFromRedis;
+import com.genersoft.iot.vmp.vmanager.bean.ResourceBaceInfo;
import org.apache.ibatis.annotations.*;
// import org.omg.PortableInterceptor.INACTIVE;
import org.springframework.stereotype.Repository;
@@ -16,23 +17,23 @@
@Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
"pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime, pushIng, self) VALUES" +
- "('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " +
- "'${pushTime}', '${aliveSecond}', '${mediaServerId}' , '${serverId}' , '${updateTime}' , '${createTime}', " +
- "${pushIng}, ${self} )")
+ "(#{app}, #{stream}, #{totalReaderCount}, #{originType}, #{originTypeStr}, " +
+ "#{pushTime}, #{aliveSecond}, #{mediaServerId} , #{serverId} , #{updateTime} , #{createTime}, " +
+ "#{pushIng}, #{self} )")
int add(StreamPushItem streamPushItem);
@Update(value = {" <script>" +
"UPDATE stream_push " +
- "SET updateTime='${updateTime}'" +
- "<if test=\"mediaServerId != null\">, mediaServerId='${mediaServerId}'</if>" +
- "<if test=\"totalReaderCount != null\">, totalReaderCount='${totalReaderCount}'</if>" +
- "<if test=\"originType != null\">, originType=${originType}</if>" +
- "<if test=\"originTypeStr != null\">, originTypeStr='${originTypeStr}'</if>" +
- "<if test=\"pushTime != null\">, pushTime='${pushTime}'</if>" +
- "<if test=\"aliveSecond != null\">, aliveSecond='${aliveSecond}'</if>" +
- "<if test=\"pushIng != null\">, pushIng=${pushIng}</if>" +
- "<if test=\"self != null\">, self=${self}</if>" +
+ "SET updateTime=#{updateTime}" +
+ "<if test=\"mediaServerId != null\">, mediaServerId=#{mediaServerId}</if>" +
+ "<if test=\"totalReaderCount != null\">, totalReaderCount=#{totalReaderCount}</if>" +
+ "<if test=\"originType != null\">, originType=#{originType}</if>" +
+ "<if test=\"originTypeStr != null\">, originTypeStr=#{originTypeStr}</if>" +
+ "<if test=\"pushTime != null\">, pushTime=#{pushTime}</if>" +
+ "<if test=\"aliveSecond != null\">, aliveSecond=#{aliveSecond}</if>" +
+ "<if test=\"pushIng != null\">, pushIng=#{pushIng}</if>" +
+ "<if test=\"self != null\">, self=#{self}</if>" +
"WHERE app=#{app} AND stream=#{stream}"+
" </script>"})
int update(StreamPushItem streamPushItem);
@@ -75,7 +76,7 @@
"on st.app = gs.app AND st.stream = gs.stream " +
"WHERE " +
"1=1 " +
- " <if test='query != null'> AND (st.app LIKE '%${query}%' OR st.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " +
+ " <if test='query != null'> AND (st.app LIKE concat('%',#{query},'%') OR st.stream LIKE concat('%',#{query},'%') OR gs.gbId LIKE concat('%',#{query},'%') OR gs.name LIKE concat('%',#{query},'%'))</if> " +
" <if test='pushing == true' > AND (gs.gbId is null OR st.pushIng=1)</if>" +
" <if test='pushing == false' > AND (st.pushIng is null OR st.pushIng=0) </if>" +
" <if test='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" +
@@ -93,9 +94,9 @@
"Insert IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
"createTime, aliveSecond, mediaServerId, status, pushIng) " +
"VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
- "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " +
- "'${item.originTypeStr}',#{item.createTime}, #{item.aliveSecond}, '${item.mediaServerId}', ${item.status} ," +
- " ${item.pushIng} )" +
+ "( #{item.app}, #{item.stream}, #{item.totalReaderCount}, #{item.originType}, " +
+ "#{item.originTypeStr},#{item.createTime}, #{item.aliveSecond}, #{item.mediaServerId}, #{item.status} ," +
+ " #{item.pushIng} )" +
" </foreach>" +
"</script>")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
@@ -114,12 +115,12 @@
List<StreamPushItem> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
@Update("UPDATE stream_push " +
- "SET status=${status} " +
+ "SET status=#{status} " +
"WHERE app=#{app} AND stream=#{stream}")
int updateStatus(String app, String stream, boolean status);
@Update("UPDATE stream_push " +
- "SET pushIng=${pushIng} " +
+ "SET pushIng=#{pushIng} " +
"WHERE app=#{app} AND stream=#{stream}")
int updatePushStatus(String app, String stream, boolean pushIng);
@@ -171,4 +172,10 @@
@Select("SELECT CONCAT(app,stream) FROM gb_stream")
List<String> getAllAppAndStream();
+
+ @Select(value = {" <script>" +
+ " <if test='pushIngAsOnline == true'> select count(1) as total, sum(pushIng) as online from stream_push </if>" +
+ " <if test='pushIngAsOnline == false'> select count(1) as total, sum(status) as online from stream_push </if>" +
+ " </script>"})
+ ResourceBaceInfo getOverview(boolean pushIngAsOnline);
}
--
Gitblit v1.8.0