From 8bfa93e6f92dce08c036766747aa2aba13217280 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Fri, 16 Aug 2019 11:58:33 +0800
Subject: [PATCH] 删除科学计数转为普通计数方法
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 103 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 99 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index 472bba7..256baa1 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -3,8 +3,11 @@
import static com.moral.common.bean.Constants.NULL_VALUE;
import static org.springframework.util.ObjectUtils.isEmpty;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.math.BigDecimal;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -38,6 +41,7 @@
import org.springframework.util.ObjectUtils;
import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
import com.alibaba.fastjson.TypeReference;
import com.moral.common.util.CalculateUtils;
import com.moral.common.util.ParameterUtils;
@@ -543,10 +547,12 @@
@Override
public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
String startTime=parameters.get("startTime").toString();
- DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
- LocalDateTime now = LocalDateTime.now();
- LocalDateTime datetime = LocalDateTime.parse(startTime, formatter);
- Boolean flag= datetime.isAfter(now.minusHours(1));
+ Boolean flag=null;
+ try {
+ flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());
+ }catch (ParseException e) {
+ e.printStackTrace();
+ }
List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);
List<String> sensorKeys=new ArrayList<>();
for(Sensor sensor:sensors){
@@ -581,4 +587,93 @@
}
return listMapNew;
}
+
+ @Override
+ public List<Map<String, Object>> getSensorDataMin(Map<String, Object> parameters) {
+ String startTime=parameters.get("startTime").toString();
+ Boolean flag=null;
+ try {
+ flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());
+ }catch (ParseException e) {
+ e.printStackTrace();
+ }
+ List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);
+ List<String> sensorKeys=new ArrayList<>();
+ for(Sensor sensor:sensors){
+ sensorKeys.add(sensor.getSensorKey());
+ }
+ parameters.put("sensorKeys", sensorKeys);
+ List<Map<String, Object>> listMap=null;
+ if(flag){
+ listMap = historyMapper.getSensorDataTodayMin(parameters);
+ }else{
+ listMap = historyMinutelyMapper.getSensorDataMin(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("time"));
+ for (String key : map.keySet()) {
+ for (Sensor sensor : sensors) {
+ if (sensor.getSensorKey().equals(key)) {
+ if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
+ new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString().replace("\"", "")));
+ }else{
+ new_map.put(sensor.getDescription(), map.get(key).toString().replace("\"", ""));
+ }
+ }
+ }
+ }
+ listMapNew.add(new_map);
+ new_map = new LinkedHashMap<>();
+ }
+ }
+ return listMapNew;
+ }
+
+ @Override
+ public List<Map<String, Object>> getSensorDataMax(Map<String, Object> parameters) {
+ String startTime=parameters.get("startTime").toString();
+ Boolean flag=null;
+ try {
+ flag = DateUtils.isSameDay(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").parse(startTime), new Date());
+ }catch (ParseException e) {
+ e.printStackTrace();
+ }
+ List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);
+ List<String> sensorKeys=new ArrayList<>();
+ for(Sensor sensor:sensors){
+ sensorKeys.add(sensor.getSensorKey());
+ }
+ parameters.put("sensorKeys", sensorKeys);
+ List<Map<String, Object>> listMap=null;
+ if(flag){
+ listMap = historyMapper.getSensorDataTodayMax(parameters);
+ }else{
+ listMap = historyMinutelyMapper.getSensorDataMax(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("time"));
+ for (String key : map.keySet()) {
+ for (Sensor sensor : sensors) {
+ if (sensor.getSensorKey().equals(key)) {
+ if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){
+ new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString().replace("\"", "")));
+ }else{
+ new_map.put(sensor.getDescription(), map.get(key).toString().replace("\"", ""));
+ }
+ }
+ }
+ }
+ listMapNew.add(new_map);
+ new_map = new LinkedHashMap<>();
+ }
+ }
+ return listMapNew;
+ }
+
}
--
Gitblit v1.8.0