新增 xx 变量和 具名变量通用发送接口

zhongrj

2023-05-30 80a8d45a3e4c79c2dc3e290745ca477032998fae

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

@@ -7,7 +7,9 @@
import cn.gistack.sm.sms.entity.SmsResult;
import cn.gistack.sm.sms.service.ISmsRecordService;
import cn.gistack.sm.sms.service.ISmsResultService;
import cn.gistack.sm.sms.service.SmsService;
import cn.gistack.sm.sms.util.SmsUtils;
import cn.gistack.sm.sms.vo.SmsRequestTemplate;
import cn.gistack.system.user.entity.User;
import cn.gistack.system.user.feign.IUserClient;
import com.alibaba.fastjson.JSON;
@@ -39,6 +41,8 @@

   private final ISmsResultService smsResultService;

   private final SmsService smsService;

   private final BladeRedis bladeRedis;

   private final IUserClient userClient;
@@ -59,7 +63,7 @@
      // 手机号码校验
      if(validatePhone(request.getUserNumber())) {
         // 发送操作
         String sendMsg = SmsUtils.sendMsg(request);
         String sendMsg = JSON.toJSONString(SmsUtils.sendMsg(request));
         JSONObject jsonObject = JSON.parseObject(sendMsg);
         // 记录发送记录操作
         SmsResult smsResult = saveSendResult(request, 1);
@@ -98,7 +102,7 @@
         // 手机号校验
         if(validator(phone)) {
            // 发送邮件短信
            String dynSendMsg = SmsUtils.dynSendMethod(dynSMSSendRequest);
            String dynSendMsg = JSON.toJSONString(SmsUtils.dynSendMethod(dynSMSSendRequest));
            // 记录保存
            if (null != smsResult) {
               SMSSendRequest smsSendRequest = new SMSSendRequest();
@@ -139,7 +143,7 @@
         request.setMessageContent(content);
         request.setTemplateId(templateId);
         // 发送操作
         String sendMsg = SmsUtils.sendMsg(request);
         String sendMsg =JSON.toJSONString(SmsUtils.sendMsg(request));
         JSONObject jsonObject = JSON.parseObject(sendMsg);
         // 记录发送记录操作
         SmsResult smsResult = saveSendResult(request, 1);
@@ -209,7 +213,6 @@
   private void saveSendRecord(SMSSendRequest request, String sendMsg,Long resultId) {
      // 在保存明细
      SmsRecord smsRecord = new SmsRecord();
//      smsRecord.setPhone(request.getUserNumber());
      smsRecord.setTel(request.getUserNumber());
      smsRecord.setContent(request.getMessageContent());
      smsRecord.setTemplateId(request.getTemplateId());
@@ -268,7 +271,7 @@
         // 手机号校验
         if(validator(phone)) {
            // 发送邮件短信
            String dynSendMsg = SmsUtils.dynSendMethod(dynSMSSendRequest);
            String dynSendMsg = JSON.toJSONString(SmsUtils.dynSendMethod(dynSMSSendRequest));
            // 记录保存
            if (null != smsResult) {
               SMSSendRequest smsSendRequest = new SMSSendRequest();
@@ -291,4 +294,27 @@
      }
      return R.status(true);
   }



   /**
    * 发送 xx 变量模板短信
    * @param smsRequest 发送对象
    * @return
    */
   @PostMapping("/sendXXMsg")
   public R sendXXMsg(@RequestBody SmsRequestTemplate smsRequest){
      return R.data(smsService.sendXXMsg(smsRequest.getSmsRequest(),smsRequest.getPhoneNumbers()));
   }


   /**
    * 发送 具名 变量模板短信
    * @param smsRequest 发送对象
    * @return
    */
   @PostMapping("/sendSignMsg")
   public R sendSignMsg(@RequestBody SmsRequestTemplate smsRequest){
      return R.data(smsService.sendSignMsg(smsRequest.getTitle(),smsRequest.getContent(),smsRequest.getSmsRequest()));
   }
}