zhongrj
2023-08-23 b33010bfb1a4d61f33eb91bf5bee0dd76a289b7c
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) {
         // 保存站内信信息
@@ -691,7 +694,7 @@
   }
   /**
    * 批量发送动态短信
    * 批量发送动态短信--该方法只适合除手机号外只有一个动态参数并且是内容一致的情况
    * @param phoneList
    * @param titleArr 示例: [手机号码,水库名称,水位值]
    * @param param 示例: ***水库,15.12
@@ -854,13 +857,21 @@
   public Object batchSendSms(Map<String, Object> map) {
      // 获取模板id
      String templateId = map.get("templateId").toString();
      // 获取集合数据
      List<Map<String,Object>> list = (List<Map<String,Object>>) map.get("list");
      List<String> columnList = (List<String>) map.get("columnList");
      // 遍历
      for (Map<String, Object> param : list) {
         // 放入集合数据
      }
      return null;
      // 获取手机号集合
      List<String> list = (List<String>) map.get("phones");
      // 获取发送的动态内容(msg)
      String param = (String) map.get("content");
      // 创建错误手机号集合
      List<String> errPhones = new ArrayList<>();
      // 去重
      Set<String> hashSet = new HashSet<>(list);
      // 查询短信模板
      SmsTemplate smsTemplate = smsTemplateService.getOne(new QueryWrapper<SmsTemplate>().eq("template_id", templateId));
      // 拼接短信标题数组
      String [] titleArr = getSmsTitleArr(smsTemplate);
      // 批量发送短信
      Map<String, Object> batchSendSmsMap = batchSendSms(hashSet, titleArr, param, smsTemplate,errPhones);
      // 返回
      return batchSendSmsMap;
   }
}