diff --git a/src/main/java/com/casic/common/CasicFrame.java b/src/main/java/com/casic/common/CasicFrame.java index 2175800..2b4613f 100644 --- a/src/main/java/com/casic/common/CasicFrame.java +++ b/src/main/java/com/casic/common/CasicFrame.java @@ -20,7 +20,22 @@ JSONObject messageBody; public String getDevTypeName() { - return ""; + switch (getDeviceType()) { + case "21": + return "MonitorPipe"; + + case "31": + return "Methane"; + + case "32": + return "LG"; + + case "34": + return "Tube"; + + default: + return ""; + } } public void parseMessageBody() { diff --git a/src/main/java/com/casic/common/CasicFrame.java b/src/main/java/com/casic/common/CasicFrame.java index 2175800..2b4613f 100644 --- a/src/main/java/com/casic/common/CasicFrame.java +++ b/src/main/java/com/casic/common/CasicFrame.java @@ -20,7 +20,22 @@ JSONObject messageBody; public String getDevTypeName() { - return ""; + switch (getDeviceType()) { + case "21": + return "MonitorPipe"; + + case "31": + return "Methane"; + + case "32": + return "LG"; + + case "34": + return "Tube"; + + default: + return ""; + } } public void parseMessageBody() { diff --git a/src/main/java/com/casic/common/general/IMEIFrame.java b/src/main/java/com/casic/common/general/IMEIFrame.java index fb1b962..356feda 100644 --- a/src/main/java/com/casic/common/general/IMEIFrame.java +++ b/src/main/java/com/casic/common/general/IMEIFrame.java @@ -1,8 +1,11 @@ package com.casic.common.general; +import com.alibaba.fastjson.JSONObject; import com.casic.common.CasicFrame; import lombok.Data; -import lombok.extern.slf4j.Slf4j; + +import java.time.LocalDateTime; +import java.time.ZoneId; @Data public class IMEIFrame extends CasicFrame { @@ -26,6 +29,24 @@ } @Override + public JSONObject toJSON() { + JSONObject obj = new JSONObject(); + + obj.put("mType", MESSAGE_TYPE_STRING); + obj.put("devType", getDevTypeName()); + obj.put("devCode", getDeviceCode()); + + JSONObject body = new JSONObject(); + body.put("bType", getDevTypeName() + "Data"); + body.put("imei", imei); + body.put("iccid", iccid); + + obj.put("mBody", body); + obj.put("ts", LocalDateTime.now().atZone(ZoneId.systemDefault()).toInstant().toEpochMilli()); + return obj; + } + + @Override public void parseMessageBody() { imei = getMessageBody().getString("IMEI"); iccid = getMessageBody().getString("ICCID");