Merge remote-tracking branch 'origin/master'

于紫祥_1901

2020-11-18 d0fe2eb9cefc7e3bfdddc5fa66633057c42697fc

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

@@ -68,6 +68,9 @@

    @Override
    public Map<String, Object> getPollutionSourceDataByHour(Map<String, Object> parameters) throws Exception {
        String yearAndDay = String.valueOf(parameters.get("yearAndDay"));
        yearAndDay = yearAndDay.replace("-","");
        parameters.put("yearAndDay",yearAndDay);
        List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
        List<String> sensorKeys = new ArrayList<>();
        for (Sensor sensor : sensors) {
@@ -90,6 +93,9 @@

    @Override
    public Map<String, Object> getPollutionSourceDataAll(Map<String, Object> parameters) throws Exception {
        String yearAndDay = String.valueOf(parameters.get("yearAndDay"));
        yearAndDay = yearAndDay.replace("-","");
        parameters.put("yearAndDay",yearAndDay);
        List<Sensor> sensors = sensorMapper.getSensorsByMac(parameters);
        List<String> sensorKeys = new ArrayList<>();
        for (Sensor sensor : sensors) {