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-quartz/src/main/java/com/ruoyi/quartz/task/RyTask.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 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 4bb1950..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
@@ -14,6 +14,9 @@
import com.ruoyi.common.utils.RSAPublicKeyExample;
import com.ruoyi.common.utils.StringUtils;
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;
@@ -85,11 +88,24 @@
@Autowired
private HeLibraryMapper heLibraryMapper;
+ @Autowired
+ private ICollectHISService ichService;
+
+ @Autowired
+ private ISysConfigService configService;
+
+
@Value("${localIP}")
private String localIP;
@Value("${xhsmsPath}")
private String xhsmsPath;
+
+ @Value("${xhsmsAccount}")
+ private String xhsmsAccount;
+
+ @Value("${xhsmsPwd}")
+ private String xhsmsPwd;
@Value("${pub_key}")
private String pub_key;
@@ -130,6 +146,9 @@
@Autowired
IXHGatherPatArchiveService ixhGatherPatArchiveService;
+
+ @Autowired
+ ICollectHISService icollectHis;
@Value("${appid}")
@@ -352,10 +371,21 @@
//涓芥按鏈夌殑鍖婚櫌杩樻病娉曞仛闀挎湡浠诲姟闅忚
List<ServiceSubtask> subtaskList2 = new ArrayList<>();
if (visitHosp == 2) {
- for (ServiceSubtask serviceSubtask : subtaskList) {
- Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
- if (b) subtaskList2.add(serviceSubtask);
+ try {
+ for (ServiceSubtask serviceSubtask : subtaskList) {
+ Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
+
+ if (b) subtaskList2.add(serviceSubtask);
+ }
+ } catch (Exception e) {
+ log.error("-------闀挎湡浠诲姟寮傚父涓猴細", e);
+ continue;
}
+// for (ServiceSubtask serviceSubtask : subtaskList) {
+// Boolean b = VisitSendStateEnum.getDescByCode(serviceSubtask.getOrgid());
+//
+// if (b) subtaskList2.add(serviceSubtask);
+// }
subtaskList = subtaskList2;
}
@@ -508,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");
@@ -530,6 +561,9 @@
if (code.equals("0")) {
isSuccess = "true";
}
+ }else if (visitHosp == 3) {//甯備竴鍖婚櫌
+ String content=sendMagParam.getContent().replace("銆愭柊鍗庡尰闄€��","");
+ smsUtils.sendSms(xhsmsPath,xhsmsAccount,xhsmsPwd,sendMagParam.getPhone(),content);
}
//浠诲姟鍙戦�佽褰�
ServiceSubtaskRecord serviceSubtaskRecord = new ServiceSubtaskRecord();
@@ -748,4 +782,15 @@
}
return toHex(md5.digest());
}
+
+ public void collectHIS() {
+ try {
+ // HIS鏁版嵁閲囬泦
+ log.info("銆恉ealHisData銆慔IS寮�濮嬮噰闆嗘暟鎹�");
+ ichService.sync();
+ log.info("銆恉ealHisData銆慔IS缁撴潫閲囬泦鏁版嵁");
+ } catch (Exception e) {
+ log.error("銆恉ealHisData銆慔IS鏁版嵁閲囬泦寮傚父", e);
+ }
+ }
}
--
Gitblit v1.9.3