roouzenn/wvp
Template
1
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

1
src/main/java/com/genersoft/iot/vmp/jt1078/bean/JTDevice.java
View File

@@ -86,7 +86,6 @@ public class JTDevice {
", 车牌颜色=" + plateColor +
", 车牌='" + plateNo + '\'' +
", 注册时间='" + registerTime + '\'' +
", 鉴权码='" + authenticationCode + '\'' +
", status=" + status +
'}';
}

2
src/main/java/com/genersoft/iot/vmp/jt1078/codec/decode/Jt808Decoder.java
View File

@@ -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;
}

2
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0100.java
View File

@@ -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());

7
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0102.java
View File

@@ -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);

28
src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/SourceDownloadServiceForJTImpl.java
View File

@@ -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) {
}
}

5
src/main/java/com/genersoft/iot/vmp/jt1078/service/impl/SourcePlaybackServiceForJTImpl.java
View File

@@ -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);

6
src/main/java/com/genersoft/iot/vmp/jt1078/session/Session.java
View File

@@ -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;