From 471f693ac87a6ed6a2b00e93472b025266c0271f Mon Sep 17 00:00:00 2001
From: jinpengyong <jpy123456>
Date: Mon, 13 Nov 2023 09:27:19 +0800
Subject: [PATCH] Merge branch 'wb' of http://blit.7drlb.com:8888/r/moral into qa
---
screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
index c290dc5..40b13b6 100644
--- a/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
+++ b/screen-api/src/main/java/com/moral/api/service/impl/HistoryFiveMinutelyServiceImpl.java
@@ -39,6 +39,7 @@
import org.springframework.stereotype.Service;
import org.springframework.util.ObjectUtils;
+import java.text.DecimalFormat;
import java.util.*;
import java.util.stream.Collectors;
@@ -292,6 +293,7 @@
}
}
+ String str = new DecimalFormat("#.######").format(Double.parseDouble(result.get("a21005").toString()));
QueryFiveDataByMacVO queryFiveDataByMacVO = new QueryFiveDataByMacVO();
queryFiveDataByMacVO.setName(device.getName());
queryFiveDataByMacVO.setDataTime(datas.get("dataTime").toString());
@@ -299,7 +301,7 @@
queryFiveDataByMacVO.setA34002(result.get("a34002").toString());
queryFiveDataByMacVO.setA21026(result.get("a21026").toString());
queryFiveDataByMacVO.setA21004(result.get("a21004").toString());
- queryFiveDataByMacVO.setA21005(result.get("a21005").toString());
+ queryFiveDataByMacVO.setA21005(str);
queryFiveDataByMacVO.setA05024(result.get("a05024").toString());
queryFiveDataByMacVO.setA01008(result.get("a01008").toString());
queryFiveDataByMacVO.setA01007(result.get("a01007").toString());
--
Gitblit v1.8.0