From 4f46a5e256c4b25fd0c22610d5648862b971664c Mon Sep 17 00:00:00 2001 From: wangsq Date: Mon, 20 Jul 2026 14:08:24 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=88=86=E7=AC=AC=E4=B8=89=E6=96=B9?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/MiddleOfficeService.java | 4 +-- .../ynxbd/wx/config/MiddleOfficeConfig.java | 36 +++++++++---------- src/main/resources/middle-office.properties | 6 ---- src/main/resources/sms-config.xml | 2 +- src/main/resources/xbd-config.xml | 20 +++++++---- 5 files changed, 35 insertions(+), 33 deletions(-) delete mode 100644 src/main/resources/middle-office.properties diff --git a/src/main/java/com/ynxbd/common/service/MiddleOfficeService.java b/src/main/java/com/ynxbd/common/service/MiddleOfficeService.java index 1c8d3af..60db9d0 100644 --- a/src/main/java/com/ynxbd/common/service/MiddleOfficeService.java +++ b/src/main/java/com/ynxbd/common/service/MiddleOfficeService.java @@ -18,7 +18,7 @@ public class MiddleOfficeService { public void req_his_JH0104(String soapUrl, String hisMedSoapMdUrl, Map params, String transactionCode, String result) { try { if (HospEnum.红河州人民医院.isHosp()) { - if (MiddleOfficeConfig.MIDDLE_OFFICE_URL != null) { //平台数据上传 + if (MiddleOfficeConfig.URL != null) { //平台数据上传 String reqId = SnowHelper.nextStrId(); MiddleOfficeConfig.run(soapUrl, "" + SoapHelper.requestParams("HIS", null, reqId, params) + "", hisMedSoapMdUrl, transactionCode, result); if ("7004".equals(transactionCode) && JsonResult.xmlToBean(result, JsonResultEnum.SYS_HIS) != null) { @@ -34,7 +34,7 @@ public class MiddleOfficeService { public void reg_JH0105(String treatNum) { if (HospEnum.红河州人民医院.isHosp()) { - if (MiddleOfficeConfig.MIDDLE_OFFICE_URL != null) { + if (MiddleOfficeConfig.URL != null) { MiddleOfficeConfig.uploadTreatNum("JH0105", treatNum); } } diff --git a/src/main/java/com/ynxbd/wx/config/MiddleOfficeConfig.java b/src/main/java/com/ynxbd/wx/config/MiddleOfficeConfig.java index 8114aa1..57bb3b6 100644 --- a/src/main/java/com/ynxbd/wx/config/MiddleOfficeConfig.java +++ b/src/main/java/com/ynxbd/wx/config/MiddleOfficeConfig.java @@ -1,7 +1,7 @@ package com.ynxbd.wx.config; import com.alibaba.fastjson.JSONObject; -import com.ynxbd.common.helper.ProperHelper; +import com.ynxbd.common.helper.common.XmlConfigHelper; import lombok.extern.slf4j.Slf4j; import okhttp3.*; @@ -22,20 +22,20 @@ public class MiddleOfficeConfig { } // 佳禾美康数据上传链接 - public static final String MIDDLE_OFFICE_URL; - public static final String MIDDLE_OFFICE_URL_ESB; - public static final String MIDDLE_OFFICE_HOSPITAL; - public static final String MIDDLE_OFFICE_ITEM_NAME; + public static final String URL; + public static final String URL_ESB; + public static final String HOSPITAL; + public static final String ITEM_NAME; public static final boolean IS_LOG_RESP; static { - ProperHelper config = new ProperHelper().read("middle-office.properties"); - MIDDLE_OFFICE_URL = config.getString("middle_office_url"); - MIDDLE_OFFICE_HOSPITAL = config.getString("middle_office_hospital"); - MIDDLE_OFFICE_URL_ESB = config.getString("middle_office_url_esb"); - MIDDLE_OFFICE_ITEM_NAME = config.getString("middle_office_item_name"); - IS_LOG_RESP = config.getBoolean("middle_office.is_log_resp", false); + XmlConfigHelper config = new XmlConfigHelper().read("xbd-config.xml", "jhmk_middle_office"); + URL = config.getString("url"); + URL_ESB = config.getString("url_esb"); + HOSPITAL = config.getString("hospital"); + ITEM_NAME = config.getString("item_name"); + IS_LOG_RESP = config.getBoolean("is_log_resp", false); } public static void run(String soapUrl, String requestData, String mdUrl, String transactionCode, String responseResult) { @@ -97,8 +97,8 @@ public class MiddleOfficeConfig { JSONObject head = new JSONObject(); JSONObject body = new JSONObject(); - head.put("hospital", MIDDLE_OFFICE_HOSPITAL); - head.put("itemName", MIDDLE_OFFICE_ITEM_NAME); + head.put("hospital", HOSPITAL); + head.put("itemName", ITEM_NAME); head.put("interface", interfaceName); body.put("data", jsonData); json.put("head", head); @@ -111,7 +111,7 @@ public class MiddleOfficeConfig { .build(); Request request = new Request.Builder() - .url(MIDDLE_OFFICE_URL) + .url(URL) .post(requestBody) .headers(headers) .build(); @@ -145,7 +145,7 @@ public class MiddleOfficeConfig { JSONObject head = new JSONObject(); JSONObject body = new JSONObject(); - head.put("hospital", MIDDLE_OFFICE_HOSPITAL); + head.put("hospital", HOSPITAL); head.put("itemName", "微信"); head.put("interface", interfaceName); body.put("opc_id", treatNum); @@ -159,7 +159,7 @@ public class MiddleOfficeConfig { .build(); Request request = new Request.Builder() - .url(MIDDLE_OFFICE_URL_ESB) + .url(URL_ESB) .post(requestBody) .headers(headers) .build(); @@ -169,12 +169,12 @@ public class MiddleOfficeConfig { call.enqueue(new Callback() { @Override public void onFailure(Call call, IOException e) { - log.error("[平台数据上传]上传失败，head:{},body:{}，url:{}", head, body, MIDDLE_OFFICE_URL_ESB); + log.error("[平台数据上传]上传失败，head:{},body:{}，url:{}", head, body, URL_ESB); } @Override public void onResponse(Call call, Response response) { //不在ui线程 - log.info("[平台数据上传]成功 状态码:{}，head:{},body:{}，url:{}", response.code(), head, body, MIDDLE_OFFICE_URL_ESB); + log.info("[平台数据上传]成功 状态码:{}，head:{},body:{}，url:{}", response.code(), head, body, URL_ESB); } }); } catch (Exception e) { diff --git a/src/main/resources/middle-office.properties b/src/main/resources/middle-office.properties deleted file mode 100644 index 1d56f0c..0000000 --- a/src/main/resources/middle-office.properties +++ /dev/null @@ -1,6 +0,0 @@ -middle_office_url= -middle_office_url_esb= -middle_office_hospital= -middle_office_item_name= -# \u662F\u5426\u6253\u5370\u8FD4\u56DE\u6570\u636E -middle_office.is_log_resp=false diff --git a/src/main/resources/sms-config.xml b/src/main/resources/sms-config.xml index b95db5f..df4f873 100644 --- a/src/main/resources/sms-config.xml +++ b/src/main/resources/sms-config.xml @@ -3,7 +3,7 @@ LTAIucQcv6BOaBQ6 96QOyw62AgBT9BbLI8IyEkA8g43VNQ - 云南新八达科技有限公司 + 新八达健康通知 diff --git a/src/main/resources/xbd-config.xml b/src/main/resources/xbd-config.xml index a391fd3..038330f 100644 --- a/src/main/resources/xbd-config.xml +++ b/src/main/resources/xbd-config.xml @@ -1,12 +1,18 @@ + + + http://192.168.0.183:3307/wx3307 + http://192.168.0.183:3307/wx3307 + + 10.20.10.36:9623 false false - + 192.168.1.128 20 @@ -15,11 +21,13 @@ share - - http://192.168.0.183:3307/wx3307 - http://192.168.0.183:3307/wx3307 - http://192.168.0.183:3307/wx3307 - + + + http://10.255.248.20:8082/api/esb + 红河州第一人民医院 + 嘉和美康 + false +