From d6544c0c711c3a81d675b5891462e07a645ddb3b Mon Sep 17 00:00:00 2001 From: 648540858 <18010473990@163.com> Date: Sat, 25 Sep 2021 22:48:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AA=92=E4=BD=93=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E8=8A=82=E7=82=B9=E7=AE=A1=E7=90=86ui-?= =?UTF-8?q?=E7=A7=BB=E9=99=A4=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/media/zlm/ZLMRunner.java | 5 ++++ .../iot/vmp/service/IMediaServerService.java | 2 ++ .../service/impl/MediaServerServiceImpl.java | 8 +++++++ .../vmp/vmanager/server/ServerController.java | 23 ++++++++++++++++++- web_src/src/components/MediaServerManger.vue | 22 +++++++++++++++++- web_src/src/components/service/MediaServer.js | 14 +++++++++++ 6 files changed, 72 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java index 7faebfa8..a7b39fa5 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java @@ -81,6 +81,7 @@ public class ZLMRunner implements CommandLineRunner { if (startGetMedia == null) startGetMedia = new HashMap<>(); startGetMedia.put(mediaServerItem.getId(), true); new Thread(() -> { + ZLMServerConfig zlmServerConfig = getMediaServerConfig(mediaServerItem); if (zlmServerConfig != null) { zlmServerConfig.setIp(mediaServerItem.getIp()); @@ -88,6 +89,7 @@ public class ZLMRunner implements CommandLineRunner { startGetMedia.remove(mediaServerItem.getId()); mediaServerService.handLeZLMServerConfig(zlmServerConfig); } + }).start(); } Timer timer = new Timer(); @@ -109,6 +111,9 @@ public class ZLMRunner implements CommandLineRunner { public ZLMServerConfig getMediaServerConfig(MediaServerItem mediaServerItem) { if (startGetMedia == null) { return null;} + if (mediaServerService.getOne(mediaServerItem.getId()) == null) { + return null; + } if ( startGetMedia.get(mediaServerItem.getId()) == null || !startGetMedia.get(mediaServerItem.getId())) { return null; } diff --git a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java index 81cf8f1a..b222e70f 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java +++ b/src/main/java/com/genersoft/iot/vmp/service/IMediaServerService.java @@ -57,4 +57,6 @@ public interface IMediaServerService { WVPResult checkMediaServer(String ip, int port, String secret); boolean checkMediaRecordServer(String ip, int port); + + void delete(String id); } diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index 18c1b934..1e5b0794 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -519,4 +519,12 @@ public class MediaServerServiceImpl implements IMediaServerService, CommandLineR return result; } + + @Override + public void delete(String id) { + redisUtil.zRemove(VideoManagerConstants.MEDIA_SERVERS_ONLINE_PREFIX, id); + String key = VideoManagerConstants.MEDIA_SERVER_PREFIX + id; + redisUtil.del(key); + mediaServerMapper.delOne(id); + } } diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java index 881a20a6..8445c7e2 100644 --- a/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java +++ b/src/main/java/com/genersoft/iot/vmp/vmanager/server/ServerController.java @@ -129,7 +129,7 @@ public class ServerController { }) @PostMapping(value = "/media_server/save") @ResponseBody - public WVPResult checkMediaServer(@RequestBody MediaServerItem mediaServerItem){ + public WVPResult saveMediaServer(@RequestBody MediaServerItem mediaServerItem){ if (mediaServerService.getOne(mediaServerItem.getId()) != null) { mediaServerService.update(mediaServerItem); }else { @@ -141,6 +141,27 @@ public class ServerController { return result; } + @ApiOperation("移除流媒体服务") + @ApiImplicitParams({ + @ApiImplicitParam(name="id", value = "流媒体ID", dataTypeClass = String.class) + }) + @DeleteMapping(value = "/media_server/delete") + @ResponseBody + public WVPResult deleteMediaServer(@RequestParam String id){ + if (mediaServerService.getOne(id) != null) { + mediaServerService.delete(id); + }else { + WVPResult result = new WVPResult<>(); + result.setCode(-1); + result.setMsg("未找到此节点"); + return result; + } + WVPResult result = new WVPResult<>(); + result.setCode(0); + result.setMsg("success"); + return result; + } + @ApiOperation("重启服务") diff --git a/web_src/src/components/MediaServerManger.vue b/web_src/src/components/MediaServerManger.vue index 19674d13..969d739b 100644 --- a/web_src/src/components/MediaServerManger.vue +++ b/web_src/src/components/MediaServerManger.vue @@ -18,9 +18,10 @@
{{item.id}} + 编辑 + 移除
创建时间： {{item.createTime}} - 编辑
@@ -88,6 +89,25 @@ edit: function (row){ this.$refs.mediaServerEdit.openDialog(row, this.initData) }, + del: function (row){ + this.$confirm('确认删除此节点？', '提示', { + confirmButtonText: '确定', + cancelButtonText: '取消', + type: 'warning' + }).then(() => { + this.mediaServerObj.delete(row.id, (data)=>{ + if (data.code === 0) { + this.$message({ + type: 'success', + message: '删除成功!' + }); + } + }) + + }).catch(() => { + }); + + }, getNumberByWidth(){ let candidateNums = [1, 2, 3, 4, 6, 8, 12, 24] let clientWidth = window.innerWidth - 30; diff --git a/web_src/src/components/service/MediaServer.js b/web_src/src/components/service/MediaServer.js index e9de6039..36474ead 100644 --- a/web_src/src/components/service/MediaServer.js +++ b/web_src/src/components/service/MediaServer.js @@ -80,6 +80,20 @@ class MediaServer{ console.log(error); }); } + + delete(id, callback) { + this.$axios({ + method: 'delete', + url:`/api/server/media_server/delete`, + params: { + id: id + } + }).then(function (res) { + if (typeof (callback) == "function") callback(res.data) + }).catch(function (error) { + console.log(error); + }); + } } export default MediaServer;