Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

pull/1669/head
648540858 2024-10-23 09:58:14 +08:00
parent 02ab2ba311 3f330aeb37
commit 1dde0a0225
4 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/genersoft/iot/vmp/gb28181/controller/DeviceQuery.java
View File

@ -243,8 +243,6 @@ public class DeviceQuery {
} }
@Operation(summary = "修改通道的码流类型", security = @SecurityRequirement(name = JwtUtils.HEADER)) @Operation(summary = "修改通道的码流类型", security = @SecurityRequirement(name = JwtUtils.HEADER))
@Parameter(name = "deviceId", description = "设备国标编号", required = true)
@Parameter(name = "channel", description = "通道信息", required = true)
@PostMapping("/channel/stream/identification/update/") @PostMapping("/channel/stream/identification/update/")
public void updateChannelStreamIdentification(DeviceChannel channel){ public void updateChannelStreamIdentification(DeviceChannel channel){
deviceChannelService.updateChannelStreamIdentification(channel); deviceChannelService.updateChannelStreamIdentification(channel);
@ -469,7 +467,7 @@ public class DeviceQuery {
in.close(); in.close();
outputStream.close(); outputStream.close();
} catch (IOException e) { } catch (IOException e) {
resp.setStatus(HttpServletResponse.SC_NOT_FOUND); resp.setStatus(HttpServletResponse.SC_NO_CONTENT);
} }
} }

1
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/DeviceChannelServiceImpl.java
View File

@ -327,7 +327,6 @@ public class DeviceChannelServiceImpl implements IDeviceChannelService {
@Override @Override
public void updateChannelStreamIdentification(DeviceChannel channel) { public void updateChannelStreamIdentification(DeviceChannel channel) {
Assert.isTrue(channel.getId() > 0, "通道ID必须存在");
Assert.hasLength(channel.getStreamIdentification(), "码流标识必须存在"); Assert.hasLength(channel.getStreamIdentification(), "码流标识必须存在");
if (ObjectUtils.isEmpty(channel.getStreamIdentification())) { if (ObjectUtils.isEmpty(channel.getStreamIdentification())) {
log.info("[重置通道码流类型] 设备: {}, 码流： {}", channel.getDeviceId(), channel.getStreamIdentification()); log.info("[重置通道码流类型] 设备: {}, 码流： {}", channel.getDeviceId(), channel.getStreamIdentification());

1
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/response/cmd/CatalogResponseMessageHandler.java
View File

@ -84,6 +84,7 @@ public class CatalogResponseMessageHandler extends SIPRequestProcessorParent imp
} }
@Scheduled(fixedDelay = 200) @Scheduled(fixedDelay = 200)
@Transactional
public void executeTaskQueue(){ public void executeTaskQueue(){
if (taskQueue.isEmpty()) { if (taskQueue.isEmpty()) {
return; return;

7
web_src/src/components/channelList.vue
View File

@ -494,8 +494,9 @@ export default {
method: 'post', method: 'post',
url: `/api/device/query/channel/stream/identification/update/`, url: `/api/device/query/channel/stream/identification/update/`,
params: { params: {
deviceId: this.deviceId, deviceDbId: this.device.id,
streamIdentification: this.subStream streamIdentification: this.subStream
} }
}).then((res)=> { }).then((res)=> {
console.log(JSON.stringify(res)); console.log(JSON.stringify(res));
@ -513,8 +514,8 @@ export default {
method: 'post', method: 'post',
url: `/api/device/query/channel/stream/identification/update/`, url: `/api/device/query/channel/stream/identification/update/`,
params: { params: {
deviceId: this.deviceId, deviceDbId: row.deviceDbId,
channelId: row.channelId, id: row.id,
streamIdentification: row.streamIdentification streamIdentification: row.streamIdentification
} }
}).then(function (res) { }).then(function (res) {