roouzenn/wvp
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1078-添加位置附加信息定义

Browse Source
This commit is contained in:
648540858
2024-04-08 18:15:02 +08:00
parent d54787f323
commit 9badf1c7fe
4 changed files with 200 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0200.java
View File

@@ -24,11 +24,11 @@ import org.springframework.context.ApplicationEvent;
public class J0200 extends Re {
private final static Logger log = LoggerFactory.getLogger(J0100.class);
private JTPositionInfo positionInfo;
private JTPositionBaseInfo positionInfo;
@Override
protected Rs decode0(ByteBuf buf, Header header, Session session) {
positionInfo = new JTPositionInfo();
positionInfo = new JTPositionBaseInfo();
int alarmSignInt = buf.readInt();
positionInfo.setAlarmSign(new JTAlarmSign(alarmSignInt));
@@ -43,15 +43,18 @@ public class J0200 extends Re {
byte[] timeBytes = new byte[6];
buf.readBytes(timeBytes);
positionInfo.setTime(BCDUtil.transform(timeBytes));
// 支持1078的视频报警上报
int alarm = buf.readInt();
int loss = buf.readInt();
int occlusion = buf.readInt();
short storageFault = buf.readShort();
short driving = buf.readShort();
JTVideoAlarm videoAlarm = JTVideoAlarm.getInstance(alarm, loss, occlusion, storageFault, driving);
positionInfo.setVideoAlarm(videoAlarm);
boolean readable = buf.isReadable();
// 读取附加信息
if (buf.isReadable()) {
// 支持1078的视频报警上报
int alarm = buf.readInt();
int loss = buf.readInt();
int occlusion = buf.readInt();
short storageFault = buf.readShort();
short driving = buf.readShort();
JTVideoAlarm videoAlarm = JTVideoAlarm.getInstance(alarm, loss, occlusion, storageFault, driving);
positionInfo.setVideoAlarm(videoAlarm);
}
log.info("[JT-位置汇报]: {}", positionInfo.toString());
return null;
}