From 2d423d9668312fe75986af3c78c0228ce352e48d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 15 九月 2023 09:35:14 +0800
Subject: [PATCH] Merge branch 'xinchuang' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 6 +++---
1 files changed, 3 insertions(+), 3 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
old mode 100644
new mode 100755
index 5f8702c..414181e
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java
@@ -14,7 +14,7 @@
@Repository
public interface GbStreamMapper {
- @Insert("REPLACE INTO wvp_gb_stream (app, stream, gb_id, name, " +
+ @Insert("INSERT INTO wvp_gb_stream (app, stream, gb_id, name, " +
"longitude, latitude, stream_type,media_server_id,create_time) VALUES" +
"(#{app}, #{stream}, #{gbId}, #{name}, " +
"#{longitude}, #{latitude}, #{streamType}, " +
@@ -117,7 +117,7 @@
void batchDelForGbStream(List<GbStream> gbStreams);
@Insert("<script> " +
- "INSERT IGNORE into wvp_gb_stream " +
+ "INSERT into wvp_gb_stream " +
"(app, stream, gb_id, name, " +
"longitude, latitude, stream_type,media_server_id,create_time)" +
"values " +
@@ -127,7 +127,7 @@
"#{item.mediaServerId}, #{item.createTime}) "+
"</foreach> " +
"</script>")
- @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gbStreamId")
+ @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gb_stream_id")
void batchAdd(List<StreamPushItem> subList);
@Update({"<script>" +
--
Gitblit v1.8.0