Commit a751099e authored by wujipeng's avatar wujipeng
Browse files

mqtt接收消息优化

parent e735cee6
Pipeline #247 failed with stages
in 0 seconds
...@@ -52,9 +52,11 @@ public class MqttSubscriberClient { ...@@ -52,9 +52,11 @@ public class MqttSubscriberClient {
try { try {
DeviceData deviceData = DeviceData.fromJson(new String(message.getPayload())); DeviceData deviceData = DeviceData.fromJson(new String(message.getPayload()));
String deviceId = deviceData.getDeviceID(); String deviceId = deviceData.getDeviceID();
String serialnumber = deviceData.getSerialnumber();
for (DataPoint dp : deviceData.getData()) { for (DataPoint dp : deviceData.getData()) {
DeviceEntity deviceEntity = new DeviceEntity(); DeviceEntity deviceEntity = new DeviceEntity();
deviceEntity.setDeviceID(deviceId); deviceEntity.setDeviceID(deviceId);
deviceEntity.setSerialnumber(serialnumber);
deviceEntity.setTimestamp(dp.getTimestamp()); deviceEntity.setTimestamp(dp.getTimestamp());
Fields fields = dp.getFields(); Fields fields = dp.getFields();
deviceEntity.setZu(fields.getZu()); deviceEntity.setZu(fields.getZu());
...@@ -65,6 +67,15 @@ public class MqttSubscriberClient { ...@@ -65,6 +67,15 @@ public class MqttSubscriberClient {
deviceEntity.setSin(fields.getSin()); deviceEntity.setSin(fields.getSin());
deviceEntity.setTem(fields.getTem()); deviceEntity.setTem(fields.getTem());
deviceEntity.setHum(fields.getHum()); deviceEntity.setHum(fields.getHum());
deviceEntity.setVj(fields.getVj());
deviceEntity.setQ(fields.getQ());
deviceEntity.setQa(fields.getQa());
deviceEntity.setPqa(fields.getPqa());
deviceEntity.setNqa(fields.getNqa());
deviceEntity.setTss(fields.getTss());
deviceEntity.setPt(fields.getPt());
deviceEntity.setPn05(fields.getPn05());
deviceDao.insert(deviceEntity); deviceDao.insert(deviceEntity);
} }
} catch (IOException e) { } catch (IOException e) {
......
...@@ -13,6 +13,7 @@ import java.util.List; ...@@ -13,6 +13,7 @@ import java.util.List;
public class DeviceData { public class DeviceData {
private String deviceID; private String deviceID;
private String serialnumber;
private List<DataPoint> data; private List<DataPoint> data;
public static DeviceData fromJson(String json) throws IOException { public static DeviceData fromJson(String json) throws IOException {
......
...@@ -19,10 +19,19 @@ public class DeviceEntity { ...@@ -19,10 +19,19 @@ public class DeviceEntity {
@Id @Id
private String id; private String id;
private String deviceID; private String deviceID;
private String serialnumber;
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date timestamp; private Date timestamp;
private double zu; private double zu;
private double zb; private double zb;
private double vj;
private double q;
private double qa;
private double pqa;
private double nqa;
private double tss;
private double pt;
private double pn05;
private double vt; private double vt;
private double svt; private double svt;
private int zt; private int zt;
......
...@@ -8,6 +8,14 @@ import lombok.Data; ...@@ -8,6 +8,14 @@ import lombok.Data;
@Data @Data
public class Fields { public class Fields {
private double vj;
private double q;
private double qa;
private double pqa;
private double nqa;
private double tss;
private double pt;
private double pn05;
private double zu; private double zu;
private double zb; private double zb;
private double vt; private double vt;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment