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

guoshilong

2023-09-11 b6a42ed2c7bb93651a9a026afb3ee83449ed8256

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

@@ -848,6 +848,112 @@
      });
   }

//   /**
//    * 发送合并水库名短信
//    * @param smsRequestTemplate
//    */
//   @Override
//   public void sendMergeSignMsg(SmsRequestTemplate smsRequestTemplate) {
//      // 取出数据
//      SMSSendRequest request = new SMSSendRequest();
//      SmsTemplate smsTemplate = smsRequestTemplate.getSmsTemplate();
//      request.setTemplateId(smsTemplate.getTemplateId());
//      List<List<String>> templateContent = smsRequestTemplate.getTemplateContent();
//      List<Temp> tempList = new ArrayList<>();
//      // 合并数据
//      for (List<String> list : templateContent) {
//         Temp temp = new Temp();
//         temp.setPhone(list.get(1));
//         temp.setReservoirCode(list.get(0));
//         temp.setReservoirName(list.get(3));
//         temp.setAlarmRecordId(list.get(list.size()-1));
//         // 放入临时集合
//         tempList.add(temp);
//      }
//      // 按手机号分组
//      Map<String, List<Temp>> listMap = tempList.stream().collect(Collectors.groupingBy(Temp::getPhone));
//      // 短信发送行数据
//      List<String> rowList = new ArrayList<>();
//      // 告警记录详情数据
//      List<AlarmRecordDetailVO> alarmRecordDetailList = new ArrayList<>();
//      // 遍历 map 发送短信，组装数据
//      listMap.forEach((s, temps) -> {
//         StringBuilder builder = new StringBuilder();
//         StringBuilder smsRecordBuilder = new StringBuilder();
//         builder.append(s).append(",");
//         // 如果一人对应水库数量超过30个，则分批发送
//         List<List<Temp>> lists = Lists.partition(new ArrayList<>(temps), 30);
//         for (List<Temp> list : lists) {
//            // 遍历
//            for (Temp temp : list) {
//               builder.append(temp.getReservoirName()).append("，");
//               smsRecordBuilder.append(temp.getReservoirName()).append("，");
//               AlarmRecordDetailVO alarmRecordDetail = new AlarmRecordDetailVO();
//               alarmRecordDetail.setReservoirNumber(temp.getReservoirCode());
//               alarmRecordDetail.setAlarmRecordId(Long.parseLong(temp.getAlarmRecordId()));
//               alarmRecordDetail.setAlarmMode("短信");
//               alarmRecordDetail.setPhone(temp.getPhone());
//               alarmRecordDetail.setReservoirName(temp.getReservoirName());
//               // 加入集合
//               alarmRecordDetailList.add(alarmRecordDetail);
//            }
//            String row = builder.substring(0, builder.length() - 1);
//            rowList.add(row);
//         }
//      });
//      // 批量发送短信
//      mergeBatchSendSms(smsRequestTemplate,request,smsTemplate,rowList,alarmRecordDetailList);
//   }

   /**
    * 批量发送合并水库的短信
    */
   public void mergeBatchSendSms(SmsRequestTemplate smsRequestTemplate,
                          SMSSendRequest request,
                          SmsTemplate smsTemplate,
                          List<String> rowList,
                          List<AlarmRecordDetailVO> alarmRecordDetailList) {
      // 组装数据
      String[] titleArr = smsRequestTemplate.getTitle().split(",");
      String[][] dyns = new String[rowList.size() + 1][titleArr.length];
      dyns[0] = titleArr;
      int rowNum = 1;
      for (String row : rowList) {
         String[] cols = row.split(",");
         dyns[rowNum++] = cols;
      }
      //请求参数
      ComResult<DynSMSSendDataResult> resultComResult = sendDynSMSSendDataResultComResult(smsTemplate.getTemplateId(), dyns);
      // 先保存结果记录
      SmsResult smsResult = saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, rowList.size());
      List<AlarmRecordDetail> alarmRecordDetailArrayList = new ArrayList<>();
      // 遍历
      for (AlarmRecordDetailVO alarmRecordDetailVO : alarmRecordDetailList) {
         // 设置手机号
         request.setUserNumber(alarmRecordDetailVO.getPhone());
         // 内容处理
         String str = smsTemplate.getContent().replaceAll("\\{.+?\\}", "%s");
         // 格式转换
         String formatContent = String.format(str, alarmRecordDetailVO.getReservoirName().split(","));
         // 设置内容
         request.setMessageContent(formatContent);
         // 保存短信发送记录
         SmsRecord smsRecord = saveSendRecord(request, resultComResult.getCode().toString(), resultComResult.getMsg(), smsResult.getId());
         AlarmRecordDetail alarmRecordDetail1 = new AlarmRecordDetail();
         // 短信内容拼接（完成发送的结果信息）
         alarmRecordDetail1.setAlarmContent(formatContent);
         alarmRecordDetail1.setSendRecordId(smsRecord.getId());
         alarmRecordDetail1.setCreateTime(new Date());
         alarmRecordDetail1.setReservoirNumber(alarmRecordDetailVO.getReservoirNumber());
         alarmRecordDetail1.setAlarmRecordId(alarmRecordDetailVO.getAlarmRecordId());
         alarmRecordDetail1.setAlarmMode(alarmRecordDetailVO.getAlarmMode());
         alarmRecordDetail1.setPhone(alarmRecordDetailVO.getPhone());
         alarmRecordDetailArrayList.add(alarmRecordDetail1);
      }
      // 保存告警记录详情信息
      boolean save = alarmRecordDetailService.saveBatch(alarmRecordDetailArrayList);
   }

   /**
    * 批量发送短信（集合数据）
    * @param map (保护参数 1:短信模板id  2:数据集合 list<Map<String,Object>>)