无人机和当天AQI分钟表改表

ZhuDongming

2020-03-31 90f46db2793f5b242f13bf6959ab6c7f5a596c43

 src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java

@@ -49,6 +49,7 @@
import com.moral.mapper.HistoryMinutelyMapper;

import com.moral.mapper.SensorMapper;

import com.moral.service.HistoryMinutelyService;



import javax.annotation.Resource;



import static com.moral.common.bean.Constants.NULL_VALUE;

@@ -76,12 +77,26 @@
    @Override

    public Map<String, Object> getDayAQIByDevice(Map<String, Object> parameters) {

        //ValidateUtil.notNull(parameters.get("mac"), "param.is.null");

        LocalDate localDate = LocalDate.now();

        LocalDate time = LocalDate.now();

        int year = time.getYear();

        int month = time.getMonthValue();

        int day = time.getDayOfMonth();

        if (day == 1) {

            if (month == 1) {

                month = 12;

                year = year - 1;

            } else {

                month = month - 1;

            }

        }

        String monthStr = month < 10 ? ("0" + month) : month + "";

        String yearAndMonth = year + monthStr;

        // 昨日00:00:00

        parameters.put("start", localDate.minusDays(1));

        parameters.put("start", time.minusDays(1));



        // 今日00:00:00

        parameters.put("end", localDate);

        parameters.put("end", time);

        parameters.put("yearAndMonth", yearAndMonth);

        parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));

        Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);

        return getAQIByDataMap(average);

@@ -540,9 +555,11 @@
        String startTime = parameters.get("startTime").toString();

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

        LocalDate time = LocalDate.now();

        int year = startTimeLocalDateTime.getYear();

        int month = startTimeLocalDateTime.getMonthValue();

        String monthStr = month < 10 ? ("0" + month) : month + "";

        String yearAndMonth = year + monthStr;

        List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);

        List<String> sensorKeys = new ArrayList<>();

        for (Sensor sensor : sensors) {

@@ -550,10 +567,11 @@
        }

        parameters.put("sensorKeys", sensorKeys);

        List<Map<String, Object>> listMap = null;

        if (flag) {

            listMap = historyMapper.getSensorDataToday(parameters);

        } else {

        if (year <= 2019) {

            listMap = historyMinutelyMapper.getSensorData(parameters);

        } else {

            parameters.put("yearAndMonth", yearAndMonth);

            listMap = historyMinutelyMapper.getSensorData2020(parameters);

        }

        List<List<Map<String, Object>>> listMaps = new ArrayList<>();

        List<Map<String, Object>> listMapAvg = new ArrayList<>();