水位缺失预警调整，重复水库进行去重，合并水库最多30个发送

zhongrj

2023-07-13 f2bfb4490106abcb41e3c7e09159e89a0f7219c0

 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/controller/SmsController.java

@@ -63,11 +63,8 @@
      if(validatePhone(request.getUserNumber())) {
         // 发送操作
         ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
         SmsResponseVO smsResponse = new SmsResponseVO();
         smsResponse.setCode(resultComResult.getCode().toString());
         smsResponse.setMsg(resultComResult.getMsg());
         // 记录发送记录操作
         SmsResult smsResult = smsService.saveSendResult(smsResponse,request, 1);
         SmsResult smsResult = smsService.saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
         if (null != smsResult){
            smsService.saveSendRecord(request, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
         }
@@ -96,11 +93,8 @@
         request.setTemplateId(templateId);
         // 发送操作
         ComResult<SMSSendDataResult> resultComResult = SmsUtils.sendMsg(request);
         SmsResponseVO smsResponse = new SmsResponseVO();
         smsResponse.setCode(resultComResult.getCode().toString());
         smsResponse.setMsg(resultComResult.getMsg());
         // 记录发送记录操作
         SmsResult smsResult = smsService.saveSendResult(smsResponse,request, 1);
         SmsResult smsResult = smsService.saveSendResult(resultComResult.getCode().toString(),resultComResult.getMsg(),request, 1);
         if (null != smsResult){
            smsService.saveSendRecord(request, resultComResult.getCode().toString(),resultComResult.getMsg(),smsResult.getId());
         }
@@ -141,7 +135,7 @@
   }

   /**
    * 发送邮件提醒
    * 发送待办提醒
    * @param smsRequest
    * @return
    */
@@ -217,4 +211,15 @@
      // 导入并返回
      return R.data(smsService.importSendRainSms(list,startTime,endTime));
   }

   /**
    * 批量发送短信（集合数据）
    * @param map (保护参数 1：短信模板id  2:数据集合 list<Map<String,Object>>)
    * @return
    */
   @PostMapping("/batch-send-sms")
   public R batchSendSms(@RequestBody Map<String,Object> map){
      // 导入并返回
      return R.data(smsService.batchSendSms(map));
   }
}