From b01d5d1d7aeb391c3a95c4b94769f130d5b03ca2 Mon Sep 17 00:00:00 2001 From: lianlonggang Date: Thu, 27 Aug 2026 16:00:33 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E6=B8=85=E7=90=86=E6=AD=BB=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=B8=8E=E5=BC=80=E5=8F=91=E7=8E=AF=E5=A2=83=E9=81=97?= =?UTF-8?q?=E7=95=99=EF=BC=88DevAdapter/AppConfig/app-dev.yml=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 DevAdapter：本机联调 Mock 适配器，生产无用 - 删除 AppConfig：hospital.active/adapters 无任何注入点（active 由 HospitalRouter 直读 Solon 配置，adapters 从未被消费） - 删除 app-dev.yml：H2 内存库 Mock 配置，h2 依赖已随上轮精简移除 - app.yml 移除 hospital.adapters 死配置（医院注册由各 Adapter 的 @Component 决定） Co-Authored-By: Claude --- .../hospital/front/adapter/DevAdapter.java | 165 ------------------ .../front/infra/config/AppConfig.java | 41 ----- src/main/resources/app-dev.yml | 19 -- src/main/resources/app.yml | 7 +- 4 files changed, 1 insertion(+), 231 deletions(-) delete mode 100644 src/main/java/com/hospital/front/adapter/DevAdapter.java delete mode 100644 src/main/java/com/hospital/front/infra/config/AppConfig.java delete mode 100644 src/main/resources/app-dev.yml diff --git a/src/main/java/com/hospital/front/adapter/DevAdapter.java b/src/main/java/com/hospital/front/adapter/DevAdapter.java deleted file mode 100644 index cef8f69..0000000 --- a/src/main/java/com/hospital/front/adapter/DevAdapter.java +++ /dev/null @@ -1,165 +0,0 @@ -package com.hospital.front.adapter; - -import com.hospital.front.dto.ProcResult; -import com.hospital.front.dto.Result; -import com.hospital.front.vo.UnitVo; -import org.noear.solon.annotation.Component; - -import java.util.Collections; -import java.util.List; -import java.util.Map; - -/** - * 开发环境适配器（hospital.active=dev 时激活）。 - * - * 不连接任何数据库：查询一律返回空列表，存储过程一律返回失败。 - * 用于本机无医院数据库时的启动与联调。 - */ -@Component -public class DevAdapter implements HospitalAdapter { - - @Override - public String code() { - return "dev"; - } - - @Override - public String displayName() { - return "开发环境（Mock）"; - } - - @Override - public String hmType() { - return "dev"; - } - - @Override - public Result healthCheck() { - return Result.success(true); - } - - @Override - public ProcResult saveOrder(String peInfoStr, String peItemStr) { - return new ProcResult("0", "开发环境不支持预约提交", null); - } - - @Override - public ProcResult cancelOrder(String peId, String name, String idcard) { - return new ProcResult("0", "开发环境不支持取消预约", null); - } - - @Override - public ProcResult addUnit(UnitVo unit, boolean useV2) { - return new ProcResult("0", "开发环境不支持单位同步", null); - } - - @Override - public List> getPhyexamStatus(String peIds) { - return Collections.emptyList(); - } - - @Override - public List> getItemList() { - return Collections.emptyList(); - } - - @Override - public List> getAllItemList() { - return Collections.emptyList(); - } - - @Override - public List> getPeItemList() { - return Collections.emptyList(); - } - - @Override - public List> getItemInfo(String peItemCode) { - return Collections.emptyList(); - } - - @Override - public List> getEmpItem(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getResult(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getConclusion(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getConclusionAll(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getSuggest(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getSuggestAll(String peId) { - return Collections.emptyList(); - } - - @Override - public Map getPeStatusByIdnoAndYear(String idNo, String year) { - return null; - } - - @Override - public List> getResultByIdcardAndYear(String idNo, String year) { - return Collections.emptyList(); - } - - @Override - public List> getResultByIdcardAndYearAll(String idNo, String year) { - return Collections.emptyList(); - } - - @Override - public List> getResultByPeId(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getDisResultByAuditDate(String auditDate) { - return Collections.emptyList(); - } - - @Override - public List> getItemByPeId(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getItemByPeIdAll(String peId) { - return Collections.emptyList(); - } - - @Override - public List> getResultByIdNoOrPeId(String idNo, String peId, String auditYear) { - return Collections.emptyList(); - } - - @Override - public Map getPeIdAndDateByIdcard(String idNo) { - return null; - } - - @Override - public List> getPeIdAndDateByIdcardList(String idNo) { - return Collections.emptyList(); - } - - @Override - public List> getExamListByDate(String auditDate) { - return Collections.emptyList(); - } -} diff --git a/src/main/java/com/hospital/front/infra/config/AppConfig.java b/src/main/java/com/hospital/front/infra/config/AppConfig.java deleted file mode 100644 index f370f1d..0000000 --- a/src/main/java/com/hospital/front/infra/config/AppConfig.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hospital.front.infra.config; - -import java.util.ArrayList; -import java.util.List; - -import org.noear.solon.annotation.BindProps; -import org.noear.solon.annotation.Configuration; - -/** - * 应用配置（Solon @ConfigurationProperties）。 - * - * 加载 `app.yml` 与 `pac/conf/app-{编码}.yml` 中的 hospital.* 配置。 - * - * @author hospital-front重构 - */ -@BindProps(prefix = "hospital") -@Configuration -public class AppConfig { - - /** 启动激活哪家医院 */ - private String active = "jinghe"; - - /** 注册的医院编码清单（启动自检） */ - private List adapters = new ArrayList<>(); - - public String getActive() { - return active; - } - - public void setActive(String active) { - this.active = active; - } - - public List getAdapters() { - return adapters; - } - - public void setAdapters(List adapters) { - this.adapters = adapters; - } -} diff --git a/src/main/resources/app-dev.yml b/src/main/resources/app-dev.yml deleted file mode 100644 index ad38d67..0000000 --- a/src/main/resources/app-dev.yml +++ /dev/null @@ -1,19 +0,0 @@ -# ==================================== -# 开发环境配置（H2 内存数据库 Mock） -# 启动：java -Dsolon.env=dev -Dsolon.config.load=app.yml,app-dev.yml -jar hospital-front-1.0.0.jar -# ==================================== -# 本机无法直连医院数据库时使用；H2 以 Oracle 兼容模式运行 - -hospital: - active: dev # 启动激活"开发医院" - -hm: - type: bsm - ver: V2 - -solon.dataSources: - db1!: - class: "org.h2.jdbcx.JdbcDataSource" - url: "jdbc:h2:mem:dev;MODE=Oracle;DB_CLOSE_DELAY=-1" - username: sa - password: "" \ No newline at end of file diff --git a/src/main/resources/app.yml b/src/main/resources/app.yml index 306edfd..54caf5d 100644 --- a/src/main/resources/app.yml +++ b/src/main/resources/app.yml @@ -13,14 +13,9 @@ solon: group: "hospital" # 应用配置 +# 医院注册清单由代码决定（各 Adapter 的 @Component），此处仅指定激活哪家 hospital: active: "jinghe" # 启动激活哪家医院 - adapters: # 注册的医院清单（启动自检） - - "xinglongyuan" - - "qingyang" - - "ningxia" - - "yanan" - - "jinghe" # ==================================== # 业务开关