zhongrj
2023-08-01 4fd01645f3c8591840a4ef0d2665da4f27a5a812
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java
@@ -8,6 +8,7 @@
import cn.gistack.alerts.notice.enums.DangerEnum;
import cn.gistack.alerts.sms.service.SmsService;
import cn.gistack.alerts.sms.vo.SmsRequestTemplate;
import cn.gistack.sm.intelligentCall.feign.OutCallClient;
import com.alibaba.fastjson.JSONArray;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Async;
@@ -447,7 +448,6 @@
                                           Boolean isSendStation,
                                           String uuid) {
      Map<String, Object> map = new HashMap<>();
//      String uuid = alarmRuleDetail.getTemplateId() + UUID.randomUUID().toString();
      // 只发短信,将发短信信息组装好
      SmsRequestTemplate smsRequestTemplate
         = noticeHandle.getSendSmsTemplate(ztData, alarmRule, alarmRuleDetail, columnList, flag, adCode, uuid, isSendStation);
@@ -462,7 +462,8 @@
               list.add(alarmRecord.getId().toString());
            }
         }
         map = smsService.sendSignMsg(smsRequestTemplate);
         List<String> list = noticeHandle.createOutCallTaskByAlarm(smsRequestTemplate);
         map.put("list",list);
         // 调用短信服务
         return map;
      }