短信导入发送数据返回提示修改，告警短信发送修改（新增市县水利部人员查询并放入短信中）

zhongrj

2023-07-01 877e64ea7a23472297ba93027210bb1d4c4a8c4f

 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
    */