From e34d88ad7d3d950da12f032e6932ba14f868db72 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Wed, 21 Aug 2019 10:22:50 +0800
Subject: [PATCH] 修改大屏无人机地图弹窗显示不全问题，设置可拖动
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
index a7fba8d..ce67df4 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -5,6 +5,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
@@ -41,7 +42,6 @@
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;
@@ -49,12 +49,10 @@
import com.moral.entity.charts.TimePeriod;
import com.moral.mapper.AlarmDailyMapper;
import com.moral.mapper.DeviceMapper;
+import com.moral.mapper.HistoryMapper;
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"})
@@ -62,6 +60,9 @@
@Resource
private HistoryMinutelyMapper historyMinutelyMapper;
+
+ @Resource
+ private HistoryMapper historyMapper;
@Resource
private DeviceMapper deviceMapper;
@@ -535,34 +536,58 @@
* @return
*/
@Override
- public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {
- List<Sensor> sensors=sensorMapper.getSensorsByMac(parameters);
- List<String> sensorKeys=new ArrayList<>();
- for(Sensor sensor:sensors){
+ 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();
+ }
+ 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 = historyMinutelyMapper.getSensorData(parameters);
- List<Map<String, Object>> listMapNew = new ArrayList<>();
- Map<String, Object> new_map = new LinkedHashMap<>();
+ List<Map<String, Object>> listMap = null;
+ if (flag) {
+ listMap = historyMapper.getSensorDataToday(parameters);
+ } else {
+ listMap = historyMinutelyMapper.getSensorData(parameters);
+ }
+ 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("uavDate"));
+ 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 (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())+sensor.getUnit());
- }else{
- new_map.put(sensor.getDescription(), map.get(key)+sensor.getUnit());
- }
+ mapAvg.put(key, new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());
+ } else if (("min" + sensor.getSensorKey()).equals(key)) {
+ mapMin.put(key.substring(3), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());
+ } else if (("max" + sensor.getSensorKey()).equals(key)) {
+ mapMax.put(key.substring(3), new BigDecimal(map.get(key).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;
+ return listMaps;
}
+
}
--
Gitblit v1.8.0