diff --git a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java index 065e2c242..3f652958e 100644 --- a/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java +++ b/skywalking-alarm/src/main/java/com/ai/cloud/skywalking/alarm/procesor/AlarmMessageProcessor.java @@ -51,8 +51,7 @@ public class AlarmMessageProcessor { // 没有数据需要发送 if (sentData.size() <= 0) { // 修改-保存上次处理时间 - rule.setPreviousFireTimeM(currentFireTimeM); - savePreviousFireTime(userInfo.getUserId(), rule.getRuleId(), currentFireTimeM); + dealPreviousFireTime(userInfo, rule, currentFireTimeM); } else { if ("0".equals(rule.getTodoType())) { // 发送邮件 @@ -75,14 +74,18 @@ public class AlarmMessageProcessor { } } // 修改-保存上次处理时间 - rule.setPreviousFireTimeM(currentFireTimeM); - savePreviousFireTime(userInfo.getUserId(), rule.getRuleId(), currentFireTimeM); + dealPreviousFireTime(userInfo, rule, currentFireTimeM); } } } + private static void dealPreviousFireTime(UserInfo userInfo, AlarmRule rule, long currentFireTimeM) { + rule.setPreviousFireTimeM(currentFireTimeM); + savePreviousFireTime(userInfo.getUserId(), rule.getRuleId(), currentFireTimeM); + } + private static String generateSubjects(int count, long startTime, long endTime) { String title = "[Warning] There were " + count + " alarm information between " + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date(startTime)) +