update

ZhuDongming

2019-09-04 b96cdf306e9124f93e5ca33e006728a2f4552c4d

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

@@ -15,6 +15,7 @@
import com.moral.mapper.SensorMapper;
import com.moral.service.DeviceService;
import com.moral.service.HistoryHourlyService;
import com.moral.service.SensorService;
import javax.annotation.Resource;

@Service
@@ -24,6 +25,9 @@

    @Resource
    private DeviceService deviceService;

    @Resource
    private SensorService sensorService;

    @Resource
    private SensorMapper sensorMapper;
@@ -36,7 +40,18 @@
            sensorKeys.add(sensor.getSensorKey());
        }
        parameters.put("sensorKeys", sensorKeys);
        return historyHourlyMapper.getPollutionSourceData(parameters);
        Map<String, Object> pollutionSourceData = historyHourlyMapper.getPollutionSourceData(parameters);
        if (MapUtils.isNotEmpty(pollutionSourceData)) {
            Map<String, String> sensorsMap = sensorService.getSensorsMap(parameters);
            String selectSensorKey = parameters.get("sensorKey").toString();
            for (Map.Entry<String, String> s : sensorsMap.entrySet()) {
                if (selectSensorKey.equals(s.getKey())) {
                    selectSensorKey = s.getValue();
                }
            }
            pollutionSourceData.put("selectSensorKey", selectSensorKey);
        }
        return pollutionSourceData;
    }

    @Override