From f81b7065a40d1f9428d204b3bd6bcd126f306a19 Mon Sep 17 00:00:00 2001
From: liuhaonan <31457034@qq.com>
Date: 星期三, 10 八月 2022 17:04:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java | 132 +++++++++++++++++++++++++++++++++++++++----
1 files changed, 118 insertions(+), 14 deletions(-)
diff --git a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
index 81a4963..482ae23 100644
--- a/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
+++ b/dao/src/main/java/com/sandu/ximon/dao/domain/AirEquipment.java
@@ -4,43 +4,147 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-
import java.io.Serializable;
import java.time.LocalDateTime;
-
import lombok.Data;
/**
* 澶ф皵璁惧
- *
* @TableName air_equipment
*/
-@TableName(value = "air_equipment")
+@TableName(value ="air_equipment")
@Data
public class AirEquipment implements Serializable {
/**
- *
+ *
*/
@TableId(type = IdType.AUTO)
private Long id;
/**
- * 鎺ュ叆鏃堕棿
- */
- private LocalDateTime createTime;
-
- /**
- * MAC鍦板潃
+ * MAC鍦板潃鐏潌
*/
private String mac;
/**
- * 澶ф皵mac
+ * MAC鍦板潃澶ф皵
*/
private String airMac;
- @TableField(exist = false)
- private Integer state;
+ /**
+ * 璁惧鍨嬪彿
+ */
+ private String deviceType;
+
+ /**
+ * 妯″潡棰勭儹鐘舵�佹爣蹇�
+ */
+ private String moduleWarmUpStatusFlag;
+
+ /**
+ * 娓╁害鍊�
+ */
+ private Integer temperature;
+
+ /**
+ * 婀垮害鍊�
+ */
+ private Integer humidity;
+
+ /**
+ * 椋庨��
+ */
+ private Integer windSpeed;
+
+ /**
+ * 椋庡悜
+ */
+ private Integer windDirection;
+
+ /**
+ * 椋庡姏
+ */
+ private Integer windPower;
+
+ /**
+ * 澶ф皵鍘�
+ */
+ private Integer pressure;
+
+ /**
+ * 鍏夊己
+ */
+ private Integer lightIntensity;
+
+ /**
+ * 鍣煶
+ */
+ private Integer noise;
+
+ /**
+ * pm25
+ */
+ private Integer pm25;
+
+ /**
+ * PM10
+ */
+ private Integer pm10;
+
+ /**
+ * 鎬绘偓娴绮掔墿TSP
+ */
+ private Integer tsp;
+
+ /**
+ * 闆ㄩ噺
+ */
+ private Integer rain;
+
+ /**
+ * 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;
@TableField(exist = false)
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.3