pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/MqttSubMsgSdV1.java
@@ -3,7 +3,6 @@ import com.dy.common.mw.protocol4Mqtt.MqttPubMsg; import com.dy.common.mw.protocol4Mqtt.MqttSubMsg; import com.dy.common.mw.protocol4Mqtt.MqttTopic; import com.dy.common.mw.protocol4Mqtt.pSdV1.upVos.StateVo; import com.dy.common.mw.protocol4Mqtt.Vo4Up; import com.dy.common.util.Callback; import lombok.Data; pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/ProtocolParserSdV1.java
@@ -41,12 +41,7 @@ } case ProtocolConstantSdV1.SubTopicManure -> { vo = JSON.parseObject(strTxt, ManureVo.class); break; } case ProtocolConstantSdV1.SubTopicState -> { //此处未完成，应该产生一些通信的info，供下面callback.notify(objs)通知出去 vo = JSON.parseObject(strTxt, StateVo.class); StateVo stVo = (StateVo)vo ; ManureVo stVo = (ManureVo)vo ; stInfo = new DevRunInfo() ; stInfo.devId = msg.deviceId ; stInfo.stirRunning = (stVo.stirRunning==null?false:(stVo.stirRunning.byteValue()==1?true:false)) ; //搅拌运行 true是 false否 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/ManureVo.java
@@ -15,16 +15,28 @@ @JSONField(name = "flexem_message_id") public Integer messageId ;//消息ID public Integer no ;//测站编号，其不在JSON数据中，其中主题中 public Integer no ;//测站编号，其不在JSON数据中，其在主题中 @JSONField(name = "搅拌运行") public Byte stirRunning ;//搅拌运行 @JSONField(name = "注肥运行") public Byte injectRunning ;//注肥运行 @JSONField(name = "灌溉运行") public Byte irrRunning ;//灌溉运行 @JSONField(name = "报警") public Byte alarm ;//报警 @JSONField(name = "肥料流量") public Float manureFlow ;//肥料流量 public Float manureFlow ; @JSONField(name = "注肥时长") public Integer manureTime ;//注肥时长 @JSONField(name = "注肥经过时间") public Integer manureTime ; @JSONField(name = "搅拌时长") public Integer stirTime ;//搅拌时长 @JSONField(name = "搅拌经过时间") public Integer stirTime ; @JSONField(name = "flexem_timestamp") public Long devDt ;//设备时间 @@ -49,9 +61,13 @@ StringBuilder sb = new StringBuilder(); sb.append("水肥数据=>") ; sb.append(" 消息ID：" + messageId + ", ") ; sb.append(" 搅拌运行：" + stirRunning + ", ") ; sb.append(" 注肥运行：" + injectRunning + ", ") ; sb.append(" 灌溉运行：" + irrRunning + ", ") ; sb.append(" 报警：" + alarm + ", ") ; sb.append(" 肥料流量：" + manureFlow + ", ") ; sb.append(" 注肥时长：" + manureTime + ", ") ; sb.append(" 搅拌时长：" + stirTime + ", ") ; sb.append(" 注肥经过时间：" + manureTime + ", ") ; sb.append(" 搅拌经过时间：" + stirTime + ", ") ; sb.append(" 设备时间：" + devDt + ", ") ; sb.append(" 设备时间：" + this.getDevDtStr() + ", ") ; sb.append("\n") ; pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/SoilVo.java
@@ -15,31 +15,37 @@ @JSONField(name = "flexem_message_id") public Integer messageId ;//消息ID public Integer no ;//测站编号，其不在JSON数据中，其中主题中 public Integer no ;//测站编号，其不在JSON数据中，其在主题中 @JSONField(name = "土壤湿度1") public Float soilHumidity1 ;//土壤湿度1 public Integer soilHumidity1 ; @JSONField(name = "土壤湿度2") public Float soilHumidity2 ;//土壤湿度2 public Integer soilHumidity2 ; @JSONField(name = "土壤湿度3") public Float soilHumidity3 ;//土壤湿度3 public Integer soilHumidity3 ; @JSONField(name = "土壤湿度4") public Float soilHumidity4 ;//土壤湿度4 public Integer soilHumidity4 ; @JSONField(name = "土壤湿度5") public Integer soilHumidity5 ; @JSONField(name = "土壤湿度1") public Float soilTemperature1 ;//土壤温度1 public Integer soilTemperature1 ; @JSONField(name = "土壤温度2") public Float soilTemperature2 ;//土壤温度2 public Integer soilTemperature2 ; @JSONField(name = "土壤温度3") public Float soilTemperature3 ;//土壤温度3 public Integer soilTemperature3 ; @JSONField(name = "土壤温度4") public Float soilTemperature4 ;//土壤温度4 public Integer soilTemperature4 ; @JSONField(name = "土壤温度5") public Integer soilTemperature5 ; @JSONField(name = "flexem_timestamp") public Long devDt ;//设备时间 pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/StateVo.java
File was deleted pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
@@ -16,28 +16,34 @@ @JSONField(name = "flexem_message_id") public Integer messageId ;//消息ID public Integer no ;//测站编号，其不在JSON数据中，其中主题中 public Integer no ;//测站编号，其不在JSON数据中，其在主题中 @JSONField(name = "二氧化碳") public Integer carbonDioxide ;//二氧化碳 //@JSONField(name = "二氧化碳") //public Integer carbonDioxide ; @JSONField(name = "光照强度") public Integer lightIntensity ;//光照强度 @JSONField(name = "大气压力") public Integer atmosphericPressure ;//大气压力 //@JSONField(name = "大气压力") //public Integer atmosphericPressure ; @JSONField(name = "空气温度") public Integer airTemperature ;//空气温度 public Integer airTemperature ; @JSONField(name = "空气湿度") public Integer airHumidity ;//空气湿度 public Integer airHumidity ; @JSONField(name = "PM2.5") public Integer pm25 ;//PM2.5 @JSONField(name = "紫外线") public Integer ultraviolet ; @JSONField(name = "PM10") public Integer pm10 ;//PM10 @JSONField(name = "光照强度") public Integer lightIntensity ; @JSONField(name = "雨量") public Integer rainfall ; @JSONField(name = "风速") public Integer windSpeed ; @JSONField(name = "风向") public Integer windDirection ; @JSONField(name = "flexem_timestamp") @@ -62,14 +68,16 @@ public String toString(){ StringBuilder sb = new StringBuilder(); sb.append("气象数据=>") ; //sb.append(" 二氧化碳：" + carbonDioxide + ", ") ; //sb.append(" 大气压力：" + atmosphericPressure + ", ") ; sb.append(" 消息ID：" + messageId + ", ") ; sb.append(" 二氧化碳：" + carbonDioxide + ", ") ; sb.append(" 光照强度：" + lightIntensity + ", ") ; sb.append(" 大气压力：" + atmosphericPressure + ", ") ; sb.append(" 空气温度：" + airTemperature + ", ") ; sb.append(" 空气湿度：" + airHumidity + ", ") ; sb.append(" PM2.5：" + pm25 + ", ") ; sb.append(" PM10：" + pm10 + ", ") ; sb.append(" 紫外线：" + ultraviolet + ", ") ; sb.append(" 光照强度：" + lightIntensity + ", ") ; sb.append(" 雨量：" + rainfall + ", ") ; sb.append(" 风速：" + windSpeed + ", ") ; sb.append(" 风向：" + windDirection + ", ") ; sb.append(" 设备时间：" + devDt + ", ") ; sb.append(" 设备时间：" + this.getDevDtStr() + ", ") ; sb.append("\n") ;
