代码提交

liusheng

2025-05-09 baed560033551773f244a1f16c81a4b5c9cca75c

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

@@ -4,6 +4,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.common.enums.MsgLSEnum;
import com.ruoyi.common.enums.ServiceFromEnum;
@@ -23,6 +24,7 @@
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;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.redis.connection.Message;
@@ -370,6 +372,7 @@
                                    serviceSubtaskMapper.updateServiceSubtask(ss);
                                    continue;
                                }
                                log.error("---------mq丽水短信发送入参address：{},  sendMagParam:{},  orgid:{}-------", address, sendMagParam, serviceSubtask.getOrgid());
                                String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()));
                                log.error("---------丽水短信发送结果：{}-------", dxCode);
                                ObjectMapper objectMapper = new ObjectMapper();
@@ -448,24 +451,6 @@
                        try {
                            SendMagParam sendMagParam = new SendMagParam();
                            sendMagParam.setType("5");
//                            sendMagParam.setUrl(ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
//                            log.info("链接完整路径：{}", ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + ivrTask1.getTaskName() + "&param5=false");
//                            //这个模板ID先写死，后面做成可选
//                            sendMagParam.setTmpCode("oG3pJHPVWpE81DmZsua_2tKwgJ97r0qz37z56ns7NB4");
//                            Map map = new HashMap();
//                            map.put("first", ivrTask1.getTaskName());
//                            sendMagParam.setContent(JSON.toJSONString(map));
//                            sendMagParam.setOpenid(serviceSubtask.getOpenid());
//                            Boolean aBoolean = sendService.sendMsg(sendMagParam);
//

//                            if (type == 1) {
//                                url = ip + ":" + req_path + "/outsideChain?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
//                            } else if (type == 2) {
//                                url = ip + ":" + req_path + "/outsideChainwt?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
//                            } else if (type == 3) {
//                                url = ip + ":" + req_path + "/outsideChainxj?param1=" + taskId + "&param2=" + patid + "&param3=" + URLEncoder.encode(ivrTask1.getTaskName(), StandardCharsets.UTF_8.toString()) + "&param5=false";
//                            }
                            String url = null;
                            Boolean aBoolean = false;
                            if (type == 1) {
@@ -521,6 +506,7 @@
                            }

                            //获取微信公众号请求信息根据机构ID
                            log.error("获取微信公众号请求信息根据机构ID：{}", patArchive.getOrgid());
                            List<String> wxqqxx = WxGZHEnum.getDescByCode(patArchive.getOrgid());
                            if (CollectionUtils.isEmpty(wxqqxx) || wxqqxx.size() < 4) {
                                ServiceSubtask ss = new ServiceSubtask();
@@ -534,11 +520,17 @@
                            }


                            String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskDesc(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(), wxqqxx);
                            String wxCode = getWXCode(serviceSubtask.getSfzh(), url, serviceSubtask.getTaskName(), serviceSubtask.getTaskName(), patArchive.getTelcode(), patArchive.getName(), patArchive.getPatidHis(), wxqqxx);
                            log.error("wxCode的值为:{}", wxCode);
                            Map<String, Object> map = JSONObject.parseObject(wxCode, Map.class);
                            log.error("map的值为:{}", map);
                            if (!map.isEmpty()) {
                                serviceSubtask.setResult("success");
                                serviceSubtask.setSendstate(3L);
                                log.error("aBoolean的值为:{}", aBoolean);
                                if (map.get("succ").toString().equals("true")) {
                                    aBoolean = true;
                                }
                                if (aBoolean == false) {
                                    ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
                                    serviceSubtaskRecord.setTaskid(serviceSubtask.getTaskid().toString());
@@ -547,7 +539,7 @@
                                    serviceSubtaskRecord.setTasktype(serviceSubtask.getType());
                                    serviceSubtaskRecord.setPreachform("5");
                                    serviceSubtaskRecord.setStartTime(System.currentTimeMillis());
                                    serviceSubtaskRecord.setRemark(map.get("msg").toString());
                                    serviceSubtaskRecord.setRemark(ObjectUtils.isNotEmpty(map.get("msg")) ? map.get("msg").toString() : null);
                                    lssubIds.add(serviceSubtask.getId());
                                    serviceSubtaskRecordService.insertServiceSubtaskRecord(serviceSubtaskRecord);
                                    continue;
@@ -689,8 +681,13 @@
        xinHuaWXReq.setTitlename(taskName);
        xinHuaWXReq.setContent(taskDesc);
        xinHuaWXReq.setAppid(wxqqxx.get(1));
        log.error("-----微信公众号的出差为----：{}", xinHuaWXReq);
        String body = new Gson().toJson(xinHuaWXReq);
        log.error("-----微信公众号的出参为----：{}", xinHuaWXReq);
//         new Gson().toJson(xinHuaWXReq);
        GsonBuilder gb = new GsonBuilder();
        gb.disableHtmlEscaping();
        String body = gb.create().toJson(xinHuaWXReq);

        log.error("encode的入参为wxqqxx ：{},   body:{}", wxqqxx.get(2), body);
        String encode = encode(wxqqxx.get(2).concat(body));
        log.error("--------encode的值为：{}-----", encode);
        Map<String, String> headerMap = new HashMap<>();