为推流列表增加批量移除功能

src/main/java/com/genersoft/iot/vmp/service/IGbStreamService.java

@@ -43,4 +43,5 @@ public interface IGbStreamService {
     DeviceChannel getDeviceChannelListByStream(GbStream gbStream, String catalogId, String deviceGBId);
 
     void sendCatalogMsg(GbStream gbStream, String type);
+    void sendCatalogMsgs(List<GbStream> gbStreams, String type);
 }

src/main/java/com/genersoft/iot/vmp/service/IStreamPushService.java

@@ -66,4 +66,6 @@ public interface IStreamPushService {
     boolean saveToRandomGB();
 
     void batchAdd(List<StreamPushItem> streamPushExcelDtoList);
+
+    boolean batchStop(List<GbStream> streamPushItems);
 }

src/main/java/com/genersoft/iot/vmp/service/impl/GbStreamServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.jdbc.datasource.DataSourceTransactionManager;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.TransactionDefinition;
 import org.springframework.transaction.TransactionStatus;
+import org.springframework.util.StringUtils;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -144,8 +145,16 @@ public class GbStreamServiceImpl implements IGbStreamService {
                 gbStreams.add(streamProxyItem);
             }
         }
+        sendCatalogMsgs(gbStreams, type);
+    }
+
+    @Override
+    public void sendCatalogMsgs(List<GbStream> gbStreams, String type) {
         if (gbStreams.size() > 0) {
             for (GbStream gs : gbStreams) {
+                if (StringUtils.isEmpty(gs.getGbId())){
+                    continue;
+                }
                 List<ParentPlatform> parentPlatforms = platformGbStreamMapper.selectByAppAndStream(gs.getApp(), gs.getStream());
                 if (parentPlatforms.size() > 0) {
                     for (ParentPlatform parentPlatform : parentPlatforms) {

src/main/java/com/genersoft/iot/vmp/service/impl/StreamPushServiceImpl.java

@@ -355,8 +355,26 @@ public class StreamPushServiceImpl implements IStreamPushService {
                     }
                 }
             }
+        }
+    }
+
+    @Override
+    public boolean batchStop(List<GbStream> gbStreams) {
+        if (gbStreams == null || gbStreams.size() == 0) {
+            return false;
+        }
+        gbStreamService.sendCatalogMsgs(gbStreams, CatalogEvent.DEL);
 
+        int delStream = streamPushMapper.delAllForGbStream(gbStreams);
+        gbStreamMapper.batchDelForGbStream(gbStreams);
+        platformGbStreamMapper.delByGbStreams(gbStreams);
+        if (delStream > 0) {
+            for (GbStream gbStream : gbStreams) {
+                MediaServerItem mediaServerItem = mediaServerService.getOne(gbStream.getMediaServerId());
+                zlmresTfulUtils.closeStreams(mediaServerItem, gbStream.getApp(), gbStream.getStream());
+            }
 
         }
+        return true;
     }
 }

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

@@ -84,6 +84,14 @@ public interface GbStreamMapper {
             "</script>")
     void batchDel(List<StreamProxyItem> streamProxyItemList);
 
+    @Delete("<script> "+
+            "DELETE FROM gb_stream where " +
+            "<foreach collection='gbStreams' item='item' separator='or'>" +
+            "(app=#{item.app} and stream=#{item.stream}) " +
+            "</foreach>" +
+            "</script>")
+    void batchDelForGbStream(List<GbStream> gbStreams);
+
     @Insert("<script> " +
             "REPLACE into gb_stream " +
             "(app, stream, gbId, name, " +

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

@@ -74,4 +74,12 @@ public interface PlatformGbStreamMapper {
 
     @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);
 }

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

@@ -1,5 +1,6 @@
 package com.genersoft.iot.vmp.storager.dao;
 
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Repository;
@@ -48,7 +49,13 @@ public interface StreamPushMapper {
             "</script>")
     int delAll(List<StreamPushItem> streamPushItems);
 
-    
+    @Delete("<script> "+
+            "DELETE FROM stream_push where " +
+            "<foreach collection='gbStreams' item='item' separator='or'>" +
+            "(app=#{item.app} and stream=#{item.stream}) " +
+            "</foreach>" +
+            "</script>")
+    int delAllForGbStream(List<GbStream> gbStreams);
 
 
     @Select(value = {" <script>" +

src/main/java/com/genersoft/iot/vmp/vmanager/bean/BatchGBStreamParam.java

@@ -0,0 +1,17 @@
+package com.genersoft.iot.vmp.vmanager.bean;
+
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+
+import java.util.List;
+
+public class BatchGBStreamParam {
+    private List<GbStream> gbStreams;
+
+    public List<GbStream> getGbStreams() {
+        return gbStreams;
+    }
+
+    public void setGbStreams(List<GbStream> gbStreams) {
+        this.gbStreams = gbStreams;
+    }
+}

src/main/java/com/genersoft/iot/vmp/vmanager/streamPush/StreamPushController.java

@@ -10,6 +10,7 @@ import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
 import com.genersoft.iot.vmp.service.IMediaServerService;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.service.impl.StreamPushUploadFileHandler;
+import com.genersoft.iot.vmp.vmanager.bean.BatchGBStreamParam;
 import com.genersoft.iot.vmp.vmanager.bean.StreamPushExcelDto;
 import com.genersoft.iot.vmp.vmanager.bean.WVPResult;
 import com.github.pagehelper.PageInfo;
@@ -116,13 +117,32 @@ public class StreamPushController {
     })
     @PostMapping(value = "/stop")
     @ResponseBody
-    public Object removeFormGB(@RequestParam(required = true)String app, @RequestParam(required = true)String streamId){
+    public Object stop(String app, String streamId){
         if (streamPushService.stop(app, streamId)){
             return "success";
         }else {
             return "fail";
         }
     }
+
+    @ApiOperation("中止多个推流")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "app", value = "应用名", required = true, dataTypeClass = String.class),
+            @ApiImplicitParam(name = "streamId", value = "流ID", required = true, dataTypeClass = String.class),
+    })
+    @DeleteMapping(value = "/batchStop")
+    @ResponseBody
+    public Object batchStop(@RequestBody BatchGBStreamParam batchGBStreamParam){
+        if (batchGBStreamParam.getGbStreams().size() == 0) {
+            return "fail";
+        }
+        if (streamPushService.batchStop(batchGBStreamParam.getGbStreams())){
+            return "success";
+        }else {
+            return "fail";
+        }
+    }
+
     @PostMapping(value = "upload")
     @ResponseBody
     public DeferredResult<ResponseEntity<WVPResult<Object>>> uploadChannelFile(@RequestParam(value = "file") MultipartFile file){

web_src/src/components/PushVideoList.vue

@@ -30,10 +30,17 @@
           <el-button icon="el-icon-download" size="mini" style="margin-right: 1rem;" type="primary" >
             <a style="color: #FFFFFF; text-align: center; text-decoration: none" href="/static/file/推流通道导入.zip" download='推流通道导入.zip' >下载模板</a>
           </el-button>
+          <el-button icon="el-icon-delete" size="mini" style="margin-right: 1rem;" :disabled="multipleSelection.length === 0" type="danger" @click="batchDel">批量移除</el-button>
         </div>
 				<devicePlayer ref="devicePlayer"></devicePlayer>
 				<addStreamTOGB ref="addStreamTOGB"></addStreamTOGB>
-				<el-table :data="pushList" border style="width: 100%" :height="winHeight">
+				<el-table ref="pushListTable" :data="pushList" border style="width: 100%" :height="winHeight" @selection-change="handleSelectionChange" :row-key="(row)=> row.app + row.stream">
+          <el-table-column
+            align="center"
+            type="selection"
+            :reserve-selection="true"
+            width="55">
+          </el-table-column>
 					<el-table-column prop="name" label="名称" width="180" align="center">
 					</el-table-column>
 					<el-table-column prop="app" label="APP" width="180" align="center">
@@ -60,8 +67,8 @@
 					<el-table-column label="操作" width="360" align="center" fixed="right">
 						<template slot-scope="scope">
 							<el-button-group>
-								<el-button size="mini" icon="el-icon-video-play" v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status" @click="playPuhsh(scope.row)">播放</el-button>
+								<el-button size="mini" icon="el-icon-video-play" v-if="(scope.row.status == false && scope.row.gbId == null) || scope.row.status" @click="playPush(scope.row)">播放</el-button>
-								<el-button size="mini" icon="el-icon-switch-button" type="danger" @click="stopPuhsh(scope.row)">移除</el-button>
+								<el-button size="mini" icon="el-icon-delete" type="danger" @click="stopPush(scope.row)">移除</el-button>
 								<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!!scope.row.gbId" @click="addToGB(scope.row)">加入国标</el-button>
 								<el-button size="mini" icon="el-icon-position" type="primary" v-if="!!scope.row.gbId" @click="removeFromGB(scope.row)">移出国标</el-button>
 							</el-button-group>
@@ -107,7 +114,7 @@
 				currentPusher: {}, //当前操作设备对象
 				updateLooper: 0, //数据刷新轮训标志
 				currentDeviceChannelsLenth:0,
-				winHeight: window.innerHeight - 200,
+				winHeight: window.innerHeight - 250,
         mediaServerObj : new MediaServer(),
 				currentPage:1,
 				count:15,
@@ -116,6 +123,7 @@
         pushing: "",
         mediaServerId: "",
         mediaServerList: [],
+        multipleSelection: [],
 				getDeviceListLoading: false
 			};
 		},
@@ -123,7 +131,7 @@
 		},
 		mounted() {
 			this.initData();
-			this.updateLooper = setInterval(this.initData, 2000);
+			this.updateLooper = setInterval(this.getPushList, 2000);
 		},
 		destroyed() {
 			clearTimeout(this.updateLooper);
@@ -131,7 +139,6 @@
 		methods: {
 			initData: function() {
         this.mediaServerObj.getOnlineMediaServerList((data)=>{
-          console.log(data)
           this.mediaServerList = data.data;
         })
 				this.getPushList();
@@ -162,12 +169,12 @@
 					that.pushList = res.data.list;
 					that.getDeviceListLoading = false;
 				}).catch(function (error) {
-					console.log(error);
+					console.error(error);
 					that.getDeviceListLoading = false;
 				});
 			},
 
-			playPuhsh: function(row){
+			playPush: function(row){
 				let that = this;
 				this.getListLoading = true;
 				this.$axios({
@@ -185,12 +192,12 @@
                         hasAudio: true
                     });
 				}).catch(function (error) {
-					console.log(error);
+					console.error(error);
 					that.getListLoading = false;
 				});
 			},
-			stopPuhsh: function(row){
+			stopPush: function(row){
-        var that = this;
+        let that = this;
         that.$axios({
           method:"post",
           url:"/api/push/stop",
@@ -203,14 +210,14 @@
             that.initData()
           }
         }).catch(function (error) {
-          console.log(error);
+          console.error(error);
         });
 			},
 			addToGB: function(row){
 				this.$refs.addStreamTOGB.openDialog({app: row.app, stream: row.stream, mediaServerId: row.mediaServerId}, this.initData);
 			},
 			removeFromGB: function(row){
-				var that = this;
+        let that = this;
 				that.$axios({
             method:"delete",
             url:"/api/push/remove_form_gb",
@@ -220,12 +227,12 @@
 							that.initData()
 						}
         }).catch(function (error) {
-            console.log(error);
+            console.error(error);
         });
 			},
 			dateFormat: function(/** timestamp=0 **/) {
-				var ts = arguments[0] || 0;
+        let ts = arguments[0] || 0;
-				var t,y,m,d,h,i,s;
+        let t,y,m,d,h,i,s;
 				t = ts ? new Date(ts*1000) : new Date();
 				y = t.getFullYear();
 				m = t.getMonth()+1;
@@ -240,6 +247,32 @@
         this.$refs.importChannel.openDialog(()=>{
 
         })
+      },
+      batchDel: function () {
+        this.$confirm(`确定删除选中的${this.multipleSelection.length}个通道?`, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(() => {
+          let that = this;
+          that.$axios({
+            method:"delete",
+            url:"/api/push/batchStop",
+            data: {
+              gbStreams: this.multipleSelection
+            }
+          }).then((res)=>{
+            this.initData();
+            this.$refs.pushListTable.clearSelection();
+          }).catch(function (error) {
+            console.error(error);
+          });
+        }).catch(() => {
+
+        });
+      },
+      handleSelectionChange: function (val) {
+        this.multipleSelection = val;
       },
 		}
 	};

web_src/src/components/dialog/importChannel.vue

@@ -45,8 +45,8 @@ export default {
       showDialog: false,
       isLoging: false,
       isEdit: false,
-      errorStreams: null,
+      errorStreams: [],
-      errorGBIds: null,
+      errorGBIds: [],
       uploadUrl: process.env.NODE_ENV === 'development'?`debug/api/push/upload`:`api/push/upload`,
     };
   },