Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/AsyncNoticeHandle.java

@@ -886,7 +886,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);
@@ -932,7 +931,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);
@@ -954,5 +952,44 @@
      return map;
   }


   /**
    * 策略19: 大坝安全监测告警-短信
    *
    * @param alarmRule 告警规则信息
    * @param alarmRuleDetail 告警规则详情信息
    * @param ztData 告警数据
    * @param columnList 告警模板动态内容key
    * @param flag 是否包含日期
    * @param adCode 行政区code用户过滤数据
    * @param isSendStation 是否发送站内信
    * @return
    */
   @Async
   public Map<String, Object> damSafetyHandle(AlarmRule alarmRule,
                        AlarmRuleDetail alarmRuleDetail,
                        JSONArray ztData,
                        List<String> columnList,
                        Boolean flag,
                        String adCode,
                        Boolean isSendStation,
                        String uuid) {
      Map<String, Object> map = new HashMap<>();
      // 只发短信，将发短信信息组装好
      SmsRequestTemplate smsRequestTemplate
         = noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size() > 0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list, alarmRule, uuid);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         map = smsService.sendSignMsg(smsRequestTemplate);
         // 调用短信服务
         return map;
      }
      return map;
   }
}