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 c3ba87a48..dc0fd5bcf 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); @@ -469,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); } } 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 900abb6af..2d7d11ccd 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 38774fb6d..14b415aa8 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 d3b23a81b..bc0c7ab5e 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) {