[1078] 优化鉴权码位置,支持1078国标级联
This commit is contained in:
@@ -11,4 +11,7 @@ public class CommonRecordInfo {
|
||||
// 结束时间
|
||||
private String endTime;
|
||||
|
||||
// 文件大小 单位byte
|
||||
private String fileSize;
|
||||
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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(可选)")
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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;
|
||||
// }
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -86,7 +86,6 @@ public class JTDevice {
|
||||
", 车牌颜色=" + plateColor +
|
||||
", 车牌='" + plateNo + '\'' +
|
||||
", 注册时间='" + registerTime + '\'' +
|
||||
", 鉴权码='" + authenticationCode + '\'' +
|
||||
", status=" + status +
|
||||
'}';
|
||||
}
|
||||
|
||||
@@ -42,7 +42,6 @@ public class Jt808Decoder extends ByteToMessageDecoder {
|
||||
|
||||
@Override
|
||||
protected void decode(ChannelHandlerContext ctx, ByteBuf in, List<Object> out) throws Exception {
|
||||
in.retain();
|
||||
Session session = ctx.channel().attr(Session.KEY).get();
|
||||
log.info("> {} hex: 7e{}7e", session, ByteBufUtil.hexDump(in));
|
||||
try {
|
||||
@@ -76,7 +75,6 @@ public class Jt808Decoder extends ByteToMessageDecoder {
|
||||
Re handler = CodecFactory.getHandler(header.getMsgId());
|
||||
if (handler == null) {
|
||||
log.error("get msgId is null {}", header.getMsgId());
|
||||
in.skipBytes(in.readableBytes());
|
||||
buf.release();
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -91,7 +91,7 @@ public class J0100 extends Re {
|
||||
j8100.setResult(J8100.SUCCESS);
|
||||
String authenticationCode = UUID.randomUUID().toString();
|
||||
j8100.setCode(authenticationCode);
|
||||
deviceForUpdate.setAuthenticationCode(authenticationCode);
|
||||
session.setAuthenticationCode(authenticationCode);
|
||||
deviceForUpdate.setStatus(true);
|
||||
deviceForUpdate.setProvinceId(device.getProvinceId());
|
||||
deviceForUpdate.setRegisterTime(DateUtil.getNow());
|
||||
|
||||
@@ -42,15 +42,16 @@ public class J0102 extends Re {
|
||||
|
||||
@Override
|
||||
protected Rs handler(Header header, Session session, Ijt1078Service service) {
|
||||
JTDevice device = service.getDevice(header.getPhoneNumber());
|
||||
J8001 j8001 = new J8001();
|
||||
j8001.setRespNo(header.getSn());
|
||||
j8001.setRespId(header.getMsgId());
|
||||
if (device == null || !device.getAuthenticationCode().equals(authenticationCode)) {
|
||||
if (session.getAuthenticationCode() == null ||
|
||||
!session.getAuthenticationCode().equals(authenticationCode)) {
|
||||
j8001.setResult(J8001.FAIL);
|
||||
}else {
|
||||
j8001.setResult(J8001.SUCCESS);
|
||||
if (!device.isStatus()) {
|
||||
JTDevice device = service.getDevice(header.getPhoneNumber());
|
||||
if (device != null && !device.isStatus()) {
|
||||
deviceForUpdate = device;
|
||||
deviceForUpdate.setStatus(true);
|
||||
service.updateDevice(device);
|
||||
|
||||
@@ -1,28 +0,0 @@
|
||||
package com.genersoft.iot.vmp.jt1078.service.impl;
|
||||
|
||||
import com.genersoft.iot.vmp.common.InviteSessionType;
|
||||
import com.genersoft.iot.vmp.common.StreamInfo;
|
||||
import com.genersoft.iot.vmp.common.enums.ChannelDataType;
|
||||
import com.genersoft.iot.vmp.gb28181.bean.CommonGBChannel;
|
||||
import com.genersoft.iot.vmp.gb28181.service.IPlayService;
|
||||
import com.genersoft.iot.vmp.gb28181.service.ISourceDownloadService;
|
||||
import com.genersoft.iot.vmp.service.bean.ErrorCallback;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.stereotype.Service;
|
||||
|
||||
@Slf4j
|
||||
@Service(ChannelDataType.DOWNLOAD_SERVICE + ChannelDataType.JT_1078)
|
||||
public class SourceDownloadServiceForJTImpl implements ISourceDownloadService {
|
||||
|
||||
|
||||
@Override
|
||||
public void download(CommonGBChannel channel, Long startTime, Long stopTime, Integer downloadSpeed, ErrorCallback<StreamInfo> callback) {
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void stopDownload(CommonGBChannel channel, String stream) {
|
||||
|
||||
}
|
||||
}
|
||||
@@ -49,8 +49,8 @@ public class SourcePlaybackServiceForJTImpl implements ISourcePlaybackService {
|
||||
Assert.notNull(device, "设备不存在");
|
||||
jt1078Template.checkTerminalStatus(device.getPhoneNumber());
|
||||
|
||||
playService.playback(device.getPhoneNumber(), jtChannel.getChannelId(), DateUtil.timestampMsTo_yyyy_MM_dd_HH_mm_ss(startTime),
|
||||
DateUtil.timestampMsTo_yyyy_MM_dd_HH_mm_ss(stopTime), 0, 0, 0, 0, result -> {
|
||||
playService.playback(device.getPhoneNumber(), jtChannel.getChannelId(), DateUtil.timestampTo_yyyy_MM_dd_HH_mm_ss(startTime),
|
||||
DateUtil.timestampTo_yyyy_MM_dd_HH_mm_ss(stopTime), 0, 0, 0, 0, result -> {
|
||||
callback.run(result.getCode(), result.getMsg(), result.getData());
|
||||
});
|
||||
}
|
||||
@@ -123,6 +123,7 @@ public class SourcePlaybackServiceForJTImpl implements ISourcePlaybackService {
|
||||
CommonRecordInfo commonRecordInfo = new CommonRecordInfo();
|
||||
commonRecordInfo.setStartTime(jRecordItem.getStartTime());
|
||||
commonRecordInfo.setEndTime(jRecordItem.getEndTime());
|
||||
commonRecordInfo.setFileSize(jRecordItem.getSize() + "");
|
||||
recordInfoList.add(commonRecordInfo);
|
||||
}
|
||||
callback.run(ErrorCode.SUCCESS.getCode(), ErrorCode.SUCCESS.getMsg(), recordInfoList);
|
||||
|
||||
@@ -5,6 +5,7 @@ import io.netty.channel.Channel;
|
||||
import io.netty.channel.ChannelFuture;
|
||||
import io.netty.util.AttributeKey;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import lombok.extern.slf4j.Slf4j;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
@@ -35,6 +36,11 @@ public class Session {
|
||||
@Getter
|
||||
private String phoneNumber;
|
||||
|
||||
// 设备手机号
|
||||
@Setter
|
||||
@Getter
|
||||
private String authenticationCode;
|
||||
|
||||
// 创建时间
|
||||
@Getter
|
||||
private final long creationTime;
|
||||
|
||||
@@ -257,7 +257,6 @@ public class ZLMMediaServerStatusManager {
|
||||
String hookPrefix = String.format("%s://%s:%s%s/index/hook", protocol, mediaServerItem.getHookIp(), serverPort, (serverServletContextPath == null || "/".equals(serverServletContextPath)) ? "" : serverServletContextPath);
|
||||
|
||||
Map<String, Object> param = new HashMap<>();
|
||||
param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline
|
||||
if (mediaServerItem.getRtspPort() != 0) {
|
||||
param.put("ffmpeg.snap", "%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s");
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user