|
|
@ -72,11 +72,10 @@ public class FdpAlarmServiceImpl implements FdpAlarmService { |
|
|
|
if (ObjectUtils.isEmpty(alarms)) { |
|
|
|
if (ObjectUtils.isEmpty(alarms)) { |
|
|
|
return new ArrayList<>(); |
|
|
|
return new ArrayList<>(); |
|
|
|
} |
|
|
|
} |
|
|
|
if(!FDP_INVALID_STATUS.equals(alarms.getStatus()) && !FDP_INVALID_ZOME_STATUS.equals(alarms.getStatus())){ |
|
|
|
if(FDP_INVALID_STATUS.equals(alarms.getStatus()) || FDP_INVALID_ZOME_STATUS.equals(alarms.getStatus())){ |
|
|
|
return new ArrayList(); |
|
|
|
return Collections.singletonList(getAlarmEntity(alarms)); |
|
|
|
} |
|
|
|
} |
|
|
|
AlarmEntity entity = getAlarmEntity(alarms); |
|
|
|
return new ArrayList<>(); |
|
|
|
return Collections.singletonList(entity); |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private AlarmEntity getAlarmEntity(FdpAlarmVo item) { |
|
|
|
private AlarmEntity getAlarmEntity(FdpAlarmVo item) { |
|
|
|