From da7d36d467517771d14b656617ca741cf38057d2 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 24 Aug 2021 10:04:37 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E8=A1=A8=E5=A2=9E=E5=8A=A0type=5Fkey=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiScreenController.java | 5 +++-- .../java/com/elink/esua/epdc/feign/AnalysisFeignClient.java | 4 ++-- .../epdc/feign/fallback/AnalysisFeignClientFallback.java | 4 ++-- .../java/com/elink/esua/epdc/service/EpdcScreenService.java | 2 +- .../elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java | 4 ++-- 5 files changed, 10 insertions(+), 9 deletions(-) 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 59d16cb..b247989 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 @@ -215,8 +215,9 @@ public class ApiScreenController { * @since 2021/8/11 23:16 */ @GetMapping("epidemic/vaccinationStatistics") - public Result epidemicVaccinationStatistics() { - return epdcScreenService.epidemicVaccinationStatistics(); + public Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.epidemicVaccinationStatistics(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 b2e69f7..e56e0df 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 @@ -21,7 +21,7 @@ import java.util.List; * @Author：liuchuang * @Date：2020/9/9 15:41 */ -@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_ANALYSIS_SERVER, fallback = AnalysisFeignClientFallback.class,url = "http://localhost:9077") public interface AnalysisFeignClient { /** @@ -184,7 +184,7 @@ public interface AnalysisFeignClient { * @since 2021/8/11 23:26 */ @GetMapping(value = "analysis/screen/epidemic/vaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) - Result epidemicVaccinationStatistics(); + Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO 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 ff8bdab..5d36a26 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 @@ -96,8 +96,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { } @Override - public Result epidemicVaccinationStatistics() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatistics"); + public Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatistics",formDto); } @Override 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 f1224dd..645d6af 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 @@ -155,7 +155,7 @@ public interface EpdcScreenService { * @author zhangfenghe * @since 2021/8/11 23:22 */ - Result epidemicVaccinationStatistics(); + Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO 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 d3f8b54..01a132b 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 @@ -97,8 +97,8 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { } @Override - public Result epidemicVaccinationStatistics() { - return analysisFeignClient.epidemicVaccinationStatistics(); + public Result epidemicVaccinationStatistics(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { + return analysisFeignClient.epidemicVaccinationStatistics(formDto); } @Override