ZhuDongming
2019-08-08 2d4d397ce9ea8e53d4a63b6463c02a7586fb27ea
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -536,9 +536,12 @@
     */
    @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<>();
@@ -549,9 +552,9 @@
                    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()));
                                new_map.put(sensor.getDescription(), StringUtils.scientificCountingConversion(map.get(key).toString())+sensor.getUnit());
                            }else{
                                new_map.put(sensor.getDescription(), map.get(key));
                                new_map.put(sensor.getDescription(), map.get(key)+sensor.getUnit());
                            }
                        }
                    }