From d2bf8caa38cc592cf5516bf64da27ad1ec8ea308 Mon Sep 17 00:00:00 2001
From: liuhaonan <konodioda2333@vip.qq.com>
Date: 星期五, 17 十二月 2021 17:30:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java |  152 ++++++++++++++++++++++++++++++++++++++++++--------
 1 files changed, 127 insertions(+), 25 deletions(-)

diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java
index 7601251..e45aa45 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirData.java
@@ -1,39 +1,141 @@
 package com.sandu.ximon.dao.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
-import lombok.Data;
-
+import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.time.LocalDateTime;
+import lombok.Data;
 
+/**
+ * 
+ * @TableName air_data
+ */
+@TableName(value ="air_data")
 @Data
 public class AirData implements Serializable {
+    /**
+     * 
+     */
     @TableId(type = IdType.AUTO)
     private Long id;
 
-    //鎵�灞炵伅鏉�
-    private String belongTo;
-    //鎺ュ叆鏃堕棿
+    /**
+     * 璁惧mac
+     */
+    private String deviceMac;
+
+    /**
+     * 璁惧鍨嬪彿
+     */
+    private String deviceType;
+
+    /**
+     * 妯″潡棰勭儹鐘舵�佹爣蹇�
+     */
+    private String moduleWarmUpStatusFlag;
+
+    /**
+     * 娓╁害鍊�
+     */
+    private Double temperature;
+
+    /**
+     * 婀垮害鍊�
+     */
+    private Double humidity;
+
+    /**
+     * 椋庨��
+     */
+    private Double windSpeed;
+
+    /**
+     * 椋庡悜
+     */
+    private Double windDirection;
+
+    /**
+     * 澶ф皵鍘�
+     */
+    private Integer pressure;
+
+    /**
+     * 鍏夊己
+     */
+    private Integer lightIntensity;
+
+    /**
+     * 鍣煶
+     */
+    private Integer noise;
+
+    /**
+     * PM2.5
+     */
+    private Integer pm25;
+
+    /**
+     *  PM10
+     */
+    private Integer pm10;
+
+    /**
+     * 鎬绘偓娴绮掔墿锛圱SP锛�
+     */
+    private Integer tsp;
+
+    /**
+     * SO2浜屾哀鍖栫～鐩稿鍊�
+     */
+    private Integer so2;
+
+    /**
+     * 鐢查啗鐩稿鍊�
+     */
+    private Integer ech2o;
+
+    /**
+     * NO2浜屾哀鍖栨爱
+     */
+    private Integer no2;
+
+    /**
+     * TVOC
+     */
+    private Integer tvoc;
+
+    /**
+     * CO涓�姘у寲纰�
+     */
+    private Integer co;
+
+    /**
+     * 浜屾哀鍖栫⒊
+     */
+    private Integer co2;
+
+    /**
+     * O3鑷哀
+     */
+    private Integer o3;
+
+    /**
+     * F姘熷寲鐗�
+     */
+    private Integer fluoride;
+
+    /**
+     * 
+     */
     private LocalDateTime createTime;
-    //娓╁害
-    private String temperature;
-    //婀垮害
-    private String humidity;
-    //PM2.5
-    private String PM25;
-    //浜害
-    private int brightness;
-    //PM10
-    private String PM10;
-    //鐢查啗
-    private String formaldehyde;
-    //浜屾哀鍖栫⒊CO2
-    private String CO2;
-    //瀹ゅ唴鏈夋満姘旀�佺墿璐�
-    private int tVoc;
-    //椋庨��
-    private String windSpeed;
-    //涓婃姤鏃堕棿
+
+    /**
+     * 
+     */
     private LocalDateTime updateTime;
-}
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

--
Gitblit v1.9.3