From 6e34bc4a364b68ab0e62159eecc61bb6b0bf8201 Mon Sep 17 00:00:00 2001 From: liusheng <337615773@qq.com> Date: 星期五, 09 五月 2025 17:49:58 +0800 Subject: [PATCH] 代码提交 --- ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 21 ++++++++++++++++----- 1 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java index 9ee4cec..24c13c4 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java @@ -11,9 +11,11 @@ import com.ruoyi.common.enums.WxGZHEnum; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.HttpUtil; +import com.ruoyi.common.utils.OkHttpExample; import com.ruoyi.common.utils.RSAPublicKeyExample; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.http.HttpUtils; +import com.smartor.common.LSHospTokenUtil; import com.smartor.domain.*; import com.smartor.mapper.PatArchiveMapper; import com.smartor.mapper.ServiceSubtaskMapper; @@ -32,6 +34,7 @@ import org.springframework.data.redis.listener.RedisMessageListenerContainer; import org.springframework.stereotype.Component; +import java.io.IOException; import java.security.MessageDigest; import java.util.*; import java.util.concurrent.ExecutorService; @@ -362,6 +365,8 @@ } else if (visitHosp == 2) { //涓芥按鐨勭煭淇″彂閫佹柟寮� String address = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid()); + String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid()); + log.error("-----------token鐨勫�间负锛歿}",token); if (StringUtils.isEmpty(address)) { ServiceSubtask ss = new ServiceSubtask(); ss.setResult("error"); @@ -373,11 +378,11 @@ continue; } log.error("---------mq涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿}, sendMagParam:{}, orgid:{}-------", address, sendMagParam, serviceSubtask.getOrgid()); - String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid())); + String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()),token); log.error("---------涓芥按鐭俊鍙戦�佺粨鏋滐細{}-------", dxCode); ObjectMapper objectMapper = new ObjectMapper(); Map<String, Object> textParam = objectMapper.readValue(dxCode, Map.class); - String code = textParam.get("code").toString(); + String code = textParam.get("Code").toString(); if (code.equals("0")) { s = "true"; } else { @@ -701,7 +706,7 @@ } - private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap) { + private String getDXCode(String address, String ShouJiHM, String FaSongNR, String FaSongRID, String FaSongRXM, Map<String, Object> headerMap,String token) { Map<String, Object> map = new LinkedHashMap<>(); Map<String, Object> YeWuXX = new LinkedHashMap<>(); @@ -713,11 +718,17 @@ YeWuXX.put("DuanXinXX", DuanXinXX); map.put("XiaoXiTou", headerMap); - map.put("DuanXinXX", DuanXinXX); + map.put("YeWuXX", YeWuXX); String body = new Gson().toJson(map); - String result = HttpUtils.sendPost(address, body); +// String result = HttpUtils.sendPost(address, body); + String result = null; + try { + result = OkHttpExample.sendPostRequest(address, body, token); + } catch (IOException e) { + e.printStackTrace(); + } log.error("--------result鐨勫�间负锛歿}-----", result); JSONObject jsonObject = JSONObject.parseObject(result); -- Gitblit v1.9.3