From 4e48eb6cab536fc15183524e3a21d3db9d1edca7 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Mon, 9 Dec 2024 14:41:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0=E9=80=9A?= =?UTF-8?q?=E9=81=93=E6=97=B6=E6=9C=AA=E8=AE=BE=E7=BD=AE=E8=AE=BE=E5=A4=87?= =?UTF-8?q?ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iot/vmp/jt1078/controller/JT1078TerminalController.java | 4 +++- .../iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java | 2 +- web_src/src/components/JTChannelEdit.vue | 1 + web_src/src/components/JTChannelList.vue | 4 +++- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java b/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java index 6f27df398..92e1a784f 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/controller/JT1078TerminalController.java @@ -109,9 +109,11 @@ public class JT1078TerminalController { @Operation(summary = "1078-新增通道", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "channel", description = "通道", required = true) @PostMapping("/channel/add") - public void addChannel(JTChannel channel){ + public JTChannel addChannel(JTChannel channel){ assert channel.getChannelId() != null; + assert channel.getTerminalDbId() != 0; service.addChannel(channel); + return channel; } @Operation(summary = "1078-删除通道", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Parameter(name = "id", description = "通道的数据库ID", required = true) diff --git a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java index 58bfc3efc..1e343d557 100644 --- a/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/jt1078PlayServiceImpl.java @@ -248,7 +248,7 @@ public class jt1078PlayServiceImpl implements Ijt1078PlayService { subscribe.removeSubscribe(hook); }, userSetting.getPlayTimeout()); - log.info("[1078-点播] phoneNumber: {}, channelId: {}, 端口: {}", phoneNumber, channelId, ssrcInfo.getPort()); + log.info("[1078-点播] phoneNumber: {}, channelId: {},IP: {}, 端口: {}", phoneNumber, channelId, mediaServer.getSdpIp(), ssrcInfo.getPort()); J9101 j9101 = new J9101(); j9101.setChannel(channelId); j9101.setIp(mediaServer.getSdpIp()); diff --git a/web_src/src/components/JTChannelEdit.vue b/web_src/src/components/JTChannelEdit.vue index b1c25bc0f..def73e837 100755 --- a/web_src/src/components/JTChannelEdit.vue +++ b/web_src/src/components/JTChannelEdit.vue @@ -74,6 +74,7 @@ export default { message: "保存成功", type: "success", }); + this.jtChannel = res.data.data }else { this.$message({ showClose: true, diff --git a/web_src/src/components/JTChannelList.vue b/web_src/src/components/JTChannelList.vue index ff7f36cbf..d7b53246c 100755 --- a/web_src/src/components/JTChannelList.vue +++ b/web_src/src/components/JTChannelList.vue @@ -309,7 +309,9 @@ export default { this.initData(); }, add: function () { - this.jtChannel = {}; + this.jtChannel = { + terminalDbId: this.deviceId + }; }, // 编辑 handleEdit(row) {