From e66e35663ae576c94d4772195bd224bfaf580ec7 Mon Sep 17 00:00:00 2001
From: ZhuDongming <773644075@qq.com>
Date: Tue, 13 Aug 2019 11:12:00 +0800
Subject: [PATCH] 判断无人机查询起始时间是否是前一个小时内，调用不同的查询接口
---
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 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..472bba7 100644
--- a/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
+++ b/src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -6,6 +6,8 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
import java.time.temporal.TemporalAdjusters;
import java.util.ArrayList;
import java.util.Arrays;
@@ -49,6 +51,7 @@
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;
@@ -62,6 +65,9 @@
@Resource
private HistoryMinutelyMapper historyMinutelyMapper;
+
+ @Resource
+ private HistoryMapper historyMapper;
@Resource
private DeviceMapper deviceMapper;
@@ -536,18 +542,28 @@
*/
@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));
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>> listMap=null;
+ if(flag){
+ listMap = historyMapper.getSensorDataToday(parameters);
+ }else{
+ listMap = historyMinutelyMapper.getSensorData(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("uavDate"));
+ new_map.put("������", map.get("time"));
for (String key : map.keySet()) {
for (Sensor sensor : sensors) {
if (sensor.getSensorKey().equals(key)) {
--
Gitblit v1.8.0