From 436eacf9b8a7db52ecd026eb23554a7ce43da221 Mon Sep 17 00:00:00 2001 From: zhangxin10 Date: Wed, 9 Dec 2015 21:58:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E4=BF=9D=E5=AD=98-=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E4=B8=8A=E6=AC=A1=E5=A4=84=E7=90=86=E6=97=B6=E9=97=B4=E6=8A=BD?= =?UTF-8?q?=E6=88=90=E4=B8=80=E4=B8=AA=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../alarm/procesor/AlarmMessageProcessor.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) 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)) +