|
@@ -1,8 +1,20 @@
|
|
package cn.com.ctop.alarm.modules.service.impl;
|
|
package cn.com.ctop.alarm.modules.service.impl;
|
|
|
|
|
|
import cn.com.ctop.alarm.modules.constant.MatchLogic;
|
|
import cn.com.ctop.alarm.modules.constant.MatchLogic;
|
|
-import cn.com.ctop.alarm.modules.entity.*;
|
|
|
|
-import cn.com.ctop.alarm.modules.mapper.*;
|
|
|
|
|
|
+import cn.com.ctop.alarm.modules.entity.AlarmEventSend;
|
|
|
|
+import cn.com.ctop.alarm.modules.entity.RuleAccountTemplate;
|
|
|
|
+import cn.com.ctop.alarm.modules.entity.RuleAccountThreshold;
|
|
|
|
+import cn.com.ctop.alarm.modules.entity.RuleBase;
|
|
|
|
+import cn.com.ctop.alarm.modules.entity.RuleGroup;
|
|
|
|
+import cn.com.ctop.alarm.modules.entity.RuleIndicator;
|
|
|
|
+import cn.com.ctop.alarm.modules.entity.RuleTemplate;
|
|
|
|
+import cn.com.ctop.alarm.modules.mapper.AlarmEventSendMapper;
|
|
|
|
+import cn.com.ctop.alarm.modules.mapper.RuleAccountTemplateMapper;
|
|
|
|
+import cn.com.ctop.alarm.modules.mapper.RuleAccountThresholdMapper;
|
|
|
|
+import cn.com.ctop.alarm.modules.mapper.RuleBaseMapper;
|
|
|
|
+import cn.com.ctop.alarm.modules.mapper.RuleGroupMapper;
|
|
|
|
+import cn.com.ctop.alarm.modules.mapper.RuleIndicatorMapper;
|
|
|
|
+import cn.com.ctop.alarm.modules.mapper.RuleTemplateMapper;
|
|
import cn.com.ctop.alarm.modules.service.IRuleAccountTemplateService;
|
|
import cn.com.ctop.alarm.modules.service.IRuleAccountTemplateService;
|
|
import cn.com.ctop.alarm.modules.service.IRuleGroupService;
|
|
import cn.com.ctop.alarm.modules.service.IRuleGroupService;
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
import cn.com.ctop.common.module.entity.CtopOauthToken;
|
|
@@ -63,6 +75,8 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
private ICtopOauthTokenService oauthTokenService;
|
|
private ICtopOauthTokenService oauthTokenService;
|
|
@Autowired
|
|
@Autowired
|
|
private IRuleDataAccountService ruleDataAccountService;
|
|
private IRuleDataAccountService ruleDataAccountService;
|
|
|
|
+ @Autowired
|
|
|
|
+ private AlarmEventSendMapper alarmEventSendMapper;
|
|
private JSONObject userObj = null;
|
|
private JSONObject userObj = null;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -319,8 +333,19 @@ public class RuleGroupServiceImpl extends ServiceImpl<RuleGroupMapper, RuleGroup
|
|
} else if ("TEL".equals(sendType)) {
|
|
} else if ("TEL".equals(sendType)) {
|
|
|
|
|
|
} else {
|
|
} else {
|
|
|
|
+ ISendMessageService sendMessageService = this.sendMessageService;
|
|
sendMessageService.sendMessage(user.getString("id"), msg);
|
|
sendMessageService.sendMessage(user.getString("id"), msg);
|
|
}
|
|
}
|
|
|
|
+ log.debug("账户{}的{}预警已发送", accountId, ruleGroup.getGroupName());
|
|
|
|
+ if (!Check.isNull(msg)) {
|
|
|
|
+ AlarmEventSend send = new AlarmEventSend();
|
|
|
|
+ send.setAlarmDetail(msg);
|
|
|
|
+ send.setAlarmStatus(NoEn.NO1.valueStr());
|
|
|
|
+ send.setEventRuleId(ruleGroup.getId());
|
|
|
|
+ send.setAlarmCondition(ruleGroup.getGroupName());
|
|
|
|
+ send.setUserId(user.getString("id"));
|
|
|
|
+ alarmEventSendMapper.insert(send);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|