From 6e34bc4a364b68ab0e62159eecc61bb6b0bf8201 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 09 五月 2025 17:49:58 +0800
Subject: [PATCH] 代码提交

---
 ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
index 68edc8f..c6478e7 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java
@@ -13,9 +13,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.ServiceSubtaskMapper;
 import com.smartor.mapper.ServiceTaskMapper;
@@ -483,6 +485,7 @@
                                 } else if (visitHosp == 2) {
                                     //涓芥按鐨勭煭淇″彂閫佹柟寮�
                                     String address = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
+                                    String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
                                     if (StringUtils.isEmpty(address)) {
                                         ServiceSubtask ss = new ServiceSubtask();
                                         ss.setResult("error");
@@ -493,11 +496,12 @@
                                         serviceSubtaskMapper.updateServiceSubtask(ss);
                                         continue;
                                     }
-                                    String dxCode = getDXCode(address, sendMagParam.getPhone(), sendMagParam.getContent(), "", "", MsgLSEnum.getHeaderByCode(serviceSubtask.getOrgid()));
+                                    log.error("---------涓芥按鐭俊鍙戦�佸叆鍙俛ddress锛歿},  sendMagParam:{},  orgid:{}-------", address,sendMagParam,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")) {
                                         isSuccess = "true";
                                     }
@@ -842,7 +846,7 @@
         return key;
     }
 
-    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<>();
@@ -854,11 +858,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