修改根据mac动态获得查询因子

ZhuDongming

2019-08-06 957edae85001e7125b0617562aeca9afaef89f17

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

@@ -536,14 +536,18 @@
     */

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

        List<Sensor> sensors = sensorMapper.selectByExample(null);

        System.out.println(sensors);

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

@@ -555,7 +559,6 @@
                        }

                    }

                }

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

                listMapNew.add(new_map);

                new_map = new LinkedHashMap<>();

            }