From 458e7d18b77f0f47be2969491b42de9b6d8b27f0 Mon Sep 17 00:00:00 2001
From: lin <18010473990@163.com>
Date: 星期五, 07 一月 2022 19:37:05 +0800
Subject: [PATCH] 添加接收redis订阅的GPS消息，为GPS订阅发送到级联平台做准备
---
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
index 1fdc6d8..fa6b51c 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
@@ -2,6 +2,7 @@
import com.genersoft.iot.vmp.gb28181.bean.GbStream;
import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
+import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -28,24 +29,27 @@
"latitude=#{latitude}," +
"mediaServerId=#{mediaServerId}," +
"status=${status} " +
- "WHERE app=#{app} AND stream=#{stream} AND gbId=#{gbId}")
+ "WHERE app=#{app} AND stream=#{stream}")
int update(GbStream gbStream);
@Delete("DELETE FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
int del(String app, String stream);
- @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream")
+ @Select("SELECT gs.*, pgs.platformId AS platformId, pgs.catalogId AS catalogId FROM gb_stream gs LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream")
List<GbStream> selectAll();
@Select("SELECT * FROM gb_stream WHERE app=#{app} AND stream=#{stream}")
StreamProxyItem selectOne(String app, String stream);
- @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
+ @Select("SELECT * FROM gb_stream WHERE gbId=#{gbId}")
+ List<GbStream> selectByGBId(String gbId);
+
+ @Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
"WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'")
- GbStream queryStreamInPlatform(String platformId, String gbId);
+ List<GbStream> queryStreamInPlatform(String platformId, String gbId);
- @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs " +
+ @Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " +
"LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
"WHERE pgs.platformId = '${platformId}'")
List<GbStream> queryGbStreamListInPlatform(String platformId);
@@ -55,6 +59,32 @@
"WHERE app=#{app} AND stream=#{stream}")
int setStatus(String app, String stream, boolean status);
- @Select("SELECT gs.*, pgs.platformId FROM gb_stream gs LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream WHERE mediaServerId=#{mediaServerId} ")
- List<GbStream> selectAllByMediaServerId(String mediaServerId);
+ @Update("UPDATE gb_stream " +
+ "SET status=${status} " +
+ "WHERE mediaServerId=#{mediaServerId} ")
+ void updateStatusByMediaServerId(String mediaServerId, boolean status);
+
+ @Delete("DELETE FROM gb_stream WHERE streamType=#{type} AND gbId=NULL AND mediaServerId=#{mediaServerId}")
+ void deleteWithoutGBId(String type, String mediaServerId);
+
+ @Delete("<script> "+
+ "DELETE FROM gb_stream where " +
+ "<foreach collection='streamProxyItemList' item='item' separator='or'>" +
+ "(app=#{item.app} and stream=#{item.stream}) " +
+ "</foreach>" +
+ "</script>")
+ void batchDel(List<StreamProxyItem> streamProxyItemList);
+
+ @Insert("<script> " +
+ "insert into gb_stream " +
+ "(app, stream, gbId, name, " +
+ "longitude, latitude, streamType, mediaServerId, status)" +
+ "values " +
+ "<foreach collection='subList' index='index' item='item' separator=','> " +
+ "('${item.app}', '${item.stream}', '${item.gbId}', '${item.name}', " +
+ "'${item.longitude}', '${item.latitude}', '${item.streamType}', " +
+ "'${item.mediaServerId}', ${item.status}) "+
+ "</foreach> " +
+ "</script>")
+ void batchAdd(List<StreamPushItem> subList);
}
--
Gitblit v1.8.0