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

[1078] 优化鉴权码位置，支持1078国标级联

Browse Source
This commit is contained in:
lin
2025-08-06 15:17:44 +08:00
parent e555df52d3
commit 1da487f02a
20 changed files with 129 additions and 647 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/gb28181/bean/CommonRecordInfo.java
View File

@@ -11,4 +11,7 @@ public class CommonRecordInfo {
// 结束时间
private String endTime;
// 文件大小 单位byte
private String fileSize;
}

73
src/main/java/com/genersoft/iot/vmp/gb28181/bean/RecordInfo.java
View File

@@ -2,15 +2,19 @@ package com.genersoft.iot.vmp.gb28181.bean;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Getter;
import lombok.Setter;
import java.time.Instant;
import java.util.List;
/**
* @description:设备录像信息bean
/**
* @description:设备录像信息bean
* @author: swwheihei
* @date: 2020年5月8日 下午2:05:56
* @date: 2020年5月8日 下午2:05:56
*/
@Setter
@Getter
@Schema(description = "设备录像查询结果信息")
public class RecordInfo {
@@ -36,67 +40,4 @@ public class RecordInfo {
@Schema(description = "")
private List<RecordItem> recordList;
public String getDeviceId() {
return deviceId;
}
public void setDeviceId(String deviceId) {
this.deviceId = deviceId;
}
public String getName() {
return name;
}
public void setName(String name) {
this.name = name;
}
public int getSumNum() {
return sumNum;
}
public void setSumNum(int sumNum) {
this.sumNum = sumNum;
}
public List<RecordItem> getRecordList() {
return recordList;
}
public void setRecordList(List<RecordItem> recordList) {
this.recordList = recordList;
}
public String getChannelId() {
return channelId;
}
public void setChannelId(String channelId) {
this.channelId = channelId;
}
public String getSn() {
return sn;
}
public void setSn(String sn) {
this.sn = sn;
}
public Instant getLastTime() {
return lastTime;
}
public void setLastTime(Instant lastTime) {
this.lastTime = lastTime;
}
public int getCount() {
return count;
}
public void setCount(int count) {
this.count = count;
}
}

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

@@ -44,7 +44,7 @@ public class RecordItem implements Comparable<RecordItem>{
@Schema(description = "保密属性(必选)缺省为0;0:不涉密,1:涉密")
private int secrecy;
@Schema(description = "录像产生类型(可选)time或alarm 或 manua")
@Schema(description = "录像产生类型(可选)time或alarm 或 manual")
private String type;
@Schema(description = "录像触发者ID(可选)")

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

@@ -101,6 +101,7 @@ public class SourcePlaybackServiceForGbImpl implements ISourcePlaybackService {
CommonRecordInfo recordInfo = new CommonRecordInfo();
recordInfo.setStartTime(recordItem.getStartTime());
recordInfo.setEndTime(recordItem.getEndTime());
recordInfo.setFileSize(recordItem.getFileSize());
recordInfoList.add(recordInfo);
}
callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), recordInfoList);

147
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/message/query/cmd/RecordInfoQueryMessageHandler.java
View File

@@ -1,13 +1,11 @@
package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl.message.query.cmd;
import com.genersoft.iot.vmp.common.enums.ChannelDataType;
import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
import com.genersoft.iot.vmp.gb28181.bean.Device;
import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
import com.genersoft.iot.vmp.gb28181.bean.Platform;
import com.genersoft.iot.vmp.gb28181.bean.*;
import com.genersoft.iot.vmp.gb28181.event.record.RecordInfoEventListener;
import com.genersoft.iot.vmp.gb28181.service.IDeviceChannelService;
import com.genersoft.iot.vmp.gb28181.service.IDeviceService;
import com.genersoft.iot.vmp.gb28181.service.IGbChannelPlayService;
import com.genersoft.iot.vmp.gb28181.service.IGbChannelService;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;
import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderForPlatform;
@@ -27,6 +25,8 @@ import javax.sip.RequestEvent;
import javax.sip.SipException;
import javax.sip.message.Response;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
@Slf4j
@Component
@@ -40,6 +40,9 @@ public class RecordInfoQueryMessageHandler extends SIPRequestProcessorParent imp
@Autowired
private IGbChannelService channelService;
@Autowired
private IGbChannelPlayService playService;
@Autowired
private IDeviceService deviceService;
@@ -105,55 +108,105 @@ public class RecordInfoQueryMessageHandler extends SIPRequestProcessorParent imp
}
return;
}
if (channel.getDataType() != ChannelDataType.GB28181) {
log.info("[平台查询录像记录] 只支持查询国标28181的录像数据 {}/{}", platform.getName(), channelId );
try {
responseAck(request, Response.NOT_IMPLEMENTED); // 回复未实现
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 平台查询录像记录: {}", e.getMessage());
if (channel.getDataType() == ChannelDataType.GB28181) {
Device device = deviceService.getDevice(channel.getDataDeviceId());
if (device == null) {
log.warn("[平台查询录像记录] 未找到通道对应的设备 {}/{}", platform.getName(), channelId );
try {
responseAck(request, Response.BAD_REQUEST);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] [平台查询录像记录] 未找到通道对应的设备: {}", e.getMessage());
}
return;
}
return;
}
Device device = deviceService.getDevice(channel.getDataDeviceId());
if (device == null) {
log.warn("[平台查询录像记录] 未找到通道对应的设备 {}/{}", platform.getName(), channelId );
// 获取通道的原始信息
DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId());
// 接收录像数据
recordInfoEventListener.addEndEventHandler(device.getDeviceId(), deviceChannel.getDeviceId(), (recordInfo)->{
try {
log.info("[国标级联] 录像查询收到数据， 通道： {}，准备转发===", channelId);
cmderFroPlatform.recordInfo(channel, platform, request.getFromTag(), recordInfo);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 国标级联 回复录像数据: {}", e.getMessage());
}
});
try {
responseAck(request, Response.BAD_REQUEST);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] [平台查询录像记录] 未找到通道对应的设备: {}", e.getMessage());
commander.recordInfoQuery(device, deviceChannel.getDeviceId(), DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime), sn, secrecy, type, (eventResult -> {
// 回复200 OK
try {
responseAck(request, Response.OK);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
}
}),(eventResult -> {
// 查询失败
try {
responseAck(request, eventResult.statusCode, eventResult.msg);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
}
}));
} catch (InvalidArgumentException | ParseException | SipException e) {
log.error("[命令发送失败] 录像查询: {}", e.getMessage());
}
return;
}
// 获取通道的原始信息
DeviceChannel deviceChannel = deviceChannelService.getOneForSourceById(channel.getGbId());
// 接收录像数据
recordInfoEventListener.addEndEventHandler(device.getDeviceId(), deviceChannel.getDeviceId(), (recordInfo)->{
}else {
// 回复200 OK
try {
log.info("[国标级联] 录像查询收到数据， 通道： {}，准备转发===", channelId);
cmderFroPlatform.recordInfo(channel, platform, request.getFromTag(), recordInfo);
responseAck(request, Response.OK);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 国标级联 回复录像数据: {}", e.getMessage());
log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
}
});
try {
commander.recordInfoQuery(device, deviceChannel.getDeviceId(), DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime), sn, secrecy, type, (eventResult -> {
// 回复200 OK
try {
responseAck(request, Response.OK);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
}
}),(eventResult -> {
// 查询失败
try {
responseAck(request, eventResult.statusCode, eventResult.msg);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 录像查询回复: {}", e.getMessage());
}
}));
} catch (InvalidArgumentException | ParseException | SipException e) {
log.error("[命令发送失败] 录像查询: {}", e.getMessage());
playService.queryRecord(channel, DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(startTime),
DateUtil.ISO8601Toyyyy_MM_dd_HH_mm_ss(endTime),
(code, msg, commonRecordInfoList) -> {
RecordInfo recordInfo = new RecordInfo();
recordInfo.setSumNum(commonRecordInfoList.size());
recordInfo.setChannelId(channelId);
recordInfo.setSn(sn + "");
List<RecordItem> recordList = new ArrayList<>(commonRecordInfoList.size());
for (int i = 0; i < commonRecordInfoList.size(); i++) {
CommonRecordInfo commonRecordInfo = commonRecordInfoList.get(i);
RecordItem recordItem = new RecordItem();
recordItem.setDeviceId(channelId);
recordItem.setName(commonRecordInfo.getStartTime());
recordItem.setFilePath("/" + commonRecordInfo.getStartTime());
recordItem.setAddress("/" + commonRecordInfo.getStartTime());
recordItem.setStartTime(commonRecordInfo.getStartTime());
recordItem.setEndTime(commonRecordInfo.getEndTime());
recordItem.setSecrecy(0);
recordItem.setRecorderId("");
recordItem.setType("");
recordItem.setFileSize(commonRecordInfo.getFileSize());
recordList.add(recordItem);
}
recordInfo.setRecordList(recordList);
try {
log.info("[国标级联] 录像查询收到数据， 通道： {}，准备转发===", channelId);
cmderFroPlatform.recordInfo(channel, platform, request.getFromTag(), recordInfo);
} catch (SipException | InvalidArgumentException | ParseException e) {
log.error("[命令发送失败] 国标级联 回复录像数据: {}", e.getMessage());
}
});
}
//
//
//
//
//
//
//
// if (channel.getDataType() != ChannelDataType.GB28181) {
// log.info("[平台查询录像记录] 只支持查询国标28181的录像数据 {}/{}", platform.getName(), channelId );
// try {
// responseAck(request, Response.NOT_IMPLEMENTED); // 回复未实现
// } catch (SipException | InvalidArgumentException | ParseException e) {
// log.error("[命令发送失败] 平台查询录像记录: {}", e.getMessage());
// }
// return;
// }
}
}