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-06-06 07:26:20 +08:00
parent 5c826ef449
commit f7d811a299
36 changed files with 184 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/com/genersoft/iot/vmp/jt1078/proc/Header.java
View File

@@ -15,7 +15,7 @@ public class Header {
Integer msgPro;
// 终端手机号
String terminalPhoneNumber;
String phoneNumber;
// 消息体流水号
Integer sn;
@@ -41,12 +41,12 @@ public class Header {
this.msgPro = msgPro;
}
public String getTerminalPhoneNumber() {
return terminalPhoneNumber;
public String getPhoneNumber() {
return phoneNumber;
}
public void setTerminalPhoneNumber(String terminalPhoneNumber) {
this.terminalPhoneNumber = terminalPhoneNumber;
public void setPhoneNumber(String phoneNumber) {
this.phoneNumber = phoneNumber;
}
public Integer getSn() {
@@ -79,7 +79,7 @@ public class Header {
return "Header{" +
"消息ID='" + msgId + '\'' +
", 消息体属性=" + msgPro +
", 终端手机号='" + terminalPhoneNumber + '\'' +
", 终端手机号='" + phoneNumber + '\'' +
", 消息体流水号=" + sn +
", 协议版本号=" + version +
'}';

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

@@ -36,7 +36,7 @@ public class J0001 extends Re {
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0001", (long) respNo, result);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0001", (long) respNo, result);
return null;
}

4
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0003.java
View File

@@ -28,13 +28,13 @@ public class J0003 extends Re {
respNo = buf.readUnsignedShort();
respId = ByteBufUtil.hexDump(buf.readSlice(2));
result = buf.readUnsignedByte();
log.info("[JT-注销] 设备： {}", header.getTerminalPhoneNumber());
log.info("[JT-注销] 设备： {}", header.getPhoneNumber());
return null;
}
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0001", (long) respNo, result);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0001", (long) respNo, result);
return null;
}

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

@@ -46,7 +46,7 @@ public class J0100 extends Re {
device.setDeviceModel(buf.readCharSequence(30, Charset.forName("GBK"))
.toString().trim());
device.setDeviceId(buf.readCharSequence(30, Charset.forName("GBK"))
device.setTerminalId(buf.readCharSequence(30, Charset.forName("GBK"))
.toString().trim());
device.setPlateColor(buf.readByte());
@@ -66,7 +66,7 @@ public class J0100 extends Re {
byte[] bytes7 = new byte[7];
buf.readBytes(bytes7);
device.setDeviceId(new String(bytes7).trim());
device.setTerminalId(new String(bytes7).trim());
device.setPlateColor(buf.readByte());
byte[] plateColorBytes = new byte[buf.readableBytes()];
@@ -85,7 +85,7 @@ public class J0100 extends Re {
J8100 j8100 = new J8100();
j8100.setRespNo(header.getSn());
// 从数据库判断这个设备是否合法
JTDevice deviceInDb = service.getDevice(header.getTerminalPhoneNumber());
JTDevice deviceInDb = service.getDevice(header.getPhoneNumber());
if (deviceInDb != null) {
j8100.setResult(J8100.SUCCESS);
String authenticationCode = UUID.randomUUID().toString();
@@ -105,14 +105,14 @@ public class J0100 extends Re {
}
deviceInDb.setDeviceModel(device.getDeviceModel());
deviceInDb.setMakerId(device.getMakerId());
deviceInDb.setDeviceId(device.getDeviceId());
deviceInDb.setTerminalId(device.getTerminalId());
// TODO 支持直接展示车牌颜色的描述
deviceInDb.setPlateColor(device.getPlateColor());
deviceInDb.setPlateNo(device.getPlateNo());
service.updateDevice(deviceInDb);
log.info("[JT-注册成功] 设备： {}", deviceInDb);
}else {
log.info("[JT-注册失败] 未授权设备： {}", header.getTerminalPhoneNumber());
log.info("[JT-注册失败] 未授权设备： {}", header.getPhoneNumber());
j8100.setResult(J8100.FAIL);
// 断开连接，清理资源
if (session.isRegistered()) {

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

@@ -37,7 +37,7 @@ public class J0102 extends Re {
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
JTDevice device = service.getDevice(header.getTerminalPhoneNumber());
JTDevice device = service.getDevice(header.getPhoneNumber());
J8001 j8001 = new J8001();
j8001.setRespNo(header.getSn());
j8001.setRespId(header.getMsgId());

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

@@ -164,7 +164,7 @@ public class J0104 extends Re {
throw new RuntimeException(e);
}
}
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0104", (long) respNo, deviceConfig);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0104", (long) respNo, deviceConfig);
return null;
}

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

@@ -60,7 +60,7 @@ public class J0107 extends Re {
deviceAttribute.setGnssAttribute(JTGnssAttribute.getInstance(buf.readUnsignedByte()));
deviceAttribute.setCommunicationModuleAttribute(JTCommunicationModuleAttribute.getInstance(buf.readUnsignedByte()));
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0107", null, deviceAttribute);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0107", null, deviceAttribute);
return null;
}

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

@@ -89,7 +89,7 @@ public class J0200 extends Re {
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
JTDevice deviceInDb = service.getDevice(header.getTerminalPhoneNumber());
JTDevice deviceInDb = service.getDevice(header.getPhoneNumber());
J8001 j8001 = new J8001();
j8001.setRespNo(header.getSn());
j8001.setRespId(header.getMsgId());

4
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0201.java
View File

@@ -33,13 +33,13 @@ public class J0201 extends Re {
positionInfo = JTPositionBaseInfo.decode(buf);
log.info("[JT-位置信息查询应答]: {}", positionInfo.toString());
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0201", (long) respNo, positionInfo);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0201", (long) respNo, positionInfo);
return null;
}
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
JTDevice deviceInDb = service.getDevice(header.getTerminalPhoneNumber());
JTDevice deviceInDb = service.getDevice(header.getPhoneNumber());
J8001 j8001 = new J8001();
j8001.setRespNo(header.getSn());
j8001.setRespId(header.getMsgId());

4
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0500.java
View File

@@ -28,13 +28,13 @@ public class J0500 extends Re {
int respNo = buf.readUnsignedShort();
positionInfo = JTPositionBaseInfo.decode(buf);
log.info("[JT-车辆控制应答]: {}", positionInfo.toString());
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0500", (long) respNo, positionInfo);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0500", (long) respNo, positionInfo);
return null;
}
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
JTDevice deviceInDb = service.getDevice(header.getTerminalPhoneNumber());
JTDevice deviceInDb = service.getDevice(header.getPhoneNumber());
J8001 j8001 = new J8001();
j8001.setRespNo(header.getSn());
j8001.setRespId(header.getMsgId());

10
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0608.java
View File

@@ -33,7 +33,7 @@ public class J0608 extends Re {
log.info("[JT-查询区域或线路数据应答]: 类型： {}， 数量： {}", type, dataLength);
List<JTAreaOrRoute> areaOrRoutes = new ArrayList<>();
if (dataLength == 0) {
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0608", null, areaOrRoutes);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0608", null, areaOrRoutes);
return null;
}
switch (type) {
@@ -46,7 +46,7 @@ public class J0608 extends Re {
JTCircleArea jtCircleArea = JTCircleArea.decode(buf);
jtCircleAreas.add(jtCircleArea);
}
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0608", null, jtCircleAreas);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0608", null, jtCircleAreas);
break;
case 2:
buf.readUnsignedByte();
@@ -58,7 +58,7 @@ public class J0608 extends Re {
JTRectangleArea jtRectangleArea = JTRectangleArea.decode(buf);
jtRectangleAreas.add(jtRectangleArea);
}
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0608", null, jtRectangleAreas);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0608", null, jtRectangleAreas);
break;
case 3:
// 查询多 边形区域数据
@@ -68,7 +68,7 @@ public class J0608 extends Re {
JTPolygonArea jtRectangleArea = JTPolygonArea.decode(buf);
jtPolygonAreas.add(jtRectangleArea);
}
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0608", null, jtPolygonAreas);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0608", null, jtPolygonAreas);
break;
case 4:
// 查询线路数据
@@ -78,7 +78,7 @@ public class J0608 extends Re {
JTRoute jtRoute = JTRoute.decode(buf);
jtRoutes.add(jtRoute);
}
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0608", null, jtRoutes);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0608", null, jtRoutes);
break;
default:
break;

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

@@ -27,7 +27,7 @@ public class J0702 extends Re {
protected Rs decode0(ByteBuf buf, Header header, Session session) {
driverInformation = JTDriverInformation.decode(buf);
log.info("[JT-驾驶员身份信息采集上报]: {}", driverInformation.toString());
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0702", null, driverInformation);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0702", null, driverInformation);
return null;
}

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

@@ -70,7 +70,7 @@ public class J0801 extends Re {
log.info("[JT-多媒体数据上传] 写入文件失败", e);
}
log.info("[JT-多媒体数据上传]: {}", mediaEventInfo);
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0801", null, mediaEventInfo);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0801", null, mediaEventInfo);
return null;
}

4
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0802.java
View File

@@ -34,7 +34,7 @@ public class J0802 extends Re {
int length = buf.readUnsignedShort();
if (length == 0) {
log.info("[JT-存储多媒体数据检索应答]: {}", length);
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0802", (long) respNo, new ArrayList<>());
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0802", (long) respNo, new ArrayList<>());
return null;
}
mediaDataInfoList = new ArrayList<>(length);
@@ -42,7 +42,7 @@ public class J0802 extends Re {
mediaDataInfoList.add(JTMediaDataInfo.decode(buf));
}
log.info("[JT-存储多媒体数据检索应答]: {}", mediaDataInfoList.size());
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0802", (long) respNo, mediaDataInfoList);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0802", (long) respNo, mediaDataInfoList);
return null;
}

4
src/main/java/com/genersoft/iot/vmp/jt1078/proc/request/J0805.java
View File

@@ -39,13 +39,13 @@ public class J0805 extends Re {
ids.add(buf.readUnsignedInt());
}
}
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0805", null, ids);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0805", null, ids);
return null;
}
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "0001", (long) respNo, result);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "0001", (long) respNo, result);
return null;
}

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

@@ -23,7 +23,7 @@ public class J1003 extends Re {
@Override
protected Rs decode0(ByteBuf buf, Header header, Session session) {
mediaAttribute = JTMediaAttribute.decode(buf);
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "1003", null, mediaAttribute);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "1003", null, mediaAttribute);
return null;
}

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

@@ -49,7 +49,7 @@ public class J1205 extends Re {
@Override
protected Rs handler(Header header, Session session, Ijt1078Service service) {
SessionManager.INSTANCE.response(header.getTerminalPhoneNumber(), "1205", (long) respNo, recordList);
SessionManager.INSTANCE.response(header.getPhoneNumber(), "1205", (long) respNo, recordList);
J8001 j8001 = new J8001();
j8001.setRespNo(header.getSn());
j8001.setRespId(header.getMsgId());

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

@@ -24,7 +24,7 @@ public abstract class Re {
public Rs decode(ByteBuf buf, Header header, Session session, Ijt1078Service service) {
if (session != null && !StringUtils.hasLength(session.getDevId())) {
session.register(header.getTerminalPhoneNumber(), (int) header.getVersion(), header);
session.register(header.getPhoneNumber(), (int) header.getVersion(), header);
}
Rs rs = decode0(buf, header, session);
Rs rsHand = handler(header, session, service);