From b96d580168ed877fc4cf24f3208066d6fea6e114 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 01 十二月 2022 10:40:49 +0800
Subject: [PATCH] Merge pull request #689 from AlphaWu/Zafu-Dev-1129
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 22 +++++++++++++++++-----
1 files changed, 17 insertions(+), 5 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 9921a70..ec51f11 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;
@@ -15,9 +16,10 @@
public interface StreamPushMapper {
@Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime, pushIng) VALUES" +
+ "pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime, pushIng, self) VALUES" +
"('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " +
- "'${pushTime}', '${aliveSecond}', '${mediaServerId}' , '${serverId}' , '${updateTime}' , '${createTime}', ${pushIng} )")
+ "'${pushTime}', '${aliveSecond}', '${mediaServerId}' , '${serverId}' , '${updateTime}' , '${createTime}', " +
+ "${pushIng}, ${self} )")
int add(StreamPushItem streamPushItem);
@@ -31,6 +33,7 @@
"<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);
@@ -74,8 +77,8 @@
"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='pushing == true' > AND (gs.gbId is null OR st.status=1)</if>" +
- " <if test='pushing == false' > AND st.status=0</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>" +
"order by st.createTime desc" +
" </script>"})
@@ -119,7 +122,7 @@
@Update("UPDATE stream_push " +
"SET pushIng=${pushIng} " +
"WHERE app=#{app} AND stream=#{stream}")
- int updatePushStatus(String app, String stream, boolean status);
+ int updatePushStatus(String app, String stream, boolean pushIng);
@Update("UPDATE stream_push " +
"SET status=#{status} " +
@@ -166,4 +169,13 @@
@Update("UPDATE stream_push SET status=0")
void setAllStreamOffline();
+
+ @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