From a230ffead23337c2355f9da9489339d7b4898a60 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Mon, 22 Nov 2021 16:16:24 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E7=96=AB=E6=83=85=E9=98=B2?= =?UTF-8?q?=E6=8E=A7=E6=A8=A1=E5=9D=97=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiScreenController.java | 13 +++++++++++++ .../elink/esua/epdc/feign/AnalysisFeignClient.java | 3 +++ .../feign/fallback/AnalysisFeignClientFallback.java | 6 ++++++ .../elink/esua/epdc/service/EpdcScreenService.java | 7 +++++-- .../epdc/service/impl/EpdcScreenServiceImpl.java | 6 ++++++ epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 7 files changed, 35 insertions(+), 4 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 2198294..f335150 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 @@ -2,6 +2,7 @@ package com.elink.esua.epdc.controller; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.EpdcScreenVaccinationDeptStatisticsDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.service.EpdcScreenService; @@ -428,4 +429,16 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.getTestingPointList(formDto); } + + /** + * 新版-疫情防控-接种情况统计（接种情况统计、社区接种情况总览） + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 10:10 + */ + @GetMapping("epidemic/vaccinationStatistics/new") + public Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto){ + return epdcScreenService.epidemicVaccinationStatisticsNew(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 0546b31..04e3ca4 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 @@ -2,6 +2,7 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.EpdcScreenVaccinationDeptStatisticsDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; @@ -345,4 +346,6 @@ public interface AnalysisFeignClient { **/ @GetMapping("analysis/screen/vaccination/testingPoint") Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); + @GetMapping("analysis/screen/epidemic/vaccinationStatistics/new") + Result> epidemicVaccinationStatisticsNew(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 044cf05..7f64487 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 @@ -4,6 +4,7 @@ import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.EpdcScreenVaccinationDeptStatisticsDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; @@ -179,4 +180,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getTestingPointList",formDto); } + + @Override + public Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatisticsNew",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 1ebbd5d..144e3d6 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 @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.EpdcScreenVaccinationDeptStatisticsDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import org.springframework.web.bind.annotation.GetMapping; @@ -276,7 +277,7 @@ public interface EpdcScreenService { * @since 2021/9/2 15:30 */ Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); - + /** * @Author zhangfenghe * @Description 多元服务-物业服务列表 @@ -285,7 +286,7 @@ public interface EpdcScreenService { * @return com.elink.esua.epdc.commons.tools.utils.Result> **/ Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDto); - + /** * @Author zhangfenghe * @Description 多元服务-地图-物业服务 @@ -304,4 +305,6 @@ public interface EpdcScreenService { * @Date 14:13 2021-09-10 **/ Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); + + Result> epidemicVaccinationStatisticsNew(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 37cbb4a..2b43bec 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 @@ -2,6 +2,7 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; +import com.elink.esua.epdc.dto.analysis.pc.screen.EpdcScreenVaccinationDeptStatisticsDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.*; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; @@ -180,4 +181,9 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { return analysisFeignClient.getTestingPointList(formDto); } + + @Override + public Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { + return analysisFeignClient.epidemicVaccinationStatisticsNew(formDto); + } } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 632952b..d81d0d3 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 632952b6e320eb76c88dd7152e906648e4b10851 +Subproject commit d81d0d313a4556e4c6317e7924f98a8b0f6ce2ff diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index 9d7cf7e..128c6a4 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2 +Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a