From ce2364225756c8a1db2c39c0fd63a0170b05e625 Mon Sep 17 00:00:00 2001 From: zhangyongzhangyong <2012005003@qq.com> Date: Fri, 10 Sep 2021 14:50:05 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=EF=BC=9A=E7=96=AB=E6=83=85?= =?UTF-8?q?=E9=98=B2=E6=8E=A7=20-=20=E7=9B=91=E6=B5=8B=E7=82=B9=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiScreenController.java | 14 ++++++++++++++ .../elink/esua/epdc/feign/AnalysisFeignClient.java | 11 +++++++++++ .../fallback/AnalysisFeignClientFallback.java | 5 +++++ .../elink/esua/epdc/service/EpdcScreenService.java | 9 +++++++++ .../epdc/service/impl/EpdcScreenServiceImpl.java | 5 +++++ 5 files changed, 44 insertions(+) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java index bccd2ae..62ad06c 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java @@ -389,4 +389,18 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.getMapVolunteerServices(formDto); } + + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + @GetMapping("vaccination/testingPoint") + public Result> testingPoint(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getTestingPointList(formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java index 937a717..b830966 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java @@ -314,4 +314,15 @@ public interface AnalysisFeignClient { */ @GetMapping("analysis/screen/multipleService/mapVolunteerServices") Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + @GetMapping("analysis/screen/vaccination/testingPoint") + Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java index 4d22494..6e0ead4 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java @@ -164,4 +164,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapVolunteerServices",formDto); } + + @Override + public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getTestingPointList",formDto); + } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index bdea4b3..3a04679 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java @@ -277,4 +277,13 @@ public interface EpdcScreenService { */ Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java index c123ab0..7164a0d 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java @@ -165,4 +165,9 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { return analysisFeignClient.getMapVolunteerServices(formDto); } + + @Override + public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getTestingPointList(formDto); + } }