雨量大雨，暴雨，6小时告警新增

zhongrj

2023-07-26 6735eaad855055d7a7e1149f3a01ebff1e29005b

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsServiceImpl.java

@@ -274,49 +274,52 @@
      List<MessageRecord> messageRecordList = new ArrayList<>();
      // 遍历处理
      for (List<String> list : templateContent) {
         // 设置站内信记录信息
         MessageRecord messageRecord = new MessageRecord();
         messageRecord.setTheme(alarmRule.getRuleName());
         messageRecord.setSender(AuthUtil.getUserId().toString());
         messageRecord.setSource("智能告警");
         messageRecord.setStatus(0);
         // 设置告警记录信息
         AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
         alarmRecordDetail.setReservoirNumber(list.get(0));
         alarmRecordDetail.setAlarmRecordId(Long.parseLong(list.get(list.size() - 1)));
         alarmRecordDetail.setAlarmMode("短信");
         // 删除 最后一个 告警记录id
         list.remove(list.size() - 1);
         // 删除 0 水库编码
         list.remove(0);
         SmsRecord smsRecord = new SmsRecord();
         if (null != smsResult){
            alarmRecordDetail.setPhone(list.get(0));
            messageRecord.setRecipient(list.get(0));
            // 设置手机号
            request.setUserNumber(list.get(0));
            // 内容处理
            String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
            // 短信内容拼接（完成发送的结果信息）
            // 需要删除最前面的手机号
         // 校验手机号，发送短信时已校验
         if (validator(list.get(1))) {
            // 设置站内信记录信息
            MessageRecord messageRecord = new MessageRecord();
            messageRecord.setTheme(alarmRule.getRuleName());
            messageRecord.setSender(AuthUtil.getUserId().toString());
            messageRecord.setSource("智能告警");
            messageRecord.setStatus(0);
            // 设置告警记录信息
            AlarmRecordDetail alarmRecordDetail = new AlarmRecordDetail();
            alarmRecordDetail.setReservoirNumber(list.get(0));
            alarmRecordDetail.setAlarmRecordId(Long.parseLong(list.get(list.size() - 1)));
            alarmRecordDetail.setAlarmMode("短信");
            // 删除 最后一个 告警记录id
            list.remove(list.size() - 1);
            // 删除 0 水库编码
            list.remove(0);
            // 格式转换
            String format = String.format(s, list.toArray());
            // 设置内容
            request.setMessageContent(format);
            messageRecord.setContent(format);
            messageRecordList.add(messageRecord);
            // 保存短信发送记录
            smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
            if (null != smsRecord){
               alarmRecordDetail.setAlarmContent(format);
               alarmRecordDetail.setSendRecordId(smsRecord.getId());
               alarmRecordDetail.setCreateTime(new Date());
               // 保存告警记录详情信息
               boolean save = alarmRecordDetailService.save(alarmRecordDetail);
            SmsRecord smsRecord = new SmsRecord();
            if (null != smsResult) {
               alarmRecordDetail.setPhone(list.get(0));
               messageRecord.setRecipient(list.get(0));
               // 设置手机号
               request.setUserNumber(list.get(0));
               // 内容处理
               String s = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
               // 短信内容拼接（完成发送的结果信息）
               // 需要删除最前面的手机号
               list.remove(0);
               // 格式转换
               String format = String.format(s, list.toArray());
               // 设置内容
               request.setMessageContent(format);
               messageRecord.setContent(format);
               messageRecordList.add(messageRecord);
               // 保存短信发送记录
               smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
               if (null != smsRecord) {
                  alarmRecordDetail.setAlarmContent(format);
                  alarmRecordDetail.setSendRecordId(smsRecord.getId());
                  alarmRecordDetail.setCreateTime(new Date());
                  // 保存告警记录详情信息
                  boolean save = alarmRecordDetailService.save(alarmRecordDetail);
               }
            }
            smsRecordList.add(smsRecord);
         }
         smsRecordList.add(smsRecord);
      }
      if (isSendStation) {
         // 保存站内信信息