Commit 600e079f by 汪志阳

fix:租户禁用不推送消息

parent 98fe34dd
INSERT INTO dev_iot_yanglao_platform.sys_dictionary (id, code, name, value, sort, description, category_id, create_date,
INSERT INTO dev_iot_yanglao_platform.sys_dictionary (id, code, name, value, sort, description, category_id, create_date,
update_date, del_flag, create_by, update_by, eng_name)
VALUES ('213', 'alarm.sendType.childWechat', '子女端小程序', '6', 4, '', '201', '2022-05-16 17:13:23',
'2022-05-16 17:13:27', '0', null, null, null);
\ No newline at end of file
......@@ -425,17 +425,16 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
notifyChannel = "6";
}
PlatTenant platTenant = platTenantService.getById(alarmConfig.getTenantId());
if(platTenant == null){
if (platTenant == null || !"1".equals(platTenant.getStatus())) {
return;
}
String alertChannel = platTenant.getAlertChannel();
if(StringUtils.isBlank(alertChannel)){
return;
// 微信公众号
alertChannel = "6";
}
String[] tenantChannels = alertChannel.split(",");
List<String> tenantChannelList = Lists.newArrayList(Arrays.asList(tenantChannels));
// 微信公众号
tenantChannelList.add("6");
String[] split = notifyChannel.split(",");
for (String sendType : split) {
//租户告警渠道 没配置的 就不发送
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment