删除无人机经纬度为0的数据

ZhuDongming

2020-04-08 e0c4b15be905f30d6e83025d5a4aca5c7db55a7f

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

@@ -1,11 +1,7 @@
package com.moral.service.impl;



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

import static org.springframework.util.ObjectUtils.isEmpty;



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;

@@ -31,8 +27,6 @@
import java.util.concurrent.Executors;

import java.util.stream.Collectors;



import javax.annotation.Resource;



import org.apache.commons.collections.CollectionUtils;

import org.apache.commons.lang3.time.DateUtils;

import org.springframework.stereotype.Service;

@@ -56,6 +50,11 @@
import com.moral.mapper.SensorMapper;

import com.moral.service.HistoryMinutelyService;



import javax.annotation.Resource;



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

import static org.springframework.util.ObjectUtils.isEmpty;



@Service

@SuppressWarnings({"unchecked", "unused", "rawtypes"})

public class HistoryMinutelyServiceImpl implements HistoryMinutelyService {

@@ -78,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);

@@ -542,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) {

@@ -552,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<>();

@@ -569,7 +585,7 @@
                mapAvg.put("time", map.get("time"));

                mapMin.put("time", map.get("time"));

                mapMax.put("time", map.get("time"));

                for (Entry<String,Object> entry : map.entrySet()) {

                for (Entry<String, Object> entry : map.entrySet()) {

                    for (Sensor sensor : sensors) {

                        if (sensor.getSensorKey().equals(entry.getKey())) {

                            mapAvg.put(entry.getKey(), new BigDecimal(entry.getValue().toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());

@@ -580,6 +596,9 @@
                        }

                    }

                }

                if(mapAvg.get("e76").equals("0°")||mapMin.get("e76").equals("0")||mapMax.get("e76").equals("0")||mapAvg.get("e77").equals("0°")||mapMin.get("e77").equals("0")||mapMax.get("e77").equals("0")){

                    continue;

                }

                listMapAvg.add(mapAvg);

                listMapMin.add(mapMin);

                listMapMax.add(mapMax);