支持推流通道预导入

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

@@ -4,6 +4,7 @@ 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;
 
@@ -82,7 +83,7 @@ public interface GbStreamMapper {
     void batchDel(List<StreamProxyItem> streamProxyItemList);
 
     @Insert("<script> " +
-            "insert into gb_stream " +
+            "REPLACE into gb_stream " +
             "(app, stream, gbId, name, " +
             "longitude, latitude, streamType, mediaServerId, status)" +
             "values " +
@@ -94,7 +95,6 @@ public interface GbStreamMapper {
             "</script>")
     void batchAdd(List<StreamPushItem> subList);
 
-
     @Update({"<script>" +
             "<foreach collection='gpsMsgInfos' item='item' separator=';'>" +
             " UPDATE" +

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

@@ -52,7 +52,7 @@ public interface StreamPushMapper {
     @Insert("<script>"  +
             "INSERT INTO stream_push (app, stream, totalReaderCount, originType, originTypeStr, " +
             "createStamp, aliveSecond, mediaServerId) " +
-            "VALUES <foreach collection='streamPushItems' item='item' index='index' >" +
+            "VALUES <foreach collection='streamPushItems' item='item' index='index' separator=','>" +
             "( '${item.app}', '${item.stream}', '${item.totalReaderCount}', '${item.originType}', " +
             "'${item.originTypeStr}','${item.createStamp}', '${item.aliveSecond}', '${item.mediaServerId}' )" +
             " </foreach>" +