From 2b4b49b03ce6cd4008fbd1b54b1ac8048bb40274 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 12 Aug 2021 13:48:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A6=86=E5=B1=B1=E4=BB=A3=E7=A0=81=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=20api=20=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7-?= =?UTF-8?q?=E7=96=AB=E8=8B=97=E6=8E=A5=E7=A7=8D=E5=B9=B4=E9=BE=84=E5=88=86?= =?UTF-8?q?=E5=B8=83=E3=80=81=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7-?= =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E4=BC=81=E4=B8=9A=E7=BB=9F=E8=AE=A1=E3=80=81?= =?UTF-8?q?=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7-=E7=A4=BE=E5=8C=BA?= =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1=E3=80=81?= =?UTF-8?q?=E7=96=AB=E6=83=85=E9=98=B2=E6=8E=A7-=E7=96=AB=E8=8B=97?= =?UTF-8?q?=E6=8E=A5=E7=A7=8D=E6=83=85=E5=86=B5=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiScreenController.java | 78 +++++++++++++++---- .../esua/epdc/feign/AnalysisFeignClient.java | 50 ++++++++++-- .../fallback/AnalysisFeignClientFallback.java | 32 ++++++-- .../esua/epdc/service/EpdcScreenService.java | 39 ++++++++-- .../service/impl/EpdcScreenServiceImpl.java | 35 +++++++-- epdc-cloud-client-yushan | 2 +- 6 files changed, 196 insertions(+), 40 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 9fde39d..4186afc 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,11 +2,10 @@ 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.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -32,7 +31,7 @@ public class ApiScreenController { * 网格治理-项目列表接口（事件总览最新列表、群众关心的事列表） * * @param formDto - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author Liuchuang * @since 2021/8/10 13:46 */ @@ -43,35 +42,88 @@ public class ApiScreenController { } /** - *首页-组织信息接口 - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * 首页-组织信息接口 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @athor zhangfenghe * @since 2021/8/11 14:32 */ @GetMapping("frontPage/deptInfoList") - public Result> frontPageDeptInfoList(){ + public Result> frontPageDeptInfoList() { return epdcScreenService.frontPageDeptInfoList(); } /** * 首页-人口类型统计接口 - * @return com.elink.esua.epdc.commons.tools.utils.Result> + * + * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author zhangfenghe * @since 2021/8/11 17:14 */ @GetMapping("frontPage/personInfoStatistics") - public Result> frontPagePersonInfoStatisticsList(){ - return epdcScreenService.frontPagePersonInfoStatisticsList(); + public Result frontPagePersonInfoStatistics() { + return epdcScreenService.frontPagePersonInfoStatistics(); } /** * 首页-房屋类型统计接口 + * * @return com.elink.esua.epdc.commons.tools.utils.Result * @author zhangfenghe * @since 2021/8/11 19:38 */ @GetMapping("frontPage/houseTypeStatistics") - public Result FrontPageHouseTypeStatistics(){ - return epdcScreenService.FrontPageHouseTypeStatistics(); + public Result frontPageHouseTypeStatistics() { + return epdcScreenService.frontPageHouseTypeStatistics(); + } + + /** + * 疫情防控-疫苗接种情况统计 + * + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 23:16 + */ + @GetMapping("epidemic/vaccinationStatistics") + public Result epidemicVaccinationStatistics() { + return epdcScreenService.epidemicVaccinationStatistics(); + } + + /** + * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 10:10 + */ + @GetMapping("epidemic/communityVaccinationStatistics") + public Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.epidemicCommunityVaccinationStatisticsList(formDto); + } + + /** + * 疫情防控-接种企业统计 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 11:15 + */ + @GetMapping("epidemic/companyVaccinationStatistics") + public Result> epidemicCompanyVaccinationStatisticsList(){ + return epdcScreenService.epidemicCompanyVaccinationStatisticsList(); + } + + /** + * 疫情防控-疫苗接种年龄分布 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 12:21 + */ + @GetMapping("vaccination/ageVaccinationStatistics") + public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.VaccinationAgeVaccinationStatistics(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 8921736..15c30a5 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,11 +2,10 @@ 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.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -60,7 +59,7 @@ public interface AnalysisFeignClient { * @since 2021/8/11 17:26 */ @GetMapping(value = "analysis/screen/frontPage/personInfoStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) - Result> frontPagePersonInfoStatisticsList(); + Result frontPagePersonInfoStatistics(); /** * 首页-房屋类型统计接口 @@ -69,5 +68,44 @@ public interface AnalysisFeignClient { * @since 2021/8/11 19:42 */ @GetMapping(value = "analysis/screen/frontPage/houseTypeStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) - Result FrontPageHouseTypeStatistics(); + Result frontPageHouseTypeStatistics(); + + /** + * 疫情防控-疫苗接种情况统计 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 23:26 + */ + @GetMapping(value = "analysis/screen/epidemic/vaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) + Result epidemicVaccinationStatistics(); + + /** + * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 10:10 + */ + @GetMapping(value = "analysis/screen/epidemic/communityVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) + Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto); + + /** + * 疫情防控-接种企业统计 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 11:19 + */ + @GetMapping(value = "analysis/screen/epidemic/companyVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) + Result> epidemicCompanyVaccinationStatisticsList(); + + /** + * 疫情防控-疫苗接种年龄分布 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author jyyzz + * @since 2021/8/12 12:29 + */ + @GetMapping(value = "analysis/screen/vaccination/ageVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) + Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO 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 69f491c..cf2f6ab 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 @@ -3,11 +3,10 @@ package com.elink.esua.epdc.feign.fallback; 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.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.AnalysisFeignClient; import org.springframework.stereotype.Component; @@ -37,12 +36,33 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { } @Override - public Result> frontPagePersonInfoStatisticsList() { + public Result frontPagePersonInfoStatistics() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPagePersonInfoStatisticsList"); } @Override - public Result FrontPageHouseTypeStatistics() { + public Result frontPageHouseTypeStatistics() { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"FrontPageHouseTypeStatistics"); } + + @Override + public Result epidemicVaccinationStatistics() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatistics"); + } + + @Override + public Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCommunityVaccinationStatisticsList",formDto); + } + + @Override + public Result> epidemicCompanyVaccinationStatisticsList() { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCompanyVaccinationStatisticsList"); + } + + @Override + public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"vaccinationAgeVaccinationStatistics",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 173f41f..fdd756e 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 @@ -1,11 +1,10 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import java.util.List; @@ -41,7 +40,7 @@ public interface EpdcScreenService { * @author zhangfenghe * @since 2021/8/11 17:19 */ - Result> frontPagePersonInfoStatisticsList(); + Result frontPagePersonInfoStatistics(); /** * 首页-房屋类型统计接口 @@ -49,6 +48,34 @@ public interface EpdcScreenService { * @author zhangfenghe * @since 2021/8/11 19:39 */ - Result FrontPageHouseTypeStatistics(); + Result frontPageHouseTypeStatistics(); + + /** + * 疫情防控-疫苗接种情况统计 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 23:22 + */ + Result epidemicVaccinationStatistics(); + + /** + * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据） + * [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 10:03 + */ + Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto); + + /** + * 疫情防控-接种企业统计 + * @params [] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/12 11:17 + */ + Result> epidemicCompanyVaccinationStatisticsList(); + + Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO 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 36397ee..a36c35e 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 @@ -1,11 +1,10 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO; import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenGridGovernanceItemFormDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO; -import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO; +import com.elink.esua.epdc.dto.analysis.pc.screen.result.*; import com.elink.esua.epdc.feign.AnalysisFeignClient; import com.elink.esua.epdc.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; @@ -36,13 +35,33 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { } @Override - public Result> frontPagePersonInfoStatisticsList() { - return analysisFeignClient.frontPagePersonInfoStatisticsList(); + public Result frontPagePersonInfoStatistics() { + return analysisFeignClient.frontPagePersonInfoStatistics(); } @Override - public Result FrontPageHouseTypeStatistics() { - return analysisFeignClient.FrontPageHouseTypeStatistics(); + public Result frontPageHouseTypeStatistics() { + return analysisFeignClient.frontPageHouseTypeStatistics(); + } + + @Override + public Result epidemicVaccinationStatistics() { + return analysisFeignClient.epidemicVaccinationStatistics(); + } + + @Override + public Result> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) { + return analysisFeignClient.epidemicCommunityVaccinationStatisticsList(formDto); + } + + @Override + public Result> epidemicCompanyVaccinationStatisticsList() { + return analysisFeignClient.epidemicCompanyVaccinationStatisticsList(); + } + + @Override + public Result vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDTO) { + return analysisFeignClient.vaccinationAgeVaccinationStatistics(formDTO); } } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index d4185d9..12c59c0 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit d4185d93c86e09c2b284906e65fb2d6d15c37e6c +Subproject commit 12c59c0577125d310e1304170496c33bea8e4487