处理告警恢复

jjt-biz/src/main/java/com/jjt/biz/service/impl/AlarmRecordServiceImpl.java

@@ -145,19 +145,15 @@ public class AlarmRecordServiceImpl implements IAlarmRecordService {
         AlarmRecord record = recordMap.get(om.getObjMetricsId());
         Map<String, String> pair = getAlarmLevel(om.getDValue().floatValue(), om);
         if (pair == null) {
-            return result;
-        }
-        String alarmLevel = pair.get("key");
-        if (alarmLevel == null) {
             //如果没有告警，且之前有告警记录，则结束之前告警
             if (record != null) {
                 record.setAlarmType("2");
                 record.setEndTime(date);
                 result.put("update", record);
-//                updateAlarmRecord(record);
             }
             return result;
         }
+        String alarmLevel = pair.get("key");
 
         if (record != null) {
             if (alarmLevel.equals(record.getAlarmLevel())) {