From 543b91f79c55687337984d39beb757648e6e73c1 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 06 Aug 2019 13:55:36 +0800
Subject: [PATCH] 新增根据mac查询sensors的Mapper接口
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index e2e94d3..f1c95a9 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -41,6 +41,7 @@
import com.moral.common.util.ParameterUtils;
import com.moral.common.util.ReportTimeFormat;
import com.moral.common.util.ResourceUtil;
+import com.moral.common.util.StringUtils;
import com.moral.common.util.ValidateUtil;
import com.moral.entity.Sensor;
import com.moral.entity.charts.DataCondition;
@@ -537,20 +538,23 @@
public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e3", "e4", "e6", "e7", "e9", "e10", "e11", "e15", "e16", "e17", "e27", "e28", "e76", "e77", "e78", "e79", "e80", "e81"));
List<Sensor> sensors = sensorMapper.selectByExample(null);
- System.out.println(sensors);
List<Map<String, Object>> listMap = historyMinutelyMapper.getSensorData(parameters);
List<Map<String, Object>> listMapNew = new ArrayList<>();
Map<String, Object> new_map = new LinkedHashMap<>();
if (CollectionUtils.isNotEmpty(listMap)) {
for (Map<String, Object> map : listMap) {
+ new_map.put("������", map.get("uavDate"));
for (String key : map.keySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(key)) {
- new_map.put(sensor.getDescription(), map.get(key));
+ if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
+ new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString()));
+ }else{
+ new_map.put(sensor.getDescription(), map.get(key));
+ }
}
}
}
- new_map.put("������", map.get("uavDate"));
listMapNew.add(new_map);
new_map = new LinkedHashMap<>();
}
--
Gitblit v1.8.0