From 2be43429fba62e70493454ea45e56a9286208942 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 22 Oct 2024 22:54:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=A0=81=E6=B5=81?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E8=AE=BE=E7=BD=AE=E4=B8=8E=E9=87=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../genersoft/iot/vmp/gb28181/controller/DeviceQuery.java | 2 -- .../vmp/gb28181/service/impl/DeviceChannelServiceImpl.java | 1 - .../response/cmd/CatalogResponseMessageHandler.java | 1 + web_src/src/components/channelList.vue | 7 ++++--- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java index c3ba87a4..1dea81ee 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java @@ -243,8 +243,6 @@ public class DeviceQuery { } @Operation(summary = "修改通道的码流类型", security = @SecurityRequirement(name = JwtUtils.HEADER)) - @Parameter(name = "deviceId", description = "设备国标编号", required = true) - @Parameter(name = "channel", description = "通道信息", required = true) @PostMapping("/channel/stream/identification/update/") public void updateChannelStreamIdentification(DeviceChannel channel){ deviceChannelService.updateChannelStreamIdentification(channel); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java index 900abb6a..2d7d11cc 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java @@ -327,7 +327,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService { @Override public void updateChannelStreamIdentification(DeviceChannel channel) { - Assert.isTrue(channel.getId() > 0, "通道ID必须存在"); Assert.hasLength(channel.getStreamIdentification(), "码流标识必须存在"); if (ObjectUtils.isEmpty(channel.getStreamIdentification())) { log.info("[重置通道码流类型] 设备: {}, 码流： {}", channel.getDeviceId(), channel.getStreamIdentification()); diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java index 38774fb6..14b415aa 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java @@ -84,6 +84,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp } @Scheduled(fixedDelay = 200) + @Transactional public void executeTaskQueue(){ if (taskQueue.isEmpty()) { return; diff --git a/web_src/src/components/channelList.vue b/web_src/src/components/channelList.vue index d3b23a81..bc0c7ab5 100755 --- a/web_src/src/components/channelList.vue +++ b/web_src/src/components/channelList.vue @@ -494,8 +494,9 @@ export default { method: 'post', url: `/api/device/query/channel/stream/identification/update/`, params: { - deviceId: this.deviceId, + deviceDbId: this.device.id, streamIdentification: this.subStream + } }).then((res)=> { console.log(JSON.stringify(res)); @@ -513,8 +514,8 @@ export default { method: 'post', url: `/api/device/query/channel/stream/identification/update/`, params: { - deviceId: this.deviceId, - channelId: row.channelId, + deviceDbId: row.deviceDbId, + id: row.id, streamIdentification: row.streamIdentification } }).then(function (res) { From 3f330aeb37f94bc210b27ff4b9ca903eb415d285 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: Tue, 22 Oct 2024 23:10:26 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=97=B6=E6=97=A0=E6=88=AA=E5=9B=BE=E6=97=B6?= =?UTF-8?q?=E9=BB=98=E8=AE=A4=E8=BF=94=E5=9B=9E204?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java index 1dea81ee..dc0fd5bc 100755 --- a/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java +++ b/src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java @@ -467,7 +467,7 @@ public class DeviceQuery { in.close(); outputStream.close(); } catch (IOException e) { - resp.setStatus(HttpServletResponse.SC_NOT_FOUND); + resp.setStatus(HttpServletResponse.SC_NO_CONTENT); } }