From 4d46005b4a4d127a1bd884efe7dfbb907338b1a0 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 19 九月 2025 15:11:19 +0800
Subject: [PATCH] 丽水获取token 输出日志
---
ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java | 8 ++++++++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java | 2 +-
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 2 +-
smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java | 13 ++++++-------
ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml | 3 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java | 21 +++++++++++++++++++++
8 files changed, 42 insertions(+), 11 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 88b29cd..f8cc3c4 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
@@ -392,7 +392,7 @@
req.put("content", sendMagParam.getContent());
s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
} else if (visitHosp == 2) {
- String url = configService.selectConfigByKey("token.360");
+ String url = configService.selectConfigByKey("token.360",serviceSubtask.getOrgid());
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
index b5d453d..aaa755b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java
@@ -86,7 +86,7 @@
log.info("------serviceQueryInfo鐨勫叆鍙備负锛歿}", serviceQueryInfo);
Map map = null;
try {
- String url = configService.selectConfigByKey("token.360");
+ String url = configService.selectConfigByKey("token.360",serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
serviceQueryInfo.setUrl(url);
map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
} catch (Exception e) {
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 49706ce..6ef9704 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
@@ -538,7 +538,7 @@
req.put("content", sendMagParam.getContent());
isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
} else if (visitHosp == 2) {
- String url = configService.selectConfigByKey("token.360");
+ String url = configService.selectConfigByKey("token.360",serviceSubtask.getOrgid());
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
index 58bdc29..0468434 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java
@@ -27,6 +27,14 @@
public String selectConfigByKey(String configKey);
/**
+ * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅
+ *
+ * @param configKey 鍙傛暟閿悕
+ * @return 鍙傛暟閿��
+ */
+ public String selectConfigByKey(String configKey,String orgid);
+
+ /**
* 鑾峰彇楠岃瘉鐮佸紑鍏�
*
* @return true寮�鍚紝false鍏抽棴
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
index f7c2317..b95d21a 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java
@@ -125,7 +125,7 @@
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Boolean isSuccess = false;
try {
- String url = configService.selectConfigByKey("token.360");
+ String url = configService.selectConfigByKey("token.360",orgid);
Map<String, String> map = MsgLSEnum.getAddressByCode(orgid);
String token = LSHospTokenUtil.getToken(orgid,url);
log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫侊紝鍦板潃锛歿}锛屽弬鏁帮細{}锛屾満鏋処D锛歿}", map.get("address"), orgid);
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
index 61af8c4..f03e493 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java
@@ -81,6 +81,27 @@
}
/**
+ * 鏍规嵁閿悕鏌ヨ鍙傛暟閰嶇疆淇℃伅
+ *
+ * @param configKey 鍙傛暟key
+ * @return 鍙傛暟閿��
+ */
+ @Override
+ public String selectConfigByKey(String configKey,String orgid)
+ {
+
+ SysConfig config = new SysConfig();
+ config.setConfigKey(configKey);
+ config.setOrgid(orgid);
+ SysConfig retConfig = configMapper.selectConfig(config);
+ if (StringUtils.isNotNull(retConfig))
+ {
+ return retConfig.getConfigValue();
+ }
+ return StringUtils.EMPTY;
+ }
+
+ /**
* 鑾峰彇楠岃瘉鐮佸紑鍏�
*
* @return true寮�鍚紝false鍏抽棴
diff --git a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
index 0c5b29a..78f092b 100644
--- a/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/SysConfigMapper.xml
@@ -43,6 +43,9 @@
<if test="configKey !=null and configKey != ''">
and config_key = #{configKey}
</if>
+ <if test="orgid !=null and orgid != ''">
+ and orgid = #{orgid}
+ </if>
</where>
</sql>
diff --git a/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java b/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java
index 2199f12..dd164bc 100644
--- a/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java
+++ b/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java
@@ -10,15 +10,14 @@
public static String getToken(String orgid,String url) {
String token = null;
LyraTokenUtil lyraTokenUtil = null;
- if(ObjectUtils.isNotEmpty(url)){
- lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil(url, "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
- log.info("token.360璋冪敤缁撴灉"+url+";鏈烘瀯浠ｇ爜锛�"+orgid+"");
- }else {
- if (orgid.equals("47255004333112711A1001")) //鏅畞
+ if (orgid.equals("47255004333112711A1001")) { //鏅畞
lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13021/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
- if (orgid.equals("47231022633110211A2101")) //涓尰闄�
+ }else if (orgid.equals("47231022633110211A2101")) { //涓尰闄�
lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13011/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
- }
+ }else if(ObjectUtils.isNotEmpty(url)) {
+ lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil(url, "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
+ log.info("token.360璋冪敤缁撴灉" + url + ";鏈烘瀯浠ｇ爜锛�" + orgid + "");
+ }
try {
token = lyraTokenUtil.getToken();
} catch (IOException e) {
--
Gitblit v1.9.3