From 0aea8bd18daaaf91e622fdcfdd81dbb2e1b4860c Mon Sep 17 00:00:00 2001
From: swb <jpy123456>
Date: Mon, 21 Oct 2024 09:01:18 +0800
Subject: [PATCH] fix:立行立改责任主体修改提交
---
screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java | 61 ++++++++++++++++++------------
1 files changed, 36 insertions(+), 25 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java
index a5e04ea..7c76366 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HandDeviceServiceImpl.java
@@ -18,6 +18,7 @@
import com.moral.api.entity.HandDevice;
import com.moral.api.entity.HistoryFiveMinutely;
import com.moral.api.entity.HistoryHourly;
+import com.moral.api.entity.HistoryMinutely;
import com.moral.api.mapper.DeviceMapper;
import com.moral.api.mapper.HandDeviceMapper;
import com.moral.api.pojo.query.handdevice.HandDevicePageCond;
@@ -158,7 +159,17 @@
map.put("a21028",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
rsMap.add(map);
}
- }else {
+ }else if (type.equals("minute")){
+ List<HistoryMinutely> historyMinutelys = historyHourlyService.getHistoryMinutely(mac, startDate, endDate);
+ for (HistoryMinutely historyMinutely : historyMinutelys) {
+ String value = historyMinutely.getValue();
+ Map map = JSON.parseObject(value, Map.class);
+ map.put("time",DateUtils.dateToDateString(historyMinutely.getTime()));
+ map.put("a21001",ObjectUtils.isEmpty(map.get("a21001"))?0:map.get("a21001"));
+ map.put("a21028",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
+ rsMap.add(map);
+ }
+ }else if (type.equals("minutely")){
List<HistoryFiveMinutely> historyFiveMinutelies = historyFiveMinutelyService.queryFiveMinutely(mac, startDate, endDate);
for (HistoryFiveMinutely historyFiveMinutely : historyFiveMinutelies) {
String value = historyFiveMinutely.getValue();
@@ -198,18 +209,18 @@
String value = historyHourly.getValue();
Map map = JSON.parseObject(value, Map.class);
map1.put("������",DateUtils.dateToDateString(historyHourly.getTime()));
- map1.put("pm25",ObjectUtils.isEmpty(map.get("a34004"))?0:map.get("a34004"));
- map1.put("pm10",ObjectUtils.isEmpty(map.get("a34002"))?0:map.get("a34002"));
- map1.put("������������",ObjectUtils.isEmpty(map.get("a21004"))?0:map.get("a21004"));
- map1.put("������������",ObjectUtils.isEmpty(map.get("a21026"))?0:map.get("a21026"));
- map1.put("������������",ObjectUtils.isEmpty(map.get("a21005"))?0:map.get("a21005"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a01006"))?0:map.get("a01006"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a01001"))?0:map.get("a01001"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a01002"))?0:map.get("a01002"));
- map1.put("tvoc",ObjectUtils.isEmpty(map.get("a99054"))?0:map.get("a99054"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a31001"))?0:map.get("a31001"));
- map1.put("���������",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a21001"))?0:map.get("a21001"));
+ map1.put("pm25ug/m��",ObjectUtils.isEmpty(map.get("a34004"))?0:map.get("a34004"));
+ map1.put("pm10ug/m��",ObjectUtils.isEmpty(map.get("a34002"))?0:map.get("a34002"));
+ map1.put("������������ug/m��",ObjectUtils.isEmpty(map.get("a21004"))?0:map.get("a21004"));
+ map1.put("������������ug/m��",ObjectUtils.isEmpty(map.get("a21026"))?0:map.get("a21026"));
+ map1.put("������������ug/m��",ObjectUtils.isEmpty(map.get("a21005"))?0:map.get("a21005"));
+ map1.put("������hpa",ObjectUtils.isEmpty(map.get("a01006"))?0:map.get("a01006"));
+ map1.put("���������",ObjectUtils.isEmpty(map.get("a01001"))?0:map.get("a01001"));
+ map1.put("������%",ObjectUtils.isEmpty(map.get("a01002"))?0:map.get("a01002"));
+ map1.put("tvocmg/m��",ObjectUtils.isEmpty(map.get("a99054"))?0:map.get("a99054"));
+ map1.put("������mg/m��",ObjectUtils.isEmpty(map.get("a31001"))?0:map.get("a31001"));
+ map1.put("���������ppm",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
+ map1.put("������ug/m��",ObjectUtils.isEmpty(map.get("a21001"))?0:map.get("a21001"));
rsMap.add(map1);
}
}else {
@@ -219,18 +230,18 @@
String value = historyFiveMinutely.getValue();
Map map = JSON.parseObject(value, Map.class);
map1.put("������",DateUtils.dateToDateString(historyFiveMinutely.getTime()));
- map1.put("pm25",ObjectUtils.isEmpty(map.get("a34004"))?0:map.get("a34004"));
- map1.put("pm10",ObjectUtils.isEmpty(map.get("a34002"))?0:map.get("a34002"));
- map1.put("������������",ObjectUtils.isEmpty(map.get("a21004"))?0:map.get("a21004"));
- map1.put("������������",ObjectUtils.isEmpty(map.get("a21026"))?0:map.get("a21026"));
- map1.put("������������",ObjectUtils.isEmpty(map.get("a21005"))?0:map.get("a21005"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a01006"))?0:map.get("a01006"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a01001"))?0:map.get("a01001"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a01002"))?0:map.get("a01002"));
- map1.put("tvoc",ObjectUtils.isEmpty(map.get("a99054"))?0:map.get("a99054"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a31001"))?0:map.get("a31001"));
- map1.put("���������",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
- map1.put("������",ObjectUtils.isEmpty(map.get("a21001"))?0:map.get("a21001"));
+ map1.put("pm25ug/m��",ObjectUtils.isEmpty(map.get("a34004"))?0:map.get("a34004"));
+ map1.put("pm10ug/m��",ObjectUtils.isEmpty(map.get("a34002"))?0:map.get("a34002"));
+ map1.put("������������ug/m��",ObjectUtils.isEmpty(map.get("a21004"))?0:map.get("a21004"));
+ map1.put("������������ug/m��",ObjectUtils.isEmpty(map.get("a21026"))?0:map.get("a21026"));
+ map1.put("������������ug/m��",ObjectUtils.isEmpty(map.get("a21005"))?0:map.get("a21005"));
+ map1.put("������hpa",ObjectUtils.isEmpty(map.get("a01006"))?0:map.get("a01006"));
+ map1.put("���������",ObjectUtils.isEmpty(map.get("a01001"))?0:map.get("a01001"));
+ map1.put("������%",ObjectUtils.isEmpty(map.get("a01002"))?0:map.get("a01002"));
+ map1.put("tvocmg/m��",ObjectUtils.isEmpty(map.get("a99054"))?0:map.get("a99054"));
+ map1.put("������ug/m��",ObjectUtils.isEmpty(map.get("a31001"))?0:map.get("a31001"));
+ map1.put("���������ppm",ObjectUtils.isEmpty(map.get("a21028"))?0:map.get("a21028"));
+ map1.put("������ug/m��",ObjectUtils.isEmpty(map.get("a21001"))?0:map.get("a21001"));
rsMap.add(map1);
}
}
--
Gitblit v1.8.0