From c2c52844bac20aeda08c9e25c8b525bc556ef586 Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Mon, 27 Sep 2021 15:07:03 +0800
Subject: [PATCH] screen-aqi 更改监测站点DTO参数
---
screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java | 2 +
screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java | 6 ++
screen-api/src/main/java/com/moral/api/pojo/dto/dataDisplay/MonitorPointDataDisplayDTO.java | 21 ++++++++++
screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java | 42 +++++++++++++++------
4 files changed, 57 insertions(+), 14 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java b/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
index 4fd2b1d..74d997d 100644
--- a/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
+++ b/screen-api/src/main/java/com/moral/api/controller/DataDisplayController.java
@@ -54,19 +54,37 @@
dto1.setOrganizationName("������������2");
dto2.setOrganizationName("������������3");
- Map<String,Object> valueMap = new HashMap<>();
- valueMap.put("a21026",1);
- valueMap.put("a21004",1);
- valueMap.put("a34002",1);
- valueMap.put("a34004",1);
- valueMap.put("a21005",1);
- valueMap.put("a05024",1);
- valueMap.put("a99054",1);
- valueMap.put("AQI",1);
+ dto.setA05024(1);
+ dto1.setA05024(1);
+ dto2.setA05024(1);
- dto.setValues(valueMap);
- dto1.setValues(valueMap);
- dto2.setValues(valueMap);
+ dto.setA21005(1d);
+ dto1.setA21005(1d);
+ dto2.setA21005(1d);
+
+ dto.setA21004(1);
+ dto1.setA21004(1);
+ dto2.setA21004(1);
+
+ dto.setA21026(1);
+ dto1.setA21026(1);
+ dto2.setA21026(1);
+
+ dto.setA34002(1);
+ dto1.setA34002(1);
+ dto2.setA34002(1);
+
+ dto.setA34004(1);
+ dto1.setA34004(1);
+ dto2.setA34004(1);
+
+ dto.setA99054(1d);
+ dto1.setA99054(1d);
+ dto2.setA99054(1d);
+
+ dto.setAQI(1);
+ dto1.setAQI(1);
+ dto2.setAQI(1);
List<MonitorPointDataDisplayDTO> list = new ArrayList<>();
list.add(dto);
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..afbefa9 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
@@ -20,6 +20,25 @@
private String time;
- private Map<String,Object> values;
+ private Double a21005;
+
+ private int a21026;
+
+ private int a21004;
+
+ private int AQI;
+
+ private int a34002;
+
+ private Double a99054;
+
+ private int a34004;
+
+ private int a05024;
+
+ /*
+ * ������������
+ * */
+ private Double comIndex;
}
diff --git a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
index 21083f0..1d1f3d6 100644
--- a/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
+++ b/screen-api/src/main/java/com/moral/api/pojo/form/dataDisplay/MonitorPointDataDisplayForm.java
@@ -57,6 +57,8 @@
endTimeStr+=" 23:59:59";
endTime = DateUtils.getDate(endTimeStr,"yyyy-MM-dd HH:mm:ss");
} else {
+ if(startTime!=null&&endTime!=null)
+ return false;
if (reportType.equals(Constants.HOURYLYREPORT)) {
//������������������������������������������
Date previousHour = DateUtils.getDateOfMin(new Date(), -60);
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
index 971a459..2a9440d 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/DataDisplayServiceImpl.java
@@ -74,7 +74,7 @@
//������������������
String deviceName = deviceMap.get(key).getName();
//������������������
- organizationService.getOrganizationById(deviceMap.get(key).getOrganizationId());
+ String orgName = organizationService.getOrganizationById(deviceMap.get(key).getOrganizationId()).getName();
//������������
String startTime = DateUtils.dateToDateString(startDate, "yyyy-MM-dd");
String endTime = DateUtils.dateToDateString(endDate, "yyyy-MM-dd");
@@ -165,6 +165,10 @@
double TVOCAvg = AmendUtils.sciCal(TVOCSum / TVOCNum,2);
+ dto.setDeviceName(deviceName);
+ dto.setTime(time);
+ dto.setOrganizationName(orgName);
+
});
}
--
Gitblit v1.8.0