From f219f570fb3d6a2b4626ea94d3fca04835773cd7 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 05 Aug 2019 11:02:25 +0800
Subject: [PATCH] 信息弹窗选中时间增加效果
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 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..429f0a2 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;
@@ -543,14 +544,18 @@
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