zhongrj
2023-07-06 cb431488245c36e6ec70b30b414ebf76604133bc
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/notice/service/impl/NoticeStrategyImpl.java
@@ -241,30 +241,9 @@
      // 查询当前策略对应的告警规则信息
      AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
      if (null!=alarmRule) {
         // 调用中台服务接口查询数据
         JSONArray ztData = noticeHandle.getZtData("", ZtApiUrlConstant.over_z_res_api);
         // 只发短信,将发短信信息组装好
         SmsRequestTemplate smsRequestTemplate
            = noticeHandle.getSendSmsTemplate(ztData, templateId,alarmRule, ZtApiDataColumnConstant.waterFirstOverList,true,adCode);
         // 拼接后面内容
         if (smsRequestTemplate.getPersonVOList().size()>0) {
            for (List<String> list : smsRequestTemplate.getTemplateContent()) {
               // 依次拼接巡查责任人,技术责任人姓名
               noticeHandle.addPatrolTechnologyInfo(list);
               // 拼接市县水利部人员姓名及联系方式
               noticeHandle.addCityCountyBusinessPersonInfo(list);
               // 保存告警记录信息
               AlarmRecord alarmRecord = noticeHandle.saveAlarmRecord(list,alarmRule,uuid);
               if (null != alarmRecord) {
                  list.add(alarmRecord.getId().toString());
//                  list.add("999");
               }
            }
            // 调用短信服务
            Map<String, Object> map = smsService.sendSignMsg(smsRequestTemplate);
            // 返回
            return "本次-水位初次超汛限告警短信成功通知数量:" + map.get("smsRecord");
         }
         asyncNoticeHandle.waterFirstOverHandle(templateId, uuid, alarmRule,adCode);
         // 返回
         return "水位初次超汛限告警";
      }
      // 返回
      return "水位初次超汛限告警";
@@ -321,7 +300,7 @@
      AlarmRule alarmRule = alarmRuleService.getOne(new QueryWrapper<AlarmRule>().eq("rule_name", arg1));
      if (null!=alarmRule) {
         // 异步处理,暂时解决超时重置问题
         Map<String, Object> map = asyncNoticeHandle.handleAlarmInfo(templateId, uuid, alarmRule);
         Map<String, Object> map = asyncNoticeHandle.waterMoreDesignHandle(templateId, uuid, alarmRule);
         // 返回
         return "水位超设计洪水位告警";
      }