diff --git a/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java b/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java index 7da4cdf..80b5f20 100644 --- a/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java +++ b/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java @@ -51,7 +51,7 @@ obj.put("devCode", getDeviceCode()); JSONObject body = new JSONObject(); - body.put("bType", "LGGasOtherEvent"); + body.put("bType", getDevTypeName() + "Event"); body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); JSONArray eventArr = new JSONArray(); for (EventItem eventItem : eventItemList) { diff --git a/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java b/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java index 7da4cdf..80b5f20 100644 --- a/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java +++ b/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java @@ -51,7 +51,7 @@ obj.put("devCode", getDeviceCode()); JSONObject body = new JSONObject(); - body.put("bType", "LGGasOtherEvent"); + body.put("bType", getDevTypeName() + "Event"); body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); JSONArray eventArr = new JSONArray(); for (EventItem eventItem : eventItemList) { diff --git a/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java b/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java index 406f524..5613326 100644 --- a/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java +++ b/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java @@ -50,7 +50,7 @@ obj.put("devCode", getDeviceCode()); JSONObject body = new JSONObject(); - body.put("bType", "TubeOtherEvent"); + body.put("bType", getDevTypeName() + "Event"); body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); JSONArray eventArr = new JSONArray(); for (EventItem eventItem : eventItemList) { diff --git a/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java b/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java index 7da4cdf..80b5f20 100644 --- a/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java +++ b/src/main/java/com/casic/methane/frame/brs/MethaneEventFrameBRS.java @@ -51,7 +51,7 @@ obj.put("devCode", getDeviceCode()); JSONObject body = new JSONObject(); - body.put("bType", "LGGasOtherEvent"); + body.put("bType", getDevTypeName() + "Event"); body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); JSONArray eventArr = new JSONArray(); for (EventItem eventItem : eventItemList) { diff --git a/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java b/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java index 406f524..5613326 100644 --- a/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java +++ b/src/main/java/com/casic/methane/frame/hsyd/MethaneEventFrameHSYD.java @@ -50,7 +50,7 @@ obj.put("devCode", getDeviceCode()); JSONObject body = new JSONObject(); - body.put("bType", "TubeOtherEvent"); + body.put("bType", getDevTypeName() + "Event"); body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); JSONArray eventArr = new JSONArray(); for (EventItem eventItem : eventItemList) { diff --git a/src/main/java/com/casic/methane/frame/xfdz/MethaneEventFrameXF.java b/src/main/java/com/casic/methane/frame/xfdz/MethaneEventFrameXF.java index 9e9f37d..ab681bb 100644 --- a/src/main/java/com/casic/methane/frame/xfdz/MethaneEventFrameXF.java +++ b/src/main/java/com/casic/methane/frame/xfdz/MethaneEventFrameXF.java @@ -50,7 +50,7 @@ obj.put("devCode", getDeviceCode()); JSONObject body = new JSONObject(); - body.put("bType", "LGGasOtherEvent"); + body.put("bType", getDevTypeName() + "Event"); body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); JSONArray eventArr = new JSONArray(); for (EventItem eventItem : eventItemList) {