From 60be667ecb355f7b7fca6e95f9c1d2b73fe4bb24 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Mon, 05 Aug 2019 09:28:08 +0800
Subject: [PATCH] 速度参数修改科学计数为普通计数
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 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..42c091c 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;
@@ -546,7 +547,11 @@
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));
+ }
}
}
}
--
Gitblit v1.8.0