From 4450dd41e8d5828e5da4d277c86e54551a6b6c15 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Thu, 16 Dec 2021 09:06:28 +0800
Subject: [PATCH] 设备新增，修改是工艺字段可以为多个，修改mapper,sql
---
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