From 59f0210d04f302cb13a3dd7ec849ae541aa3a81d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 11 二月 2022 09:47:26 +0800
Subject: [PATCH] Merge pull request #324 from SaltFish001/wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
index 248b37a..e4639e7 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/PlatformGbStreamMapper.java
@@ -32,8 +32,7 @@
"LEFT JOIN parent_platform pp ON pp.serverGBId = pgs.platformId " +
"WHERE " +
"pgs.app =#{app} " +
- "AND pgs.stream =#{stream} " +
- "GROUP BY pp.serverGBId")
+ "AND pgs.stream =#{stream} ")
List<ParentPlatform> selectByAppAndStream(String app, String stream);
@Select("SELECT pgs.*, gs.gbId FROM platform_gb_stream pgs " +
@@ -53,7 +52,7 @@
" left join platform_gb_stream pgs\n" +
" on gs.app = pgs.app and gs.stream = pgs.stream\n" +
"where pgs.platformId=#{platformId} and pgs.catalogId=#{catalogId}")
- List<PlatformCatalog> queryChannelInParentPlatformAndCatalogForCatlog(String platformId, String catalogId);
+ List<PlatformCatalog> queryChannelInParentPlatformAndCatalogForCatalog(String platformId, String catalogId);
@Delete("DELETE FROM platform_gb_stream WHERE catalogId=#{id}")
int delByCatalogId(String id);
@@ -73,6 +72,14 @@
"</script> ")
List<ParentPlatform> queryPlatFormListForGBWithGBId(String app, String stream, List<String> platforms);
- @Select("SELECT * FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream} AND platformId=#{platformId}")
- int delByAppAndStreamAndPlatform(String app, String streamId, String platformId);
+ @Delete("DELETE FROM platform_gb_stream WHERE app=#{app} AND stream=#{stream} AND platformId=#{platformId}")
+ int delByAppAndStreamAndPlatform(String app, String stream, String platformId);
+
+ @Delete("<script> "+
+ "DELETE FROM platform_gb_stream where " +
+ "<foreach collection='gbStreams' item='item' separator='or'>" +
+ "(app=#{item.app} and stream=#{item.stream}) " +
+ "</foreach>" +
+ "</script>")
+ void delByGbStreams(List<GbStream> gbStreams);
}
--
Gitblit v1.8.0