From 6ed96560a308d3aade30e76e3112217f42508af7 Mon Sep 17 00:00:00 2001
From: sinake <sinake1@qq.com>
Date: 星期五, 19 九月 2025 09:08:29 +0800
Subject: [PATCH] 丽水获取token url获取改成sys_config表动态设置
---
ruoyi-admin/src/main/resources/application-hzszlyy.yml | 4 +-
ruoyi-quartz/pom.xml | 4 ++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 7 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SmsRecordsServiceImpl.java | 6 ++
ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java | 54 +++++++--------------------
smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java | 2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/smartor/ServiceExternalController.java | 5 ++
ruoyi-admin/src/main/java/com/ruoyi/web/component/RedisMqReceiver.java | 7 +++
smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java | 18 +++++---
smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java | 2
smartor/src/main/java/com/smartor/domain/ServiceQueryInfo.java | 3 +
11 files changed, 58 insertions(+), 54 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 00b0e56..88b29cd 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
@@ -14,6 +14,7 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.system.service.ISysConfigService;
import com.smartor.common.LSHospTokenUtil;
import com.smartor.domain.*;
import com.smartor.mapper.HeLibraryMapper;
@@ -87,6 +88,9 @@
@Autowired
IBaseSmsaccountService baseSmsaccountService;
+
+ @Autowired
+ private ISysConfigService configService;
@Value("${xhsmsPath}")
private String xhsmsPath;
@@ -388,9 +392,10 @@
req.put("content", sendMagParam.getContent());
s = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
} else if (visitHosp == 2) {
+ String url = configService.selectConfigByKey("token.360");
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
- String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
+ String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
log.info("-----------token鐨勫�间负锛歿}", token);
if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
ServiceSubtask ss = new ServiceSubtask();
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 e60751b..b5d453d 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
@@ -5,6 +5,7 @@
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.utils.DtoConversionUtils;
+import com.ruoyi.system.service.ISysConfigService;
import com.smartor.domain.*;
import com.smartor.service.IServiceExternalService;
import com.smartor.service.IServiceSubtaskDetailService;
@@ -37,6 +38,8 @@
private IServiceExternalService serviceExternalService;
@Autowired
private ISvyTaskSingleService svyTaskSingleService;
+ @Autowired
+ private ISysConfigService configService;
/**
* 閫氱敤鎺ュ彛
@@ -83,6 +86,8 @@
log.info("------serviceQueryInfo鐨勫叆鍙備负锛歿}", serviceQueryInfo);
Map map = null;
try {
+ String url = configService.selectConfigByKey("token.360");
+ serviceQueryInfo.setUrl(url);
map = svyTaskSingleService.query360PatInfo(serviceQueryInfo);
} catch (Exception e) {
e.printStackTrace();
diff --git a/ruoyi-admin/src/main/resources/application-hzszlyy.yml b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
index b79b7e4..c8967b7 100644
--- a/ruoyi-admin/src/main/resources/application-hzszlyy.yml
+++ b/ruoyi-admin/src/main/resources/application-hzszlyy.yml
@@ -162,9 +162,9 @@
uploadSwitch: 0
# 鎸囧畾asr鍥炶皟鐨剈rl璺緞(鏈湴)
-ASRCallBackPath: http://192.168.100.10:8095/smartor/serviceSubtask/phoneCallBackYQ
+ASRCallBackPath: http://192.169.129.198:8095/smartor/serviceSubtask/phoneCallBackYQ
#鎸傛柇IP(鏈湴)
-hangup: http://192.168.100.6:8089/hangup
+hangup: http://192.169.129.198:8089/hangup
#fs鎵�浣跨敤鐨勯樋閲岀殑app_key(鏈湴)
app_key_yq: ZurNHpaQLq6P55YS
diff --git a/ruoyi-quartz/pom.xml b/ruoyi-quartz/pom.xml
index cf1641a..5fe52fd 100644
--- a/ruoyi-quartz/pom.xml
+++ b/ruoyi-quartz/pom.xml
@@ -39,6 +39,10 @@
<artifactId>smartor</artifactId>
<version>3.8.5</version>
</dependency>
+ <dependency>
+ <groupId>com.ruoyi</groupId>
+ <artifactId>ruoyi-system</artifactId>
+ </dependency>
</dependencies>
diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
index 4710195..0fc6d71 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/service/impl/CollectHISServiceImpl.java
@@ -415,31 +415,34 @@
// log.info("sysUser1鐨処D涓猴細{}", sysUser1.getUserId());
// log.info("sysUser1鐨凥ISUSERID涓猴細{}", sysUser1.getHisUserId());
if (StringUtils.isEmpty(sysUser1.getHisUserId())) continue;
- SysUser suTemp=new SysUser();
+ SysUser suTemp = new SysUser();
suTemp.setHisUserId(sysUser1.getHisUserId());
- List<SysUser> usersTemp= sysUser2Mapper.selectUserList(suTemp);
- if (usersTemp.size()>0) {
+ List<SysUser> usersTemp = sysUser2Mapper.selectUserList(suTemp);
+ if (usersTemp.size() > 0) {
sysUser1.setUserId(usersTemp.get(0).getUserId());
sysUser1.setUserName(sysUser1.getHisUserId());
sysUser2Mapper.updateUser(sysUser1);
- }else{
+ } else {
sysUser1.setUserName(sysUser1.getHisUserId());
sysUser2Mapper.insertUser(sysUser1);
- usersTemp= sysUser2Mapper.selectUserList(suTemp);
+ usersTemp = sysUser2Mapper.selectUserList(suTemp);
}
//鏂板鐢ㄦ埛涓庨儴闂�
//List<SysUserDept> sysUserDept = chMapper.yhyksxx(sysUser1);
- List<SysUserDept> sysUserDept=sysUserDeptAll.stream()
+ List<SysUserDept> sysUserDept = sysUserDeptAll.stream()
.filter((SysUserDept b) -> b.getUserCode().equals(sysUser1.getHisUserId()))
.collect(Collectors.toList());
- for (SysUserDept sud : sysUserDept) {
- if (usersTemp.size() > 0) {
- sud.setUserId(usersTemp.get(0).getUserId());
- sysUserDeptMapper.insertSysUserDept(sud);
- }
+ for (SysUserDept sud : sysUserDept) {
+ if (usersTemp.size() > 0) {
+ sud.setUserId(usersTemp.get(0).getUserId());
+ SysDept sysDeptTemp = sysDept2Mapper.selectDeptByCode(sud.getDeptCode());
+ if (sysDeptTemp != null)
+ sud.setDeptId(sysDeptTemp.getDeptId());
+ sysUserDeptMapper.insertSysUserDept(sud);
}
+ }
}
return i;
@@ -451,35 +454,6 @@
log.info("selectDeptList鐨勯噰闆嗗埌鐨勬暟閲忎负锛歿}", sysDepts.size());
int i = sysDept2Mapper.batchDept(sysDepts);
return i;
- }
-
-
- /**
- * 妫�鏌ュ苟鎵ц鍒嗚〃鐨勬牳蹇冩柟娉�
- *
- * @param tableName 瑕佹鏌ョ殑琛ㄥ悕
- */
- private synchronized void checkAndShard(String tableName) {
- long currentCount = shardingMapper.getTableCount(tableName);
-
- if (currentCount >= SHARDING_THRESHOLD) {
- log.warn("琛� '{}' 宸茶揪鍒板垎琛ㄩ槇鍊� {}锛屽噯澶囨墽琛屽垎琛ㄦ搷浣�...", tableName, SHARDING_THRESHOLD);
-
- String newTableName = tableName + "_" + java.time.LocalDate.now().format(java.time.format.DateTimeFormatter.ofPattern("yyyy_MM"));
- Long maxId = shardingMapper.getMaxId(tableName);
- if (maxId == null) maxId = 0L;
-
- shardingMapper.renameTable(tableName, newTableName);
- log.info("宸插皢琛� '{}' 閲嶅懡鍚嶄负 '{}'", tableName, newTableName);
-
- shardingMapper.createLikeTable(tableName, newTableName);
- log.info("宸插垱寤烘柊琛� '{}'", tableName);
-
- shardingMapper.setAutoIncrement(tableName, maxId + 1);
- log.info("宸茶缃柊琛� '{}' 鐨勮嚜澧濱D璧峰鍊间负 {}", tableName, maxId + 1);
-
- log.info("琛� '{}' 鐨勫垎琛ㄦ搷浣滃畬鎴愶紒", tableName);
- }
}
}
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 a21a826..49706ce 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
@@ -16,6 +16,7 @@
import com.ruoyi.common.utils.http.HttpUtils;
import com.ruoyi.common.utils.sms.smsUtils;
import com.ruoyi.quartz.service.ICollectHISService;
+import com.ruoyi.system.service.ISysConfigService;
import com.smartor.common.LSHospTokenUtil;
import com.smartor.domain.*;
import com.smartor.mapper.HeLibraryMapper;
@@ -89,6 +90,9 @@
@Autowired
private ICollectHISService ichService;
+
+ @Autowired
+ private ISysConfigService configService;
@Value("${localIP}")
@@ -534,9 +538,10 @@
req.put("content", sendMagParam.getContent());
isSuccess = HttpUtil.postJsonRequest(xhsmsPath, new Gson().toJson(req));
} else if (visitHosp == 2) {
+ String url = configService.selectConfigByKey("token.360");
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Map<String, String> map = MsgLSEnum.getAddressByCode(serviceSubtask.getOrgid());
- String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid());
+ String token = LSHospTokenUtil.getToken(serviceSubtask.getOrgid(),url);
if (ObjectUtils.isNotEmpty(map) && StringUtils.isEmpty(map.get("address"))) {
ServiceSubtask ss = new ServiceSubtask();
ss.setResult("error");
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 7d59715..f7c2317 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
@@ -46,6 +46,9 @@
@Autowired
private ServiceSubtaskMapper serviceSubtaskMapper;
+ @Autowired
+ private ISysConfigService configService;
+
/**
* 鏌ヨ鐭俊璁板綍
*
@@ -122,8 +125,9 @@
//涓芥按鐨勭煭淇″彂閫佹柟寮�
Boolean isSuccess = false;
try {
+ String url = configService.selectConfigByKey("token.360");
Map<String, String> map = MsgLSEnum.getAddressByCode(orgid);
- String token = LSHospTokenUtil.getToken(orgid);
+ String token = LSHospTokenUtil.getToken(orgid,url);
log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫侊紝鍦板潃锛歿}锛屽弬鏁帮細{}锛屾満鏋処D锛歿}", map.get("address"), orgid);
String dxCode = getDXCode(map.get("address"), phone, content, map.get("sendPersonId"), map.get("sendPersonName"), MsgLSEnum.getHeaderByCode(orgid), token);
log.info("銆恠fHandlle銆戜附姘寸煭淇″彂閫佺粨鏋滐細{}", dxCode);
diff --git a/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java b/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java
index 005f8cf..2b65942 100644
--- a/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java
+++ b/smartor/src/main/java/com/smartor/common/LSHospTokenUtil.java
@@ -1,16 +1,21 @@
package com.smartor.common;
+import org.apache.commons.lang3.ObjectUtils;
+
import java.io.IOException;
public class LSHospTokenUtil {
- public static String getToken(String orgid) {
+ public static String getToken(String orgid,String url) {
String token = null;
LyraTokenUtil lyraTokenUtil = null;
- 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")) //涓尰闄�
- lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13011/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
-
+ if(ObjectUtils.isNotEmpty(url)){
+ lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil(url, "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
+ }else {
+ 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")) //涓尰闄�
+ lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13011/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
+ }
try {
token = lyraTokenUtil.getToken();
} catch (IOException e) {
@@ -18,5 +23,4 @@
}
return token;
}
-
}
diff --git a/smartor/src/main/java/com/smartor/domain/ServiceQueryInfo.java b/smartor/src/main/java/com/smartor/domain/ServiceQueryInfo.java
index ac76fcf..f0bbd50 100644
--- a/smartor/src/main/java/com/smartor/domain/ServiceQueryInfo.java
+++ b/smartor/src/main/java/com/smartor/domain/ServiceQueryInfo.java
@@ -24,6 +24,9 @@
@ApiModelProperty(value = "涓氬姟淇℃伅")
public YeWuXX YeWuXX;
+ @ApiModelProperty(value = "tokenUrl")
+ public String url;
+
}
diff --git a/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
index a0f88b0..dae868d 100644
--- a/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/ServiceTelInfoServiceImpl.java
@@ -23,7 +23,7 @@
*/
@Override
public List<Map<String,Object>> getList() {
- List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo where state=0 ");
+ List<Map<String,Object>> lists= utilsMapper.getList("select * from service_telinfo where state=0 OR DATE_ADD(editTime, INTERVAL 10 MINUTE)< NOW() ");
return lists;
}
/**
diff --git a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
index b3560a8..32e4cfb 100644
--- a/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
+++ b/smartor/src/main/java/com/smartor/service/impl/SvyTaskSingleServiceImpl.java
@@ -305,7 +305,7 @@
log.info("360鏌ヨ鏉′欢涓虹┖");
throw new BaseException("360鏌ヨ鏉′欢涓虹┖");
}
- String token = LSHospTokenUtil.getToken(serviceQueryInfo.getXiaoXiTou().getFaSongJGID());
+ String token = LSHospTokenUtil.getToken(serviceQueryInfo.getXiaoXiTou().getFaSongJGID(),serviceQueryInfo.getUrl());
// LyraTokenUtil lyraTokenUtil = null;
// if (serviceQueryInfo.getXiaoXiTou().getFaSongJGID().equals("47255004333112711A1001")) //鏅畞
// lyraTokenUtil = LyraTokenUtil.createLyraTokenUtil("https://9.0.124.104:13021/mediinfo-lyra-authserver/connect/token", "zjhes.suifangxt", "OIjdJvx2ALjFVGZoCZO4I8O");
--
Gitblit v1.9.3