修改判断查询起始时间是当天就调用实时表

ZhuDongming

2019-08-13 a0a84b958c86ce6ca3aaab4acd63db89006a3274

修改判断查询起始时间是当天就调用实时表

 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;

@@ -543,10 +546,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){