From 4f79840f94d98f19a91104dfcbaf1df3943de1e6 Mon Sep 17 00:00:00 2001
From: liurunyu <lry9898@163.com>
Date: 星期四, 19 六月 2025 09:52:10 +0800
Subject: [PATCH] Merge branch 'master' of http://8.140.179.55:20000/r/pipIrr-SV
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
index 62ba401..1b2b510 100644
--- a/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
+++ b/pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java
@@ -16,6 +16,8 @@
@JSONField(name = "flexem_message_id")
public Integer messageId ;//娑堟伅ID
+ public Integer no ;//娴嬬珯缂栧彿锛屽叾涓嶅湪JSON鏁版嵁涓紝鍏朵腑涓婚涓�
+
@JSONField(name = "浜屾哀鍖栫⒊")
public Integer carbonDioxide ;//浜屾哀鍖栫⒊
@@ -42,6 +44,12 @@
public Long devDt ;//璁惧鏃堕棿
public String devDtStr ;//璁惧鏃堕棿
+
+ @Override
+ public void setNo(Integer no ){
+ this.no = no ;
+ }
+
public String getDevDtStr() {
if(devDt != null){
return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
@@ -54,16 +62,16 @@
public String toString(){
StringBuilder sb = new StringBuilder();
sb.append("姘旇薄鏁版嵁=>") ;
- 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(" 璁惧鏃堕棿锛�"+devDt + ", ") ;
- sb.append(" 璁惧鏃堕棿锛�"+ this.getDevDtStr() + ", ") ;
+ 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(" 璁惧鏃堕棿锛�" + devDt + ", ") ;
+ sb.append(" 璁惧鏃堕棿锛�" + this.getDevDtStr() + ", ") ;
sb.append("\n") ;
return sb.toString() ;
}
--
Gitblit v1.8.0