map创建调整顺序

ZhuDongming

2019-08-20 ef36c5d9f693c57956f4d0f40688b04fe62fd5f1

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

@@ -5,6 +5,7 @@


import java.math.BigDecimal;

import java.text.ParseException;

import java.text.SimpleDateFormat;

import java.time.LocalDate;

import java.time.temporal.TemporalAdjusters;

import java.util.ArrayList;

@@ -41,7 +42,6 @@
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;

@@ -49,12 +49,10 @@
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;

import com.moral.service.SensorService;



import lombok.val;



@Service

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

@@ -62,6 +60,9 @@


    @Resource

    private HistoryMinutelyMapper historyMinutelyMapper;



    @Resource

    private HistoryMapper historyMapper;



    @Resource

    private DeviceMapper deviceMapper;

@@ -535,34 +536,58 @@
     * @return

     */

    @Override

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

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

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

        for(Sensor sensor:sensors){

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

        String startTime = parameters.get("startTime").toString();

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

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

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

        if (flag) {

            listMap = historyMapper.getSensorDataToday(parameters);

        } else {

            listMap = historyMinutelyMapper.getSensorData(parameters);

        }

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

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

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

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

        if (CollectionUtils.isNotEmpty(listMap)) {

            for (Map<String, Object> map : listMap) {

                new_map.put("时间", map.get("uavDate"));

                Map<String, Object> mapAvg = new LinkedHashMap<>();

                Map<String, Object> mapMin = new LinkedHashMap<>();

                Map<String, Object> mapMax = new LinkedHashMap<>();

                mapAvg.put("时间", map.get("time"));

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

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

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

                            }

                            mapAvg.put(sensor.getDescription(), new BigDecimal(map.get(key).toString()).stripTrailingZeros().toPlainString() + sensor.getUnit());

                        } else if (("min" + sensor.getSensorKey()).equals(key)) {

                            mapMin.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());

                        } else if (("max" + sensor.getSensorKey()).equals(key)) {

                            mapMax.put(sensor.getDescription(), new BigDecimal(map.get(key).toString().replace("\"", "")).stripTrailingZeros().toPlainString());

                        }

                    }

                }

                listMapNew.add(new_map);

                new_map = new LinkedHashMap<>();

                listMapAvg.add(mapAvg);

                listMapMin.add(mapMin);

                listMapMax.add(mapMax);

            }

            listMaps.add(listMapAvg);

            listMaps.add(listMapMin);

            listMaps.add(listMapMax);

        }

        return listMapNew;

        return listMaps;

    }



}