05-30 zhs

zhs

2025-05-30 90e436edb375b1983f16aa10066497fbabbaa010

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

@@ -1,6 +1,5 @@
package com.ruoyi.web.component;

import afu.org.checkerframework.checker.oigj.qual.O;
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
@@ -23,7 +22,6 @@
import com.smartor.service.IBaseSmsaccountService;
import com.smartor.service.IServiceOutPathService;
import com.smartor.service.IServiceSubtaskRecordService;
import com.sun.org.apache.bcel.internal.generic.NEW;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.ObjectUtils;
@@ -41,7 +39,6 @@
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;

import static cn.hutool.core.convert.Convert.numberToWord;
import static cn.hutool.core.convert.Convert.toHex;

@Slf4j
@@ -93,6 +90,9 @@
    @Value("${visitHosp}")
    private Integer visitHosp;

    @Value("${server.port}")
    private String port;

    // 创建固定大小的线程池
    private static final ExecutorService executorService = Executors.newFixedThreadPool(10);

@@ -107,7 +107,7 @@
        log.error("本机的网络IP为:{}", ip);
        String content = message.toString();
        //判断是不是任务信息，如果不是，直接返回，不需要执行
        if (!content.contains("taskid")) {
        if (!content.contains("taskid") || !port.equals("8095")) {
            log.error("不是任务信息");
            return;
        }
@@ -316,12 +316,11 @@
                                iServiceOutPathService.updateServiceOutPath(serviceOutPath);
                                sendMagParam.setPhone(serviceSubtask.getPhone());
                                sendMagParam.setUrl(ip + ":" + req_path + "/sf?p=" + format);
                                if (serviceSubtask.getOrgid().equals("47255004333112711A1001")) {
                                    sendMagParam.setContent("【景宁畲族自治县人民医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                                } else if (serviceSubtask.getOrgid().equals("47255004333112711A1001")) {
                                    sendMagParam.setContent("【丽水中医院】您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                                } else
                                if (visitHosp == 2) {
                                    sendMagParam.setContent("您好，邀请您填写出院宣教调查表，请点击" + sendMagParam.getUrl() + "查看。感谢您配合！");
                                } else if (visitHosp == 1) {
                                    sendMagParam.setContent("【新华医院】您好，邀请您填写出院随访调查表，请点击" + sendMagParam.getUrl() + "填写。感谢您配合！");
                                }

                            } else if (type == 2) {
                                //问券（问题）
@@ -407,7 +406,7 @@
                            }
                            if (s.equals("true")) {
                                //在子任务表里记录一下
                                log.error("serviceSubtask保存成功了吗？：{}",s);
                                log.error("serviceSubtask保存成功了吗？：{}", s);
                                String uuid = UUID.randomUUID().toString();
                                serviceSubtask.setResult("success");
                                serviceSubtask.setRemark("短信发送成功");
@@ -427,7 +426,7 @@
                                serviceSubtaskRecord.setResult("success");
                                serviceSubtaskRecord.setRemark("短信发送成功");
                                serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
                                log.error("serviceSubtaskRecord保存成功了吗？：{}",serviceSubtaskRecord);
                                log.error("serviceSubtaskRecord保存成功了吗？：{}", serviceSubtaskRecord);
                            }
                        } catch (Exception e) {
                            ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();