From 5fed7b486fea656ae9878166e3530b7e29eae7eb Mon Sep 17 00:00:00 2001
From: lizijie <lzjiiie@163.com>
Date: Fri, 30 Aug 2019 09:57:06 +0800
Subject: [PATCH] 站点排名
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 133 ++++++++++----------------------------------
1 files changed, 30 insertions(+), 103 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index cdc0142..ba6fc1a 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -3,8 +3,6 @@
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;
@@ -41,13 +39,11 @@
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;
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;
@@ -59,9 +55,6 @@
import com.moral.mapper.HistoryMinutelyMapper;
import com.moral.mapper.SensorMapper;
import com.moral.service.HistoryMinutelyService;
-import com.moral.service.SensorService;
-
-import lombok.val;
@Service
@SuppressWarnings({"unchecked", "unused", "rawtypes"})
@@ -545,14 +538,13 @@
* @return
*/
@Override
- public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
+ public List<List<Map<String, Object>>> getSensorData(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();
- }
+ DateTimeFormatter dateTimeFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+ LocalDateTime startTimeLocalDateTime = LocalDateTime.parse(startTime, dateTimeFormatter);
+ LocalDate today = LocalDate.now();
+ LocalDate startTimeLocalDate=startTimeLocalDateTime.toLocalDate();
+ Boolean flag=today.isEqual(startTimeLocalDate);
List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
List<String> sensorKeys = new ArrayList<>();
for (Sensor sensor : sensors) {
@@ -565,103 +557,38 @@
} else {
listMap = historyMinutelyMapper.getSensorData(parameters);
}
- List<Map<String, Object>> listMapNew = new ArrayList<>();
- Map<String, Object> new_map = new LinkedHashMap<>();
+ List<List<Map<String, Object>>> listMaps = new ArrayList<>();
+ List<Map<String, Object>> listMapAvg = new ArrayList<>();
+ List<Map<String, Object>> listMapMin = new ArrayList<>();
+ List<Map<String, Object>> listMapMax = new ArrayList<>();
if (CollectionUtils.isNotEmpty(listMap)) {
for (Map<String, Object> map : listMap) {
- new_map.put("������", map.get("time"));
- for (String key : map.keySet()) {
+ Map<String, Object> mapAvg = new LinkedHashMap<>();
+ Map<String, Object> mapMin = new LinkedHashMap<>();
+ Map<String, Object> mapMax = new LinkedHashMap<>();
+ mapAvg.put("time", map.get("time"));
+ mapMin.put("time", map.get("time"));
+ mapMax.put("time", map.get("time"));
+ for (Entry<String,Object> entry : map.entrySet()) {
for (Sensor sensor : sensors) {
- if (sensor.getSensorKey().equals(key)) {
- new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ if (sensor.getSensorKey().equals(entry.getKey())) {
+ mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ } else if (("min" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMin.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ } else if (("max" + sensor.getSensorKey()).equals(entry.getKey())) {
+ mapMax.put(entry.getKey().substring(3), new BigDecimal(entry.getValue().toString().replace("\"", "")).stripTrailingZeros().toPlainString());
}
}
}
- listMapNew.add(new_map);
- new_map = new LinkedHashMap<>();
+ listMapAvg.add(mapAvg);
+ listMapMin.add(mapMin);
+ listMapMax.add(mapMax);
}
+ listMaps.add(listMapAvg);
+ listMaps.add(listMapMin);
+ listMaps.add(listMapMax);
}
- 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)) {
- new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
- }
- }
- }
- 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)) {
- new_map.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
- }
- }
- }
- listMapNew.add(new_map);
- new_map = new LinkedHashMap<>();
- }
- }
- return listMapNew;
+ return listMaps;
}
}
--
Gitblit v1.8.0