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 4e90c94..3cb8662 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 @@ -3,6 +3,9 @@ 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.*; +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.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; @@ -147,4 +150,69 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/screen/partyBuilding/partyMemberAge", consumes = MediaType.APPLICATION_JSON_VALUE) Result> partyMemberAge(); + /** + * 首页-组织信息接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/11 17:18 + */ + @GetMapping(value = "analysis/screen/frontPage/deptInfoList",consumes = MediaType.APPLICATION_JSON_VALUE) + Result> frontPageDeptInfoList(); + + /** + * 首页-人口类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/11 17:26 + */ + @GetMapping(value = "analysis/screen/frontPage/personInfoStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) + Result frontPagePersonInfoStatistics(); + + /** + * 首页-房屋类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 19:42 + */ + @GetMapping(value = "analysis/screen/frontPage/houseTypeStatistics",consumes = MediaType.APPLICATION_JSON_VALUE) + 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/service/EpdcScreenService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java index 78eddb7..b6b152c 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 @@ -125,5 +125,57 @@ public interface EpdcScreenService { * @since 2021/8/11 14:37 */ Result> partyMemberAge(); + /** + *首页-组织信息接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @athor zhangfenghe + * @since 2021/8/11 14:32 + */ + Result> frontPageDeptInfoList(); + + /** + * 首页-人口类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/8/11 17:19 + */ + Result frontPagePersonInfoStatistics(); + + /** + * 首页-房屋类型统计接口 + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author zhangfenghe + * @since 2021/8/11 19:39 + */ + 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); + }