From 03864ae46feddc15103143d05d8a22377e616f2f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 19 七月 2022 11:13:46 +0800
Subject: [PATCH] 修复用户查询sql错误
---
src/main/java/com/genersoft/iot/vmp/storager/dao/StreamPushMapper.java | 36 ++++++++++++++++++------------------
1 files changed, 18 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 bcf57a6..895316d 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
@@ -88,10 +88,10 @@
@Insert("<script>" +
"Insert IGNORE INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
- "createTime, aliveSecond, mediaServerId) " +
+ "createTime, aliveSecond, mediaServerId, status) " +
"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.originTypeStr}',#{item.createTime}, #{item.aliveSecond}, '${item.mediaServerId}', ${item.status} )" +
" </foreach>" +
"</script>")
@Options(useGeneratedKeys = true, keyProperty = "id", keyColumn = "id")
@@ -122,41 +122,41 @@
@Select("<script> "+
"SELECT gs.* FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream " +
- "where sp.status = 1 and (gs.app, gs.stream) in" +
+ "where sp.status = 1 and (gs.app, gs.stream) in (" +
"<foreach collection='offlineStreams' item='item' separator=','>" +
- "(#{item.app}, {item.stream}) " +
- "</foreach>" +
+ "(#{item.app}, #{item.stream}) " +
+ ")</foreach>" +
"</script>")
List<GbStream> getOnlinePusherForGbInList(List<StreamPushItemFromRedis> offlineStreams);
@Update("<script> "+
- "UPDATE stream_push SET status=0 where (app, stream) in" +
+ "UPDATE stream_push SET status=0 where (app, stream) in (" +
"<foreach collection='offlineStreams' item='item' separator=','>" +
- "(#{item.app}, {item.stream}) " +
- "</foreach>" +
+ "(#{item.app}, #{item.stream}) " +
+ ")</foreach>" +
"</script>")
void offline(List<StreamPushItemFromRedis> offlineStreams);
@Select("<script> "+
"SELECT * FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream " +
- "where sp.status = 0 and (gs.app, gs.stream) in" +
- "<foreach collection='offlineStreams' item='item' separator=','>" +
- "(#{item.app}, {item.stream}) " +
+ "where sp.status = 0 and (gs.app, gs.stream) in (" +
+ "<foreach collection='onlineStreams' item='item' separator=','>" +
+ "(#{item.app}, #{item.stream}) " +
"</foreach>" +
- "</script>")
+ ") </script>")
List<GbStream> getOfflinePusherForGbInList(List<StreamPushItemFromRedis> onlineStreams);
@Update("<script> "+
- "UPDATE stream_push SET status=1 where (app, stream) in" +
- "<foreach collection='offlineStreams' item='item' separator=','>" +
- "(#{item.app}, {item.stream}) " +
- "</foreach>" +
+ "UPDATE stream_push SET status=1 where (app, stream) in (" +
+ "<foreach collection='onlineStreams' item='item' separator=','>" +
+ "(#{item.app}, #{item.stream}) " +
+ ")</foreach>" +
"</script>")
void online(List<StreamPushItemFromRedis> onlineStreams);
- @Select("SELECT gs.* FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream")
+ @Select("SELECT gs.* FROM stream_push sp left join gb_stream gs on sp.app = gs.app AND sp.stream = gs.stream where sp.status = 1")
List<GbStream> getOnlinePusherForGb();
@Update("UPDATE stream_push SET status=0")
- void allStreamOffline();
+ void setAllStreamOffline();
}
--
Gitblit v1.8.0