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

guoshilong

2024-03-13 c8b03d3da4e29fc3fb9a42ca157738256c331a00

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

@@ -176,7 +176,6 @@
      // 只发短信，将发短信信息组装好
      SmsRequestTemplate smsRequestTemplate
         = noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);

      // 拼接后面内容
      if (smsRequestTemplate.getPersonVOList().size()>0) {
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
@@ -427,8 +426,7 @@
   }

   /**
    * 策略9.1: 水位接近设计洪水位告警-电话
    *
    * 外呼告警信息
    * @param alarmRule 告警规则信息
    * @param alarmRuleDetail 告警规则详情信息
    * @param ztData 告警数据
@@ -439,7 +437,7 @@
    * @return
    */
   @Async
   public Map<String, Object> waterComeDesignHandleCall(AlarmRule alarmRule,
   public Map<String, Object> outCallHandleCall(AlarmRule alarmRule,
                                            AlarmRuleDetail alarmRuleDetail,
                                            JSONArray ztData,
                                            List<String> columnList,
@@ -888,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);
@@ -934,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);
@@ -956,5 +952,67 @@
      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;
   }

   public void damSafetySyHandle(AlarmRule alarmRule, AlarmRuleDetail alarmRuleDetail, JSONArray ztData, List<String> columnList, boolean flag, String adCode, boolean isSendStation, String uuid) {
      // 只发短信，将发短信信息组装好
      SmsRequestTemplate smsRequestTemplate
         = noticeHandle.getSendSmsTemplate(ztData,alarmRule,alarmRuleDetail,columnList ,flag,adCode,uuid,isSendStation);
      // 拼接内容后面的联系方式,当前模板县水利部人员姓名电话
      if (smsRequestTemplate.getPersonVOList().size()>0) {
         // 遍历，拼接县水利部人员电话  拼接发送的模板内容
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 后面依次拼接 巡查责任人姓名，技术责任人姓名，
//            noticeHandle.addPatrolTechnologyInfo(list,false);
            // 拼接市县水利部人员姓名及联系方式
//            noticeHandle.addCityCountyBusinessPersonInfo(list);
            // 保存告警记录信息
            AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         // 保存站内信记录信息
         noticeHandle.saveInStationInfo(smsRequestTemplate,alarmRule);
      }
   }
}