Merge branch 'wvp-28181-2.0' into main-dev

648540858

2024-03-08 1fcdf5a8f369e020e78d524db2fe3cc7ffc86293

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

@@ -20,7 +20,7 @@
            "(#{app}, #{stream}, #{gbId}, #{name}, " +
            "#{longitude}, #{latitude}, #{streamType}, " +
            "#{mediaServerId}, #{createTime})")
    @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gbStreamId")
    @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gb_stream_id")
    int add(GbStream gbStream);

    @Update("UPDATE wvp_gb_stream " +
@@ -158,7 +158,7 @@
                " <foreach collection='list' item='item' index='index' separator=';'>"+
                    "UPDATE wvp_gb_stream " +
                    " SET name=#{item.name},"+
                    " gb_id=#{item.gb_id}"+
                    " gb_id=#{item.gbId}"+
                    " WHERE app=#{item.app} and stream=#{item.stream}"+
                "</foreach>"+
            "</script>")