Merge remote-tracking branch 'origin/master'
| | |
| | | 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;
|
| | | }
|