代码提交

liusheng

2024-07-04 a5e17e09ce2426ceca8362248bb5e46605bd35d6

代码提交

 ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java

@@ -14,6 +14,7 @@
import com.smartor.mapper.ServiceTaskMapper;
import com.smartor.mapper.SvyTaskMapper;
import com.smartor.mapper.SvyTaskSingleMapper;
import com.smartor.service.IBaseSmsaccountService;
import com.smartor.service.IIvrTaskTemplateService;
import com.smartor.service.IServiceSubtaskRecordService;
import com.smartor.service.ISvyTaskTemplateService;
@@ -66,6 +67,9 @@

    @Autowired
    private IServiceSubtaskRecordService serviceSubtaskRecordService;

    @Autowired
    IBaseSmsaccountService baseSmsaccountService;

    // 创建固定大小的线程池
    private static final ExecutorService executorService = Executors.newFixedThreadPool(10);
@@ -211,7 +215,6 @@
                    RSAPublicKeyExample rsaPublicKeyExample = new RSAPublicKeyExample();
                    String taskId = rsaPublicKeyExample.encryptedData(ivrTask1.getTaskid().toString(), pub_key);


                    for (ServiceSubtask ivrTaskSingle : ivrTaskcalls) {
                        String patid = rsaPublicKeyExample.encryptedData(ivrTaskSingle.getPatid().toString(), pub_key);
                        SendMagParam sendMagParam = new SendMagParam();
@@ -219,6 +222,7 @@
                        sendMagParam.setUrl(req_path + "/followvisit/particty?param1=" + taskId + "&param2=" + patid);
                        Boolean aBoolean = sendService.sendMsg(sendMagParam);


                        //任务发送记录
                        ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                        serviceSubtaskRecord.setTaskid(ivrTaskSingle.getTaskid().toString());

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -223,22 +223,22 @@
    }

    /**
     * @param HtmlContentVO
     * @param
     * @return
     */
    @GetMapping("/common/htmlContent")
    @PostMapping("/htmlContent")
    public AjaxResult htmlContent(@RequestBody HtmlContentVO htmlContentVO) {
        // 获取文件的原始名称
        String fileName = htmlContentVO.getFileName();
        // 将文件保存到指定目录
        File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + fileName);
        try (BufferedWriter writer = new BufferedWriter(new FileWriter(outputFile))) {
        File outputFile = new File(RuoYiConfig.getUploadPath() + "/show/" + fileName.split("\\.", 2)[0] + "/" + fileName);
        try (BufferedWriter writer = new BufferedWriter(new OutputStreamWriter(new FileOutputStream(outputFile), "UTF-8"))) {
            writer.write(htmlContentVO.getContent());

        } catch (IOException e) {
            e.printStackTrace();
        }
        return AjaxResult.success();
        String url = serverConfig.getUrl() + "/profile/upload/show/" + fileName.split("\\.", 2)[0] + "/" + fileName;
        return AjaxResult.success(url);
    }



 smartor/src/main/java/com/smartor/common/SendService.java

@@ -15,6 +15,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;

/**
 * 发送服务工具类
@@ -43,9 +44,16 @@
            case ("3"):

            case ("4"):
//                BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
//                baseSmsRequest.setPhoneNumber(sendMagParam.getPhone());
//                baseSmsRequest.setTemplateCode("SMS_461860582");
//                SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);

                //下面的短信发送，仅测试
                BaseSmsRequest baseSmsRequest = new BaseSmsRequest();
                baseSmsRequest.setPhoneNumber(sendMagParam.getPhone());
                baseSmsRequest.setTemplateCode("SMS_461860582");
                baseSmsRequest.setPhoneNumber("17607179857");
                baseSmsRequest.setTemplateCode("SMS_279456451");
                baseSmsRequest.setTemplateParam("{'code':'58965'}");
                SendSmsResponseBody sendSmsResponseBody = baseSmsaccountService.sendMsg(baseSmsRequest);
                if (sendSmsResponseBody.getCode().equals("OK")) {
                    return true;

 smartor/src/main/java/com/smartor/domain/SendTaskVO.java

@@ -31,7 +31,7 @@
     */
    @Excel(name = " 任务类型：  1  随访   2 问卷    3 宣教 ")
    @ApiModelProperty(value = "任务类型：  1  随访   2 问卷    3 宣教 ")
    private Integer taskType;
    private Integer taskType = 1;


}