XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复录制计划开启录像失败的BUG

Browse Source
This commit is contained in:
lin
2025-04-09 16:48:50 +08:00
parent 693cbf0efb
commit 481609ef72
8 changed files with 39 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/genersoft/iot/vmp/conf/redis/RedisRpcConfig.java
View File

@@ -18,7 +18,6 @@ import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import javax.sip.message.Response;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.util.HashMap; import java.util.HashMap;

2
src/main/java/com/genersoft/iot/vmp/gb28181/bean/GroupTree.java
View File

@@ -2,10 +2,12 @@ package com.genersoft.iot.vmp.gb28181.bean;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
/** /**
* 业务分组 * 业务分组
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@Schema(description = "业务分组树") @Schema(description = "业务分组树")
public class GroupTree extends Group{ public class GroupTree extends Group{

2
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RegionTree.java
View File

@@ -2,10 +2,12 @@ package com.genersoft.iot.vmp.gb28181.bean;
import io.swagger.v3.oas.annotations.media.Schema; import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
/** /**
* 区域 * 区域
*/ */
@EqualsAndHashCode(callSuper = true)
@Data @Data
@Schema(description = "区域树") @Schema(description = "区域树")
public class RegionTree extends Region { public class RegionTree extends Region {

9
src/main/java/com/genersoft/iot/vmp/gb28181/service/impl/PlayServiceImpl.java
View File

@@ -1723,7 +1723,14 @@ public class PlayServiceImpl implements IPlayService {
throw new PlayException(Response.SERVER_INTERNAL_ERROR, "server internal error"); throw new PlayException(Response.SERVER_INTERNAL_ERROR, "server internal error");
} }
DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId()); DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId());
play(device, deviceChannel, callback);
MediaServer mediaServerItem = getNewMediaServerItem(device);
if (mediaServerItem == null) {
log.warn("[点播] 未找到可用的zlm deviceId: {},channelId:{}", device.getDeviceId(), deviceChannel.getDeviceId());
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未找到可用的zlm");
}
play(mediaServerItem, device, deviceChannel, null, record, callback);
} }
@Override @Override

7
src/main/java/com/genersoft/iot/vmp/streamPush/service/impl/StreamPushServiceImpl.java
View File

@@ -51,6 +51,7 @@ public class StreamPushServiceImpl implements IStreamPushService {
private UserSetting userSetting; private UserSetting userSetting;
@Autowired @Autowired
private IMediaServerService mediaServerService; private IMediaServerService mediaServerService;
@Autowired @Autowired
@@ -576,13 +577,13 @@ public class StreamPushServiceImpl implements IStreamPushService {
if (streamPushList.isEmpty()) { if (streamPushList.isEmpty()) {
return; return;
} }
List<CommonGBChannel> commonGBChannelList = new ArrayList<>(); Set<Integer> channelIds = new HashSet<>();
streamPushList.stream().forEach(streamPush -> { streamPushList.stream().forEach(streamPush -> {
if (streamPush.getGbDeviceId() != null) { if (streamPush.getGbDeviceId() != null) {
commonGBChannelList.add(streamPush.buildCommonGBChannel()); channelIds.add(streamPush.getGbId());
} }
}); });
streamPushMapper.batchDel(streamPushList); streamPushMapper.batchDel(streamPushList);
gbChannelService.delete(ids); gbChannelService.delete(channelIds);
} }
} }

17
src/main/java/com/genersoft/iot/vmp/vmanager/cloudRecord/CloudRecordController.java
View File

@@ -55,7 +55,12 @@ public class CloudRecordController {
@Parameter(name = "year", description = "年，置空则查询当年", required = false) @Parameter(name = "year", description = "年，置空则查询当年", required = false)
@Parameter(name = "month", description = "月，置空则查询当月", required = false) @Parameter(name = "month", description = "月，置空则查询当月", required = false)
@Parameter(name = "mediaServerId", description = "流媒体ID，置空则查询全部", required = false) @Parameter(name = "mediaServerId", description = "流媒体ID，置空则查询全部", required = false)
public List<String> openRtpServer(@RequestParam(required = true) String app, @RequestParam(required = true) String stream, @RequestParam(required = false) Integer year, @RequestParam(required = false) Integer month, @RequestParam(required = false) String mediaServerId public List<String> openRtpServer(
@RequestParam(required = true) String app,
@RequestParam(required = true) String stream,
@RequestParam(required = false) Integer year,
@RequestParam(required = false) Integer month,
@RequestParam(required = false) String mediaServerId
) { ) {
log.info("[云端录像] 查询存在云端录像的日期 app->{}, stream->{}, mediaServerId->{}, year->{}, month->{}", app, stream, mediaServerId, year, month); log.info("[云端录像] 查询存在云端录像的日期 app->{}, stream->{}, mediaServerId->{}, year->{}, month->{}", app, stream, mediaServerId, year, month);
@@ -96,7 +101,15 @@ public class CloudRecordController {
@Parameter(name = "endTime", description = "结束时间(yyyy-MM-dd HH:mm:ss)", required = false) @Parameter(name = "endTime", description = "结束时间(yyyy-MM-dd HH:mm:ss)", required = false)
@Parameter(name = "mediaServerId", description = "流媒体ID，置空则查询全部流媒体", required = false) @Parameter(name = "mediaServerId", description = "流媒体ID，置空则查询全部流媒体", required = false)
@Parameter(name = "callId", description = "每次录像的唯一标识，置空则查询全部流媒体", required = false) @Parameter(name = "callId", description = "每次录像的唯一标识，置空则查询全部流媒体", required = false)
public PageInfo<CloudRecordItem> openRtpServer(@RequestParam(required = false) String query, @RequestParam(required = false) String app, @RequestParam(required = false) String stream, @RequestParam int page, @RequestParam int count, @RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime, @RequestParam(required = false) String mediaServerId, @RequestParam(required = false) String callId public PageInfo<CloudRecordItem> openRtpServer(@RequestParam(required = false) String query,
@RequestParam(required = false) String app,
@RequestParam(required = false) String stream,
@RequestParam int page,
@RequestParam int count,
@RequestParam(required = false) String startTime,
@RequestParam(required = false) String endTime,
@RequestParam(required = false) String mediaServerId,
@RequestParam(required = false) String callId
) { ) {
log.info("[云端录像] 查询 app->{}, stream->{}, mediaServerId->{}, page->{}, count->{}, startTime->{}, endTime->{}, callId->{}", app, stream, mediaServerId, page, count, startTime, endTime, callId); log.info("[云端录像] 查询 app->{}, stream->{}, mediaServerId->{}, page->{}, count->{}, startTime->{}, endTime->{}, callId->{}", app, stream, mediaServerId, page, count, startTime, endTime, callId);

9
src/main/java/com/genersoft/iot/vmp/web/gb28181/ApiControlController.java
View File

@@ -37,10 +37,9 @@ public class ApiControlController {
* @param channel 通道序号 * @param channel 通道序号
* @param code 通道编号 * @param code 通道编号
* @param speed 速度(0~255) 默认值: 129 * @param speed 速度(0~255) 默认值: 129
* @return
*/ */
@GetMapping(value = "/ptz") @GetMapping(value = "/ptz")
private void list(String serial,String command, private void ptz(String serial,String command,
@RequestParam(required = false)Integer channel, @RequestParam(required = false)Integer channel,
@RequestParam(required = false)String code, @RequestParam(required = false)String code,
@RequestParam(required = false)Integer speed){ @RequestParam(required = false)Integer speed){
@@ -55,7 +54,7 @@ public class ApiControlController {
if (device == null) { if (device == null) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "device[ " + serial + " ]未找到"); throw new ControllerException(ErrorCode.ERROR100.getCode(), "device[ " + serial + " ]未找到");
} }
int cmdCode = 0; int cmdCode = -1;
switch (command){ switch (command){
case "left": case "left":
cmdCode = 2; cmdCode = 2;
@@ -93,6 +92,9 @@ public class ApiControlController {
default: default:
break; break;
} }
if (cmdCode == -1) {
throw new ControllerException(ErrorCode.ERROR100.getCode(), "未识别的指令：" + command);
}
// 默认值 50 // 默认值 50
try { try {
cmder.frontEndCmd(device, code, cmdCode, speed, speed, speed); cmder.frontEndCmd(device, code, cmdCode, speed, speed, speed);
@@ -110,7 +112,6 @@ public class ApiControlController {
* @param command 控制指令 允许值: set, goto, remove * @param command 控制指令 允许值: set, goto, remove
* @param preset 预置位编号(1~255) * @param preset 预置位编号(1~255)
* @param name 预置位名称, command=set 时有效 * @param name 预置位名称, command=set 时有效
* @return
*/ */
@GetMapping(value = "/preset") @GetMapping(value = "/preset")
private void list(String serial,String command, private void list(String serial,String command,

6
web_src/static/js/ZLMRTCClient.js
View File

@@ -6560,7 +6560,7 @@ var ZLMRTCClient = (function (exports) {
resolve(response); resolve(response);
} else { } else {
reject(new AxiosError_1( reject(new AxiosError_1(
'Request failed with status code ' + response.status, '请求失败， 状态码：' + response.status,
[AxiosError_1.ERR_BAD_REQUEST, AxiosError_1.ERR_BAD_RESPONSE][Math.floor(response.status / 100) - 4], [AxiosError_1.ERR_BAD_REQUEST, AxiosError_1.ERR_BAD_RESPONSE][Math.floor(response.status / 100) - 4],
response.config, response.config,
response.request, response.request,
@@ -7885,7 +7885,7 @@ var ZLMRTCClient = (function (exports) {
}).then(response => { }).then(response => {
let ret = response.data; //JSON.parse(response.data); let ret = response.data; //JSON.parse(response.data);
if (ret.code != 0) { if (ret.code != 0) {
// mean failed for offer/anwser exchange // mean failed for offer/anwser exchange
this.dispatch(Events$1.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, ret); this.dispatch(Events$1.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, ret);
return; return;
} }
@@ -7989,7 +7989,7 @@ var ZLMRTCClient = (function (exports) {
}).then(response => { }).then(response => {
let ret = response.data; //JSON.parse(response.data); let ret = response.data; //JSON.parse(response.data);
if (ret.code != 0) { if (ret.code != 0) {
// mean failed for offer/anwser exchange // mean failed for offer/anwser exchange
this.dispatch(Events$1.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, ret); this.dispatch(Events$1.WEBRTC_OFFER_ANWSER_EXCHANGE_FAILED, ret);
return; return;
} }