diff --git a/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java b/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java index 368af03..79f2498 100644 --- a/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java +++ b/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java @@ -79,4 +79,26 @@ return dataList; } + + @Override + public JSONObject toJSON() { + JSONObject obj = super.toJSON(); + + obj.put("devType", "MonitorPipeOther"); + obj.put("devCode", getDeviceCode()); + obj.put("cell", ""); + + JSONObject body = new JSONObject(); + body.put("bType", "MonitorPipeOtherData"); + body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); + JSONArray dataArr = new JSONArray(); + for (DataItem dataItem : dataItemList) { + dataArr.add(dataItem.toJSON()); + } + body.put("datas", dataArr); + + obj.put("mBody", body); + + return obj; + } } diff --git a/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java b/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java index 368af03..79f2498 100644 --- a/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java +++ b/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java @@ -79,4 +79,26 @@ return dataList; } + + @Override + public JSONObject toJSON() { + JSONObject obj = super.toJSON(); + + obj.put("devType", "MonitorPipeOther"); + obj.put("devCode", getDeviceCode()); + obj.put("cell", ""); + + JSONObject body = new JSONObject(); + body.put("bType", "MonitorPipeOtherData"); + body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); + JSONArray dataArr = new JSONArray(); + for (DataItem dataItem : dataItemList) { + dataArr.add(dataItem.toJSON()); + } + body.put("datas", dataArr); + + obj.put("mBody", body); + + return obj; + } } diff --git a/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java b/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java index 372ac73..e049749 100644 --- a/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java +++ b/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java @@ -1,5 +1,6 @@ package com.casic.senitnel.frame.ncx; +import com.alibaba.fastjson.JSONObject; import com.casic.common.general.DataItem; import lombok.Data; import lombok.EqualsAndHashCode; @@ -28,4 +29,25 @@ "电池电压值:" + bat + "v;" + "采样时间:" + time; } + + @Override + public JSONObject toJSON() { + + JSONObject data = new JSONObject(); + data.put("LengL", lenL); + data.put("LengR", lenR); + data.put("CH4L", ch4L); + data.put("CH4R", ch4R); + data.put("BAT", bat); + data.put("Sloping", slope); + data.put("Destroy", destroy); + data.put("Leak", leak); + data.put("DiscL", discL); + data.put("DiscR", discR); + data.put("VibL", vibL); + data.put("VibR", vibR); + data.put("uptime", getTime()); + + return data; + } } diff --git a/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java b/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java index 368af03..79f2498 100644 --- a/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java +++ b/src/main/java/com/casic/senitnel/frame/ncx/DataFrameNCX.java @@ -79,4 +79,26 @@ return dataList; } + + @Override + public JSONObject toJSON() { + JSONObject obj = super.toJSON(); + + obj.put("devType", "MonitorPipeOther"); + obj.put("devCode", getDeviceCode()); + obj.put("cell", ""); + + JSONObject body = new JSONObject(); + body.put("bType", "MonitorPipeOtherData"); + body.put("logTime", LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss"))); + JSONArray dataArr = new JSONArray(); + for (DataItem dataItem : dataItemList) { + dataArr.add(dataItem.toJSON()); + } + body.put("datas", dataArr); + + obj.put("mBody", body); + + return obj; + } } diff --git a/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java b/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java index 372ac73..e049749 100644 --- a/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java +++ b/src/main/java/com/casic/senitnel/frame/ncx/DataItemNCX.java @@ -1,5 +1,6 @@ package com.casic.senitnel.frame.ncx; +import com.alibaba.fastjson.JSONObject; import com.casic.common.general.DataItem; import lombok.Data; import lombok.EqualsAndHashCode; @@ -28,4 +29,25 @@ "电池电压值:" + bat + "v;" + "采样时间:" + time; } + + @Override + public JSONObject toJSON() { + + JSONObject data = new JSONObject(); + data.put("LengL", lenL); + data.put("LengR", lenR); + data.put("CH4L", ch4L); + data.put("CH4R", ch4R); + data.put("BAT", bat); + data.put("Sloping", slope); + data.put("Destroy", destroy); + data.put("Leak", leak); + data.put("DiscL", discL); + data.put("DiscR", discR); + data.put("VibL", vibL); + data.put("VibR", vibR); + data.put("uptime", getTime()); + + return data; + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a84b69b..d396714 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -33,7 +33,7 @@ base-url: https://ag-api.ctwing.cn push: - url: http://111.198.10.15:11643/device/receiveData + url: http://10.30.7.26:20705/device/receiveData # type 可燃气体的设备类型 # minutes: 燃气外协设备上传数据的分钟数 \ No newline at end of file