处理长期任务发送问题

liusheng

5 天以前 0bbbd746e8c39d91ad7b47a4e36e29ab972dc98c

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/tools/BaseSmsaccountController.java

@@ -11,11 +11,13 @@
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.common.utils.sms.smsUtils;
import com.ruoyi.message.SendResult;
import com.ruoyi.message.sms.SmsSendRequest;
import com.ruoyi.message.sms.SmsSenderFactory;
import com.smartor.domain.BaseSmsRequest;
import com.smartor.domain.BaseSmsaccount;
import com.smartor.domain.BatchBaseSmsRequest;
import com.smartor.domain.TemplateSmsRequest;
import com.ruoyi.template.domain.TemplateSmsRequest;
import com.smartor.service.IBaseSmsaccountService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,6 +29,7 @@

import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;

/**
 * 短信账号Controller
@@ -41,17 +44,14 @@
    @Autowired
    private IBaseSmsaccountService baseSmsaccountService;

    @Value("${xhsmsPath}")
    private String xhsmsPath;

    @Value("${xhsmsAccount}")
    private String xhsmsAccount;

    @Value("${xhsmsPwd}")
    private String xhsmsPwd;

    @Value("${spring.profiles.active}")
    private String active;

    /**
     * 消息发送方工厂（短信），替代原来直接注入 xhsms* 配置 + 各站点分支的写法
     */
    @Autowired
    private SmsSenderFactory smsSenderFactory;

    /**
     * 查询短信账号列表
@@ -130,11 +130,20 @@
            try {
                JSONObject jsTemp = JSON.parseObject(baseSmsRequest.getTemplateParam());
                String content = jsTemp.getString("name");
                sendMsg = smsUtils.sendSms(xhsmsPath, xhsmsAccount, xhsmsPwd, baseSmsRequest.getPhoneNumber(), content);
                //短信发送已收口到 ruoyi-message 模块；原实现调用的是 smsUtils.sendSms（吴山签名）
                SmsSendRequest request = SmsSendRequest.of(baseSmsRequest.getPhoneNumber(), content);
                request.setCampus("2");
                SendResult sendResult = smsSenderFactory.send("hzszlyy", request);
                sendMsg = sendResult.getRawResponse();
            } catch (Exception ex) {
                return AjaxResult.error(ex.getMessage());
            }
            return AjaxResult.success(sendMsg);
        } else if (active.equals("nhfy")) {
            SmsSendRequest request = SmsSendRequest.of(baseSmsRequest.getPhoneNumber(), baseSmsRequest.getTemplateCode());
            SendResult sendResult = smsSenderFactory.send("nhfy", request);
            return AjaxResult.success(sendResult.getCode());

        } else {
            if (baseSmsaccountService.sendMsg(baseSmsRequest) == null) {
                return error();