查询因子map的key修改为中文

ZhuDongming

2019-08-02 39f896b4b357d055ed755de6ab2fefd17df38423

 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;

@@ -50,6 +51,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"})

@@ -532,6 +536,25 @@
    @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.selectByExample(null);

        System.out.println(sensors);

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

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

                    for (Sensor sensor : sensors) {

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

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

                        }

                    }

                }

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

                listMapNew.add(new_map);

                new_map = new LinkedHashMap<>();

            }

        }

        return listMapNew;

    }

}