Merge branch 'xinchuang' into wvp-28181-2.0

648540858

2023-09-15 2d423d9668312fe75986af3c78c0228ce352e48d

 src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java

old mode 100644
new mode 100755
@@ -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>" +