From 30d475ca8f7f09ab6ad4802add508dd51d9e20a2 Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Sat, 09 Oct 2021 11:32:27 +0800
Subject: [PATCH] 修改臭氧八小时滑动平均值在臭氧无值情况下为0的问题
---
screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java | 49 ++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 46 insertions(+), 3 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java
index db149f5..f3fcf31 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java
@@ -14,12 +14,55 @@
@Data
public class MonitorPointDataDisplayDTO {
- private String deviceName;
+ private String mac;
- private String organizationName;
+ private String deviceName;
private String time;
- private Map<String,Object> values;
+ /*
+ * CO
+ * */
+ private Double a21005;
+
+ /*
+ * SO2
+ * */
+ private Integer a21026;
+
+ /*
+ * NO2
+ * */
+ private Integer a21004;
+
+ /*
+ * AQI
+ * */
+ private Integer AQI;
+
+ /*
+ * PM10
+ * */
+ private Integer a34002;
+
+ /*
+ * TVOC
+ * */
+ private Double a99054;
+
+ /*
+ * PM2.5
+ * */
+ private Integer a34004;
+
+ /*
+ * O3
+ * */
+ private Integer a05024;
+
+ /*
+ * ������������
+ * */
+ private Double comIndex;
}
--
Gitblit v1.8.0