Merge branch 'dev' into fix_sleep

server-service/src/main/java/com/makeit/entity/saas/PlatTenant.java

@@ -45,7 +45,7 @@ public class PlatTenant extends BaseEntity {
     private String menuList;
     private String menuList;
 
 
     /**
     /**
-     * 告警渠道 1-短信 2-邮件 3-语音短信 4-云龄工单 5-晶奇工单
+     * 告警渠道 1-短信 2-邮件 3-语音短信 4-云龄工单 5-晶奇工单 6-微信公众号
      */
      */
     private String alertChannel;
     private String alertChannel;
 
 

server-service/src/main/java/com/makeit/service/platform/alarm/impl/PlatAlarmRecordServiceImpl.java

@@ -420,8 +420,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
                                  List<SendTypeEnum> notifyChannelList, List<MsgSendDTO.ReceiverInfo> receiverInfos) {
                                  List<SendTypeEnum> notifyChannelList, List<MsgSendDTO.ReceiverInfo> receiverInfos) {
         log.info("开始短信通知:{}", JSON.toJSONString(alarmConfig));
         log.info("开始短信通知:{}", JSON.toJSONString(alarmConfig));
         String notifyChannel = alarmConfig.getNotifyChannel();
         String notifyChannel = alarmConfig.getNotifyChannel();
-        if(StringUtils.isEmpty(notifyChannel)){
-            return;
+        if (StringUtils.isEmpty(notifyChannel)) {
+            // 微信公众号
+            notifyChannel = "6";
         }
         }
         PlatTenant platTenant = platTenantService.getById(alarmConfig.getTenantId());
         PlatTenant platTenant = platTenantService.getById(alarmConfig.getTenantId());
         if(platTenant == null){
         if(platTenant == null){
@@ -432,7 +433,9 @@ public class PlatAlarmRecordServiceImpl extends ServiceImpl<PlatAlarmRecordMappe
             return;
             return;
         }
         }
         String[] tenantChannels = alertChannel.split(",");
         String[] tenantChannels = alertChannel.split(",");
-        List<String> tenantChannelList = Arrays.asList(tenantChannels);
+        List<String> tenantChannelList = Lists.newArrayList(Arrays.asList(tenantChannels));
+        // 微信公众号
+        tenantChannelList.add("6");
         String[] split = notifyChannel.split(",");
         String[] split = notifyChannel.split(",");
         for (String sendType : split) {
         for (String sendType : split) {
             //租户告警渠道 没配置的 就不发送
             //租户告警渠道 没配置的 就不发送