From ab2884ade73fed97d1e7d7daf4b9b5b6dee83fdd Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期四, 29 十月 2026 09:26:12 +0800
Subject: [PATCH] 代码提交
---
ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/api/InhospVisitFacade.java | 118 +++++------------------------------------------------------
1 files changed, 10 insertions(+), 108 deletions(-)
diff --git a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/api/InhospVisitFacade.java b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/api/InhospVisitFacade.java
index 4a0deab..e2f9d2f 100644
--- a/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/api/InhospVisitFacade.java
+++ b/ruoyi-inhospvisit/src/main/java/com/ruoyi/inhospvisit/api/InhospVisitFacade.java
@@ -51,22 +51,9 @@
@Component
public class InhospVisitFacade implements InhospVisitApi,
InhospVisitDataService,
- com.ruoyi.common.core.service.PreachformApi,
com.ruoyi.common.core.service.PublicitySubtaskApi {
private final InhospVisitProperties properties;
-
- /**
- * 瀹ｆ暀鍗曪紙{@code service_subtask_preachform}锛夋暟鎹闂��
- * <p>
- * 鈿狅笍 鐢� {@code ObjectProvider} 鎯版�у彇锛岃�屼笉鏄洿鎺ユ敞鍏ユ帴鍙� 鈥斺�� 鐞嗙敱鍚� {@code dataService}锛�
- * 鏈被鑷韩涔熷疄鐜颁簡 {@code PreachformApi}锛屾寜鎺ュ彛绫诲瀷鐩存帴娉ㄥ叆浼氬懡涓�"姝ｅ湪鍒涘缓鐨勮嚜宸�"
- * 锛坽@code BeanCurrentlyInCreationException}锛夈��
- * <p>
- * 璇ヨ〃鐨勫綊灞炴ā鍧楁槸鏈ā鍧楋紱璺ㄦā鍧� SQL 鏀跺彛鍚庯紝澶栭儴鍙粡 {@code PreachformApi} 璁块棶瀹�
- * 锛堟鍓� smartor 閲屽彟鏈変竴鏁翠唤鍚岃〃 Mapper 涓� XML锛屽凡鍒犻櫎锛夈��
- */
- private final ObjectProvider<com.ruoyi.common.core.service.PreachformApi> preachformApiProvider;
/**
* 杩愯鏃跺紑鍏筹紙{@code sys_config} 浼樺厛锛寋@link InhospVisitProperties} 鍏滃簳锛�
@@ -107,103 +94,11 @@
public InhospVisitFacade(InhospVisitProperties properties,
InhospVisitSwitch inhospVisitSwitch,
ObjectProvider<InhospVisitApi> apiProvider,
- ObjectProvider<InhospVisitDataService> dataServiceProvider,
- ObjectProvider<com.ruoyi.common.core.service.PreachformApi> preachformApiProvider) {
+ ObjectProvider<InhospVisitDataService> dataServiceProvider) {
this.properties = properties;
this.inhospVisitSwitch = inhospVisitSwitch;
this.apiProvider = apiProvider;
this.dataService = firstDataServiceOrNull(dataServiceProvider);
- this.preachformApiProvider = preachformApiProvider;
- }
-
- /**
- * 鍙栧鏁欏崟鏁版嵁璁块棶瀹炵幇锛涘鍣ㄩ噷娌℃湁銆佺姸鎬佸紓甯搞�佹垨<b>鍙壘鍒拌嚜宸�</b>鏃惰繑鍥� {@code null}銆�
- * <p>
- * 鈿狅笍 涓� {@link #firstDataServiceOrNull} 鍚屼竴鎵嬫硶涓庣悊鐢憋紙鑷紩鐢� / 寰幆渚濊禆锛夈��
- */
- private com.ruoyi.common.core.service.PreachformApi preachformOrNull() {
- if (preachformApiProvider == null) {
- return null;
- }
- try {
- return preachformApiProvider.stream()
- .filter(svc -> svc != this)
- .findFirst()
- .orElse(null);
- } catch (Exception e) {
- log.warn("銆愬嚭鍏ラ櫌闅忚銆戣幏鍙栧鏁欏崟鏁版嵁鏈嶅姟澶辫触锛岀浉鍏宠闂皢闄嶇骇锛歿}", e.toString());
- return null;
- }
- }
-
- /**
- * 鏁版嵁鏈嶅姟鏄惁涓嶅彲鐢紙涓嶅彲鐢ㄦ椂鎵� WARN 骞惰繑鍥� true锛�
- */
- private boolean preachformUnavailable(String method) {
- if (preachformOrNull() == null) {
- log.warn("銆愬嚭鍏ラ櫌闅忚銆戝鏁欏崟鏁版嵁鏈嶅姟涓嶅彲鐢紝{} 璺宠繃銆�", method);
- return true;
- }
- return false;
- }
-
- // ==================================================================
- // 瀹ｆ暀鍗� service_subtask_preachform锛圥reachformApi锛�
- //
- // 鈿狅笍 涓庝笂闈� 6 涓殢璁挎柟娉曠殑鍏抽敭鍖哄埆锛氫互涓嬫柟娉曘�愪笉鍋氬紑鍏冲垽鏂�戙��
- // 瀹冩槸璺ㄦā鍧� SQL 鏀跺彛鍚庣殑鏁版嵁璁块棶鍏ュ彛锛堟浛浠� smartor 閲岄偅浠藉悓琛� Mapper锛夛紝
- // 灞炴暟鎹熀纭�璁炬柦锛涘紑鍏冲彧璇ユ帶鍒�"瑕佷笉瑕佺敓鎴愰殢璁�"銆�
- // ==================================================================
-
- @Override
- public com.ruoyi.common.core.service.dto.VisitPreachformRow findById(Long id) {
- return preachformUnavailable("findById") ? null : preachformOrNull().findById(id);
- }
-
- @Override
- public java.util.List<com.ruoyi.common.core.service.dto.VisitPreachformRow> findList(
- com.ruoyi.common.core.service.dto.VisitPreachformRow query) {
- return preachformUnavailable("findList")
- ? java.util.Collections.<com.ruoyi.common.core.service.dto.VisitPreachformRow>emptyList()
- : preachformOrNull().findList(query);
- }
-
- @Override
- public java.util.List<com.ruoyi.common.core.service.dto.VisitPreachformRow> findByTaskidAndOrgid(
- Long taskid, String orgid) {
- return preachformUnavailable("findByTaskidAndOrgid")
- ? java.util.Collections.<com.ruoyi.common.core.service.dto.VisitPreachformRow>emptyList()
- : preachformOrNull().findByTaskidAndOrgid(taskid, orgid);
- }
-
- @Override
- public boolean insert(com.ruoyi.common.core.service.dto.VisitPreachformRow row) {
- return !preachformUnavailable("insert") && preachformOrNull().insert(row);
- }
-
- @Override
- public boolean updateById(com.ruoyi.common.core.service.dto.VisitPreachformRow row) {
- return !preachformUnavailable("updateById") && preachformOrNull().updateById(row);
- }
-
- @Override
- public boolean updateByCondition(com.ruoyi.common.core.service.dto.VisitPreachformRow row) {
- return !preachformUnavailable("updateByCondition") && preachformOrNull().updateByCondition(row);
- }
-
- @Override
- public boolean softDeleteById(Long id) {
- return !preachformUnavailable("softDeleteById") && preachformOrNull().softDeleteById(id);
- }
-
- @Override
- public boolean softDeleteByIds(Long[] ids) {
- return !preachformUnavailable("softDeleteByIds") && preachformOrNull().softDeleteByIds(ids);
- }
-
- @Override
- public boolean softDeleteBySubid(Long subid) {
- return !preachformUnavailable("softDeleteBySubid") && preachformOrNull().softDeleteBySubid(subid);
}
/**
@@ -243,12 +138,12 @@
* <p>
* 寮�鍏冲彇鑷� {@code sys_config} 鐨勬ā鎷熼敭鍊硷紝浠庤�屼繚璇�"寮�鍏虫牎楠�"鑴氭湰鏃犻渶 Spring/鏁版嵁搴撳嵆鍙繍琛屻��
* <p>
- * 鏁版嵁鏈嶅姟涓嶄紶锛氭祴璇曟瀯閫犱笅涓嶆彁渚涘熀纭�鍑哄叆闄俊鎭闂笌瀹ｆ暀鍗曡闂�
+ * 鏁版嵁鏈嶅姟涓嶄紶锛氭祴璇曟瀯閫犱笅涓嶆彁渚涘熀纭�鍑哄叆闄俊鎭闂�
* 锛堣皟鐢ㄤ細寰楀埌 null / 绌洪泦鍚� / false锛夛紝淇濊瘉"寮�鍏虫牎楠�"绫绘祴璇曚笉蹇呮媺璧锋暟鎹簱銆�
*/
public InhospVisitFacade(InhospVisitProperties properties, InhospVisitApi delegate, String sysConfigValue) {
this(properties, new InhospVisitSwitch(properties, sysConfigValue), new FixedProvider(delegate),
- null, null);
+ null);
}
/**
@@ -433,6 +328,13 @@
}
@Override
+ public java.util.List<com.ruoyi.inhospvisit.domain.PatMedInhosp> selectInhospRefreshCandidates(String orgid) {
+ return dataUnavailable("selectInhospRefreshCandidates")
+ ? java.util.Collections.<com.ruoyi.inhospvisit.domain.PatMedInhosp>emptyList()
+ : dataService.selectInhospRefreshCandidates(orgid);
+ }
+
+ @Override
public java.util.List<com.ruoyi.inhospvisit.domain.PatMedInhosp> selectPatMedInhospListByCondition(
com.ruoyi.inhospvisit.domain.PatMedInhospVO patMedInhospVO) {
return dataUnavailable("selectPatMedInhospListByCondition")
--
Gitblit v1.9.3