【丽水】满意度模块化：新增 ruoyi-satisfaction 独立模块

liusheng

2026-10-12 0c1f8c479065739f3c7a5126de8e667035d00b58

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

@@ -11,8 +11,9 @@
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.smartor.common.MtSubmitSmUtil;
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;
@@ -43,20 +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 MtSubmitSmUtil mtSubmitSmUtil;
    private SmsSenderFactory smsSenderFactory;

    /**
     * 查询短信账号列表
@@ -135,14 +130,19 @@
            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")) {
            Map<String, Object> smsResult = mtSubmitSmUtil.submitSm(baseSmsRequest.getPhoneNumber(), baseSmsRequest.getTemplateCode());
            return AjaxResult.success(smsResult.get("result"));
            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) {