fengxiang
2018-07-31 455498f1454449bfd127a560eeb01ffff823a6ca
Merge remote-tracking branch 'origin/master'
1 files modified
5 ■■■■ changed files
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java 5 ●●●● patch | view | raw | blame | history
src/main/java/com/moral/service/impl/HistoryMinutelyServiceImpl.java
@@ -298,7 +298,10 @@
        Object type = parameters.get("type");
        if ("year".equals(type) || "month".equals(type)) {
            parameters.put("sensorKeys", Arrays.asList("e1", "e2", "e10", "e11", "e15", "e16"));
            resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
            List<Map<String, Object>> alarmData = alarmDailyMapper.getAlarmData(parameters);
            if (!ObjectUtils.isEmpty(alarmData)) {
                resultMap.put("alarmData" + part, alarmDailyMapper.getAlarmData(parameters).get(0));
            }
        }
        return resultMap;
    }