From fc89b7b517e191fb6c9b66fa86dd05ebab0f54c5 Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期三, 13 七月 2022 11:29:46 +0800
Subject: [PATCH] 测试提交权限
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 53 ++++++++++++++++++++++++++++++++---------------------
1 files changed, 32 insertions(+), 21 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 594c319..6c1e72d 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,7 +3,7 @@
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import org.apache.ibatis.annotations.*;
-import org.omg.PortableInterceptor.INACTIVE;
+// import org.omg.PortableInterceptor.INACTIVE;
import org.springframework.stereotype.Repository;
import java.util.Collection;
@@ -14,21 +14,23 @@
public interface StreamPushMapper {
@Insert("INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond, mediaServerId) VALUES" +
+ "pushTime, aliveSecond, mediaServerId, serverId, updateTime, createTime) VALUES" +
"('${app}', '${stream}', '${totalReaderCount}', '${originType}', '${originTypeStr}', " +
- "'${createStamp}', '${aliveSecond}', '${mediaServerId}' )")
+ "'${pushTime}', '${aliveSecond}', '${mediaServerId}' , '${serverId}' , '${updateTime}' , '${createTime}' )")
int add(StreamPushItem streamPushItem);
- @Update("UPDATE stream_push " +
- "SET app=#{app}," +
- "stream=#{stream}," +
- "mediaServerId=#{mediaServerId}," +
- "totalReaderCount=#{totalReaderCount}, " +
- "originType=#{originType}," +
- "originTypeStr=#{originTypeStr}, " +
- "createStamp=#{createStamp}, " +
- "aliveSecond=#{aliveSecond} " +
- "WHERE app=#{app} AND stream=#{stream}")
+
+ @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>" +
+ "WHERE app=#{app} AND stream=#{stream}"+
+ " </script>"})
int update(StreamPushItem streamPushItem);
@Delete("DELETE FROM stream_push WHERE app=#{app} AND stream=#{stream}")
@@ -62,7 +64,7 @@
@Select(value = {" <script>" +
"SELECT " +
"st.*, " +
- "gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude, gs.gbStreamId " +
+ "gs.gbId, gs.name, gs.longitude, gs.latitude, gs.gbStreamId " +
"from " +
"stream_push st " +
"LEFT JOIN gb_stream gs " +
@@ -70,25 +72,25 @@
"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 gs.status=1)</if>" +
- " <if test='pushing == false' > AND gs.status=0</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='mediaServerId != null' > AND st.mediaServerId=#{mediaServerId} </if>" +
- "order by st.createStamp desc" +
+ "order by st.createTime desc" +
" </script>"})
List<StreamPushItem> selectAllForList(String query, Boolean pushing, String mediaServerId);
- @Select("SELECT st.*, gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.stream order by st.createStamp desc")
+ @Select("SELECT st.*, gs.gbId, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.stream order by st.createTime desc")
List<StreamPushItem> selectAll();
- @Select("SELECT st.*, gs.gbId, gs.status, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
+ @Select("SELECT st.*, gs.gbId, gs.name, gs.longitude, gs.latitude FROM stream_push st LEFT JOIN gb_stream gs on st.app = gs.app AND st.stream = gs.stream WHERE st.app=#{app} AND st.stream=#{stream}")
StreamPushItem selectOne(String app, String stream);
@Insert("<script>" +
"Insert IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createStamp, aliveSecond, mediaServerId) " +
+ "createTime, aliveSecond, mediaServerId) " +
"VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
"( '${item.app}', '${item.stream}', '${item.totalReaderCount}', #{item.originType}, " +
- "'${item.originTypeStr}',#{item.createStamp}, #{item.aliveSecond}, '${item.mediaServerId}' )" +
+ "'${item.originTypeStr}',#{item.createTime}, #{item.aliveSecond}, '${item.mediaServerId}' )" +
" </foreach>" +
"</script>")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
@@ -106,4 +108,13 @@
@Select("SELECT sp.* FROM stream_push sp left join gb_stream gs on gs.app = sp.app and gs.stream= sp.stream WHERE sp.mediaServerId=#{mediaServerId} and gs.gbId is null")
List<StreamPushItem> selectAllByMediaServerIdWithOutGbID(String mediaServerId);
+ @Update("UPDATE stream_push " +
+ "SET status=${status} " +
+ "WHERE app=#{app} AND stream=#{stream}")
+ int updateStatus(String app, String stream, boolean status);
+
+ @Update("UPDATE stream_push " +
+ "SET status=#{status} " +
+ "WHERE mediaServerId=#{mediaServerId}")
+ void updateStatusByMediaServerId(String mediaServerId, boolean status);
}
--
Gitblit v1.8.0