From 39688299c37a4afc68afb705127948bf1e5e7e7f Mon Sep 17 00:00:00 2001
From: zuoxiao <470321431@qq.com>
Date: 星期四, 19 六月 2025 09:49:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
pipIrr-platform/pipIrr-common/src/main/java/com/dy/common/mw/protocol4Mqtt/pSdV1/upVos/WeatherVo.java | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 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 6ebc8be..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,8 +44,14 @@
public Long devDt ;//璁惧鏃堕棿
public String devDtStr ;//璁惧鏃堕棿
+
+ @Override
+ public void setNo(Integer no ){
+ this.no = no ;
+ }
+
public String getDevDtStr() {
- if(devDt == null){
+ if(devDt != null){
return DateTime.yyyy_MM_dd_HH_mm_ss(DateTime.getDate(devDt)) ;
}else{
return "" ;
@@ -53,17 +61,17 @@
@Override
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("姘旇薄鏁版嵁=>") ;
+ 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