From 21506440d22a2f77d4bbeb4bb646a27b03bb9022 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期一, 07 三月 2022 09:01:14 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 106 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 92 insertions(+), 14 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 230afbc..230b23b 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,9 @@
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 com.genersoft.iot.vmp.service.bean.GPSMsgInfo;
+import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
import org.apache.ibatis.annotations.*;
import org.springframework.stereotype.Repository;
@@ -11,11 +14,12 @@
@Repository
public interface GbStreamMapper {
- @Insert("INSERT INTO gb_stream (app, stream, gbId, name, " +
- "longitude, latitude, streamType, mediaServerId, status) VALUES" +
+ @Insert("REPLACE INTO gb_stream (app, stream, gbId, name, " +
+ "longitude, latitude, streamType, mediaServerId, status, createStamp) VALUES" +
"('${app}', '${stream}', '${gbId}', '${name}', " +
"'${longitude}', '${latitude}', '${streamType}', " +
- "'${mediaServerId}', ${status})")
+ "'${mediaServerId}', ${status}, ${createStamp})")
+ @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gbStreamId")
int add(GbStream gbStream);
@Update("UPDATE gb_stream " +
@@ -28,33 +32,107 @@
"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")
- List<GbStream> selectAll();
+ @Select("<script> "+
+ "SELECT gs.* FROM gb_stream gs " +
+ "WHERE " +
+ "1=1 " +
+ " <if test='catalogId != null'> AND gs.gbId in" +
+ "(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId} and pgs.catalogId=#{catalogId})</if> " +
+ " <if test='catalogId == null'> AND gs.gbId not in" +
+ "(select pgs.gbStreamId from platform_gb_stream pgs where pgs.platformId = #{platformId}) </if> " +
+ " <if test='query != null'> AND (gs.app LIKE '%${query}%' OR gs.stream LIKE '%${query}%' OR gs.gbId LIKE '%${query}%' OR gs.name LIKE '%${query}%')</if> " +
+ " <if test='pushing == true' > AND gs.status=1</if>" +
+ " <if test='pushing == false' > AND gs.status=0</if>" +
+ " <if test='mediaServerId != null' > AND gs.mediaServerId=#{mediaServerId} </if>" +
+ " order by gs.gbId asc " +
+ "</script>")
+ List<GbStream> selectAll(String platformId, String catalogId, String query, Boolean pushing, String mediaServerId);
@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 " +
- "LEFT JOIN platform_gb_stream pgs ON gs.app = pgs.app AND gs.stream = pgs.stream " +
+ @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.gbId = pgs.gbStreamId " +
"WHERE gs.gbId = '${gbId}' AND pgs.platformId = '${platformId}'")
GbStream queryStreamInPlatform(String platformId, String gbId);
- @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 pgs.platformId = '${platformId}'")
+ @Select("SELECT gs.*, pgs.platformId as platformId, pgs.catalogId as catalogId FROM gb_stream gs " +
+ "LEFT JOIN platform_gb_stream pgs ON gs.gbId = pgs.gbStreamId " +
+ "WHERE pgs.platformId = #{platformId}")
List<GbStream> queryGbStreamListInPlatform(String platformId);
+
+
+ @Select("SELECT gs.* FROM gb_stream gs LEFT JOIN platform_gb_stream pgs " +
+ "ON gs.gbId = pgs.gbStreamId WHERE pgs.gbStreamId is NULL")
+ List<GbStream> queryStreamNotInPlatform();
@Update("UPDATE gb_stream " +
"SET status=${status} " +
"WHERE app=#{app} AND stream=#{stream}")
- void setStatus(String app, String stream, boolean status);
+ 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);
+
+ @Delete("<script> "+
+ "DELETE FROM gb_stream where " +
+ "<foreach collection='gbStreams' item='item' separator='or'>" +
+ "(app=#{item.app} and stream=#{item.stream}) " +
+ "</foreach>" +
+ "</script>")
+ void batchDelForGbStream(List<GbStream> gbStreams);
+
+ @Insert("<script> " +
+ "INSERT IGNORE into gb_stream " +
+ "(app, stream, gbId, name, " +
+ "longitude, latitude, streamType, mediaServerId, status, createStamp)" +
+ "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}, ${item.createStamp}) "+
+ "</foreach> " +
+ "</script>")
+ @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gbStreamId")
+ void batchAdd(List<StreamPushItem> subList);
+
+ @Update({"<script>" +
+ "<foreach collection='gpsMsgInfos' item='item' separator=';'>" +
+ " UPDATE" +
+ " gb_stream" +
+ " SET longitude=${item.lng}, latitude=${item.lat} " +
+ "WHERE gbId=#{item.id}"+
+ "</foreach>" +
+ "</script>"})
+ int updateStreamGPS(List<GPSMsgInfo> gpsMsgInfos);
+
+ @Select("<script> "+
+ "SELECT * FROM gb_stream where " +
+ "<foreach collection='streamPushItems' item='item' separator='or'>" +
+ "(app=#{item.app} and stream=#{item.stream}) " +
+ "</foreach>" +
+ "</script>")
+ List<GbStream> selectAllForAppAndStream(List<StreamPushItem> streamPushItems);
}
--
Gitblit v1.8.0