From a9cc2343ceaad3e99dc25eb036dc99aeded279a6 Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Fri, 20 Oct 2023 09:26:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://blit.7drlb.com:8888/r/moral into wb
---
screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java | 40 ++++++++++++++++++++++++++++++++--------
1 files changed, 32 insertions(+), 8 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 afbefa9..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,27 +14,51 @@
@Data
public class MonitorPointDataDisplayDTO {
- private String deviceName;
+ private String mac;
- private String organizationName;
+ private String deviceName;
private String time;
+ /*
+ * CO
+ * */
private Double a21005;
- private int a21026;
+ /*
+ * SO2
+ * */
+ private Integer a21026;
- private int a21004;
+ /*
+ * NO2
+ * */
+ private Integer a21004;
- private int AQI;
+ /*
+ * AQI
+ * */
+ private Integer AQI;
- private int a34002;
+ /*
+ * PM10
+ * */
+ private Integer a34002;
+ /*
+ * TVOC
+ * */
private Double a99054;
- private int a34004;
+ /*
+ * PM2.5
+ * */
+ private Integer a34004;
- private int a05024;
+ /*
+ * O3
+ * */
+ private Integer a05024;
/*
* ������������
--
Gitblit v1.8.0