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

guoshilong

2023-06-02 65f8440525654842e748d1840be61cca9f0417e2

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

@@ -6,9 +6,9 @@
import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
import cn.gistack.alerts.sms.service.ISmsTemplateService;
import cn.gistack.sm.intelligentCall.constant.ZtConstant;
import cn.gistack.alerts.alarmRule.notice.constant.PtInfoConstant;
import cn.gistack.alerts.alarmRule.notice.constant.ZtApiDataColumnConstant;
import cn.gistack.alerts.alarmRule.notice.constant.ZtApiUrlConstant;
import cn.gistack.alerts.notice.constant.PtInfoConstant;
import cn.gistack.alerts.notice.constant.ZtApiDataColumnConstant;
import cn.gistack.alerts.notice.constant.ZtApiUrlConstant;
import cn.gistack.alerts.notice.enums.PersonEnum;
import cn.gistack.alerts.notice.util.FormatUtil;
import cn.gistack.sm.sjztmd.vo.PersonVO;
@@ -213,16 +213,15 @@
            // 添加平台电话
            list.add(PtInfoConstant.serverPhone);
            // 保存告警记录信息
//            AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
//            if (null != alarmRecord) {
//               list.add(alarmRecord.getId().toString());
               list.add("1123");
//            }
            AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         // 调用短信服务
         smsService.sendSignMsg(smsRequestTemplate);
      }
      // 保存预警记录
      // 返回
      return "水位信息接收不到";
   }

@@ -234,7 +233,28 @@
    * @return
    */
   public String waterDataExcHandle(String arg1, String arg2) {
      // 业务逻辑处理 2...
      // 查询当前策略对应的告警规则信息
      AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
      if (null!=alarmRule) {
         // 调用中台服务接口查询数据
         JSONArray ztData = getZtData("", ZtApiUrlConstant.res_z_not_normal_api);
         // 只发短信，将发短信信息组装好
         SmsRequestTemplate smsRequestTemplate = getSendSmsTemplate(ztData, "2431012248591",alarmRule, ZtApiDataColumnConstant.waterInfoNotList);
         // 拼接内容后面的联系方式,当前模板拼接平台服务电话
         // 遍历，拼接平台服务电话
         for (List<String> list : smsRequestTemplate.getTemplateContent()) {
            // 添加平台电话
            list.add(PtInfoConstant.serverPhone);
            // 保存告警记录信息
            AlarmRecord alarmRecord = saveAlarmRecord(list,alarmRule);
            if (null != alarmRecord) {
               list.add(alarmRecord.getId().toString());
            }
         }
         // 调用短信服务
         smsService.sendSignMsg(smsRequestTemplate);
      }
      // 返回
      return "水位数据异常";
   }