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

1078-添加设备属性查询接口

Browse Source
This commit is contained in:
648540858
2024-04-30 12:13:49 +08:00
parent 5be7c7636e
commit 7bdde6907a
2 changed files with 53 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,6 +16,7 @@ import com.genersoft.iot.vmp.jt1078.session.Session;
import com.genersoft.iot.vmp.jt1078.session.SessionManager;
import com.genersoft.iot.vmp.jt1078.util.BCDUtil;
import io.netty.buffer.ByteBuf;
import io.netty.buffer.ByteBufUtil;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,60 +45,37 @@ public class J0107 extends Re {
@Override
protected Rs decode0(ByteBuf buf, Header header, Session session) {
respNo = buf.readUnsignedShort();
paramLength = (int) buf.readUnsignedByte();
if (paramLength <= 0) {
return null;
}
// respNo = buf.readUnsignedShort();
// paramLength = (int) buf.readUnsignedByte();
// if (paramLength <= 0) {
// return null;
// }
JTDeviceAttribute deviceAttribute = new JTDeviceAttribute();
deviceAttribute.setType(JTDeviceType.getInstance(buf.getUnsignedShort(0)));
deviceAttribute.setType(JTDeviceType.getInstance(buf.readUnsignedShort()));
byte[] bytes5 = new byte[5];
buf.getBytes(2, bytes5);
deviceAttribute.setMakerId(new String(bytes5).trim());
deviceAttribute.setMakerId(buf.readCharSequence(5, Charset.forName("GBK")).toString().trim());
byte[] bytes20 = new byte[20];
buf.getBytes(7, bytes20);
deviceAttribute.setDeviceModel(new String(bytes20).trim());
deviceAttribute.setDeviceModel(buf.readCharSequence(20, Charset.forName("GBK")).toString().trim());
buf.readCharSequence(10, Charset.forName("GBK"));
byte[] bytes7 = new byte[7];
buf.getBytes(37, bytes7);
deviceAttribute.setTerminalId(new String(bytes7).trim());
deviceAttribute.setTerminalId(buf.readCharSequence(7, Charset.forName("GBK")).toString().trim());
buf.readCharSequence(23, Charset.forName("GBK"));
byte[] iccIdBytes = new byte[10];
buf.getBytes(67, iccIdBytes);
deviceAttribute.setIccId(BCDUtil.transform(iccIdBytes));
byte[] bytes = new byte[10];
buf.readBytes(bytes);
deviceAttribute.setIccId(BCDUtil.transform(bytes));
int n = buf.getUnsignedByte(77);
byte[] hardwareVersionBytes = new byte[n];
buf.getBytes(78, hardwareVersionBytes);
try {
deviceAttribute.setHardwareVersion(new String(hardwareVersionBytes, "GBK").trim());
} catch (UnsupportedEncodingException e) {
logger.error("[查询终端属性应答] 读取硬件版本失败" , e);
}
int hardwareVersionLength = buf.readUnsignedByte();
deviceAttribute.setHardwareVersion(buf.readCharSequence(hardwareVersionLength, Charset.forName("GBK")).toString().trim());
int m = buf.getUnsignedByte(78 + n);
byte[] firmwareVersionBytes = new byte[m];
buf.getBytes(79 + n, firmwareVersionBytes);
try {
deviceAttribute.setFirmwareVersion(new String(firmwareVersionBytes, "GBK").trim());
} catch (UnsupportedEncodingException e) {
logger.error("[查询终端属性应答] 读取固件版本失败" , e);
}
int firmwareVersionLength = buf.readUnsignedByte();
deviceAttribute.setFirmwareVersion(buf.readCharSequence(firmwareVersionLength, Charset.forName("GBK")).toString().trim());
deviceAttribute.setGnssAttribute(JGnssAttribute.getInstance(buf.getUnsignedByte(79 + n + m)));
deviceAttribute.setCommunicationModuleAttribute(JCommunicationModuleAttribute.getInstance(buf.getUnsignedByte(80 + n + m)));
System.out.println(deviceAttribute);
List<String> allRequestKey = SessionManager.INSTANCE.getAllRequestKey();
String prefix = String.join("_", header.getTerminalId().replaceFirst("^0*", ""), "0107");
for (String key : allRequestKey) {
if (key.startsWith(prefix)) {
SessionManager.INSTANCE.response(key, deviceAttribute);
}
}
deviceAttribute.setGnssAttribute(JGnssAttribute.getInstance(buf.readUnsignedByte()));
deviceAttribute.setCommunicationModuleAttribute(JCommunicationModuleAttribute.getInstance(buf.readUnsignedByte()));
SessionManager.INSTANCE.response(header.getTerminalId(), "0107", null, deviceAttribute);
return null;
}

56
src/main/java/com/genersoft/iot/vmp/jt1078/session/SessionManager.java
View File

@@ -99,33 +99,38 @@ public enum SessionManager {
public Boolean response(String devId, String respId, Long responseNo, Object data) {
String requestKey = requestKey(devId, respId, responseNo);
SynchronousQueue<Object> queue = topicSubscribers.get(requestKey);
if (queue != null) {
try {
return queue.offer(data, 2, TimeUnit.SECONDS);
} catch (InterruptedException e) {
log.error("{}", e.getMessage(), e);
boolean result = false;
if (responseNo == null) {
for (String key : topicSubscribers.keySet()) {
if (key.startsWith(requestKey)) {
System.out.println(key);
SynchronousQueue<Object> queue = topicSubscribers.get(key);
if (queue != null) {
result = true;
try {
queue.offer(data, 2, TimeUnit.SECONDS);
} catch (InterruptedException e) {
log.error("{}", e.getMessage(), e);
}
}
}
}
}else {
SynchronousQueue<Object> queue = topicSubscribers.get(requestKey);
if (queue != null) {
result = true;
try {
queue.offer(data, 2, TimeUnit.SECONDS);
} catch (InterruptedException e) {
log.error("{}", e.getMessage(), e);
}
}
}
log.warn("Not find response,key:{} data:{} ", requestKey, data);
return false;
}
public Boolean response(String key, Object data) {
SynchronousQueue<Object> queue = topicSubscribers.get(key);
if (queue != null) {
try {
return queue.offer(data, 2, TimeUnit.SECONDS);
} catch (InterruptedException e) {
log.error("{}", e.getMessage(), e);
}
if (!result) {
log.warn("Not find response,key:{} data:{} ", requestKey, data);
}
log.warn("Not find response,key:{} data:{} ", key, data);
return false;
}
public List<String> getAllRequestKey() {
return new ArrayList<>(topicSubscribers.keySet());
return result;
}
private void unsubscribe(String key) {
@@ -140,7 +145,8 @@ public enum SessionManager {
}
private String requestKey(String devId, String respId, Long requestNo) {
return String.join("_", devId.replaceFirst("^0*", ""), respId, requestNo.toString());
return String.join("_", devId.replaceFirst("^0*", ""), respId, requestNo == null?"":requestNo.toString());
}
public void remove(String devId) {