update

xufenglei

2019-08-12 b9c7bd2fd2953d13b24efdc2d0289dc70c0705ee

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

@@ -30,6 +30,7 @@


import javax.annotation.Resource;



import org.apache.commons.collections.CollectionUtils;

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

import org.springframework.stereotype.Service;

import org.springframework.util.ObjectUtils;

@@ -40,6 +41,7 @@
import com.moral.common.util.ParameterUtils;

import com.moral.common.util.ReportTimeFormat;

import com.moral.common.util.ResourceUtil;

import com.moral.common.util.StringUtils;

import com.moral.common.util.ValidateUtil;

import com.moral.entity.Sensor;

import com.moral.entity.charts.DataCondition;

@@ -50,6 +52,9 @@
import com.moral.mapper.HistoryMinutelyMapper;

import com.moral.mapper.SensorMapper;

import com.moral.service.HistoryMinutelyService;

import com.moral.service.SensorService;



import lombok.val;



@Service

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

@@ -80,27 +85,27 @@
        Map<String, Double> average = historyMinutelyMapper.getSersionAvgByDevice(parameters);

        return getAQIByDataMap(average);

    }

    


    @Override

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

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

       LocalDate localDate = LocalDate.now();

       System.out.println("localDate:"+localDate);

       // 昨日00:00:00

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

    	
       Calendar calendar = Calendar.getInstance();

      calendar.setTime(new Date());

      calendar.set(Calendar.HOUR,calendar.get(Calendar.HOUR) - 1);

      System.out.println("++++++"+calendar);

      int hour = calendar.get(Calendar.HOUR)-1;

      System.out.println("当前小时减一"+hour);

    	
       // 今日00:00:00

       parameters.put("end", localDate);

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

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

       return getAQIByDataMap(average);

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

        LocalDate localDate = LocalDate.now();

        System.out.println("localDate:" + localDate);

        // 昨日00:00:00

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



        Calendar calendar = Calendar.getInstance();

        calendar.setTime(new Date());

        calendar.set(Calendar.HOUR, calendar.get(Calendar.HOUR) - 1);

        System.out.println("++++++" + calendar);

        int hour = calendar.get(Calendar.HOUR) - 1;

        System.out.println("当前小时减一" + hour);



        // 今日00:00:00

        parameters.put("end", localDate);

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

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

        return getAQIByDataMap(average);

    }



    private Map<String, Object> getAQIByDataMap(Map<String, Double> average) {

@@ -531,7 +536,33 @@
     */

    @Override

    public List<Map<String, Object>> getSensorData(Map<String, Object> parameters) {

        parameters.put("sensorKeys",Arrays.asList("e1", "e2", "e3", "e4", "e6", "e7", "e9", "e10", "e11", "e15", "e16", "e17", "e27", "e28", "e76", "e77", "e78", "e79", "e80", "e81"));

        return historyMinutelyMapper.getSensorData(parameters);

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

                for (String key : map.keySet()) {

                    for (Sensor sensor : sensors) {

                        if (sensor.getSensorKey().equals(key)) {

                            if("e79".equals(key)||"e80".equals(key)||"e81".equals(key)){

                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString())+sensor.getUnit());

                            }else{

                                new_map.put(sensor.getDescription(), map.get(key)+sensor.getUnit());

                            }

                        }

                    }

                }

                listMapNew.add(new_map);

                new_map = new LinkedHashMap<>();

            }

        }

        return listMapNew;

    }

}