From 015c79fc83f4dd7287774bc53ce95e287c0f3a41 Mon Sep 17 00:00:00 2001 From: zzc Date: Tue, 18 Mar 2025 15:40:24 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=8E=A5=E5=8F=A3=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../acupuncture/web/controller/web/ExternalController.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java index 469dadbe..efa922ac 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java @@ -49,7 +49,7 @@ import java.util.List; @Slf4j @Api(tags = "外部接口") @RestController -@RequestMapping("/api") +@RequestMapping("") public class ExternalController { @Resource @@ -180,13 +180,13 @@ public class ExternalController { } @ApiOperation("根据住院号/门诊号查询人体成分信息") - @PostMapping("/http/selectByMemberId") + @PostMapping("/api/http/selectByMemberId") public JsonResponse selectByMemberId(@RequestBody @Validated ExternalDto.MemberDto dto){ return JsonResponse.ok(externalService.selectByMemberId(dto.getMemberId())); } @ApiOperation("根据住院号/门诊号查询人体成分报告") - @PostMapping("/http/selectReportByMemberId") + @PostMapping("/api/http/selectReportByMemberId") public JsonResponse selectReportByMemberId(@RequestBody @Validated ExternalDto.MemberDto dto){ return JsonResponse.ok(externalService.selectReportByMemberId(dto.getMemberId())); } From ffc3510e6602ab134c3af6b1457c8dab55dc0209 Mon Sep 17 00:00:00 2001 From: zzc Date: Wed, 19 Mar 2025 09:03:18 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/controller/web/ExternalController.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java index efa922ac..4d18978b 100644 --- a/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java +++ b/acupuncture-admin/src/main/java/com/acupuncture/web/controller/web/ExternalController.java @@ -11,6 +11,7 @@ import com.acupuncture.common.core.domain.AjaxResult; import com.acupuncture.common.core.domain.BaseDto; import com.acupuncture.common.core.domain.JsonResponse; import com.acupuncture.common.core.redis.RedisCache; +import com.acupuncture.common.core.text.Convert; import com.acupuncture.common.exception.base.BaseException; import com.acupuncture.common.utils.file.FileUploadUtils; import com.acupuncture.common.utils.file.FileUtils; @@ -76,13 +77,18 @@ public class ExternalController { //切换数据源 private void checkoutData(String from) { - //根据社区ID查询数据源 - List dataSourceList = umsDataSourceDao.query(Long.parseLong(from)); - if (CollectionUtil.isEmpty(dataSourceList)) { - throw new BaseException("查询不到社区"); + try { + //根据社区ID查询数据源 + List dataSourceList = umsDataSourceDao.query(Long.parseLong(from)); + if (CollectionUtil.isEmpty(dataSourceList)) { + throw new BaseException("查询不到社区"); + } + //切换数据源查询 + changeDataSource(dataSourceList.get(0).getDataSourceKey()); + }catch (Exception e) { + throw new BaseException("UUID错误:{}", from); } - //切换数据源查询 - changeDataSource(dataSourceList.get(0).getDataSourceKey()); + } private static void changeDataSource(String key) {