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