判断无人机查询起始时间是否是前一个小时内，调用不同的查询接口

ZhuDongming

2019-08-13 e66e35663ae576c94d4772195bd224bfaf580ec7

判断无人机查询起始时间是否是前一个小时内，调用不同的查询接口

 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)) {