From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-datacollection/src/main/java/com/ruoyi/datacollection/service/impl/HisDataCollectionServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/ruoyi-datacollection/src/main/java/com/ruoyi/datacollection/service/impl/HisDataCollectionServiceImpl.java b/ruoyi-datacollection/src/main/java/com/ruoyi/datacollection/service/impl/HisDataCollectionServiceImpl.java
index 805a713..622bfda 100644
--- a/ruoyi-datacollection/src/main/java/com/ruoyi/datacollection/service/impl/HisDataCollectionServiceImpl.java
+++ b/ruoyi-datacollection/src/main/java/com/ruoyi/datacollection/service/impl/HisDataCollectionServiceImpl.java
@@ -1,6 +1,6 @@
package com.ruoyi.datacollection.service.impl;
-import com.ruoyi.common.core.service.HisGatherApi;
+import com.ruoyi.datacollection.collect.HisGatherCollectors;
import com.ruoyi.common.core.service.dto.SltdGatherReq;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.datacollection.service.IHisDataCollectionService;
@@ -60,7 +60,7 @@
*
* <h3>瀹冧笉绠′粈涔�</h3>
* 鐪熸鐨勯噰闆嗗姩浣滐紙HTTP 鍙栨暟銆佸叆搴擄級涓嶅湪鏈被锛氶偅閲屼粛鍦� smartor锛岀粡
- * {@link HisGatherApi} 濂戠害璋冪敤锛屽悗缁垎鎵规惉杩涙湰妯″潡銆�
+ * {@link HisGatherCollectors} 濂戠害璋冪敤锛屽悗缁垎鎵规惉杩涙湰妯″潡銆�
*
* @see com.ruoyi.datacollection.api.DataCollectionFacade 瀵瑰闂ㄩ潰
*/
@@ -128,7 +128,7 @@
* 杩欓噷璁╁畠鍚姩鏈熷氨鏆撮湶锛堝畞鍙惎鍔ㄥけ璐ワ紝涔熶笉瑕侀潤榛樺皯鏁版嵁锛夈��
*/
@Autowired
- private HisGatherApi hisGatherApi;
+ private HisGatherCollectors hisGatherCollectors;
/**
* 鍙傛暟閰嶇疆鏈嶅姟锛坮uoyi-system 鐨� API锛夛細璇� {@code sltd.gather.sysuser} / {@code sltd.gather.campusid}
@@ -158,12 +158,12 @@
try {
// 閲囬泦鍏ラ櫌鏁版嵁
log.info("銆恉ealHisData銆戞柊鍗庡紑濮嬮噰闆嗗叆闄㈡暟鎹�");
- hisGatherApi.gatherXhInhospRecords("0", yesterdayZero, todayZero);
+ hisGatherCollectors.gatherXhInhospRecords("0", yesterdayZero, todayZero);
log.info("銆恉ealHisData銆戞柊鍗庡叆闄㈡暟鎹噰闆嗗畬鎴�");
// 閲囬泦鍑洪櫌鏁版嵁
log.info("銆恉ealHisData銆戞柊鍗庡紑濮嬮噰闆嗗嚭闄㈡暟鎹�");
- hisGatherApi.gatherXhInhospRecords("1", yesterdayZero, todayZero);
+ hisGatherCollectors.gatherXhInhospRecords("1", yesterdayZero, todayZero);
log.info("銆恉ealHisData銆戞柊鍗庡嚭闄㈡暟鎹噰闆嗗畬鎴�");
} catch (Exception e) {
@@ -176,7 +176,7 @@
Date startTime = Date.from(yesterdayZero.atZone(ZoneId.systemDefault()).toInstant());
Date endTime = Date.from(todayZero.atZone(ZoneId.systemDefault()).toInstant());
- hisGatherApi.gatherHnRecords(startTime, endTime);
+ hisGatherCollectors.gatherHnRecords(startTime, endTime);
log.info("銆恉ealHisData銆戞渤鍗楃粨鏉熼噰闆嗘暟鎹�");
} catch (Exception e) {
log.error("銆恉ealHisData銆戞渤鍗楁暟鎹噰闆嗗紓甯�", e);
@@ -212,7 +212,7 @@
SltdGatherReq serviceSLTDDeptReqVO = new SltdGatherReq();
serviceSLTDDeptReqVO.setOrgId(SLTD_ORG_ID);
serviceSLTDDeptReqVO.setCampusIds(campusidList);
- Boolean aBoolean1 = hisGatherApi.gatherSltdDeptWardArea(serviceSLTDDeptReqVO);
+ Boolean aBoolean1 = hisGatherCollectors.gatherSltdDeptWardArea(serviceSLTDDeptReqVO);
log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滈儴闂ㄤ俊鎭�濈粨鏉熼噰闆嗘暟鎹細{}", aBoolean1);
Boolean aBoolean = false;
@@ -224,11 +224,11 @@
ArrayList<String> statusList = new ArrayList<>();
statusList.add("1");
reqVO.setStatusList(statusList);
- aBoolean = hisGatherApi.gatherSltdHospUser(reqVO);
+ aBoolean = hisGatherCollectors.gatherSltdHospUser(reqVO);
}
log.info("銆恉ealHisData銆戠渷绔嬪悓寰封�滅敤鎴蜂俊鎭�濈粨鏉熼噰闆嗘暟鎹細{}", aBoolean);
//鐤剧梾瀛楀吀閲囬泦
- hisGatherApi.gatherIcd10();
+ hisGatherCollectors.gatherIcd10();
}
// nhfy/sltd鍥炴函30澶╁垎娈甸噰闆嗗垽鏂紙姣忔鏈�澶� BACKFILL_SEGMENT_DAYS 澶╋紝瑙﹂《鑷姩浜屽垎锛�
@@ -378,7 +378,7 @@
int count;
try {
- count = hisGatherApi.gatherSltdHealthcareRecords(req);
+ count = hisGatherCollectors.gatherSltdHealthcareRecords(req);
} catch (Exception e) {
// 鍗曠被鏁版嵁澶辫触涓嶅悜涓婃姏锛氬惁鍒欎竴娈靛け璐ヤ細璁╂湰娆″洖婧悗闈㈢殑鎵�鏈夋閮戒笉鎵ц
log.error("銆恉ealHisData銆憑}閲囬泦澶辫触锛岃烦杩囪绫荤户缁�傞櫌鍖猴細{}锛屾椂闂存锛歿} ~ {}", kind.label, cid, from, to, e);
--
Gitblit v1.9.3