榆山代码更新 api 疫情防控-疫苗接种年龄分布、疫情防控-接种企业统计、疫情防控-社区接种情况统计、疫情防控-疫苗接种情况统计

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.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
-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.service.EpdcScreenService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +43,7 @@ public class ApiScreenController {
 
     /**
      * 首页-组织信息接口
+     *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageDeptInfoResultDTO>>
      * @athor zhangfenghe
      * @since 2021/8/11 14:32
@@ -55,23 +55,75 @@ public class ApiScreenController {
 
     /**
      * 首页-人口类型统计接口
+     *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List   <   com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO>>
      * @author zhangfenghe
      * @since 2021/8/11 17:14
      */
     @GetMapping("frontPage/personInfoStatistics")
-    public Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList(){
+    public Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatistics() {
-        return epdcScreenService.frontPagePersonInfoStatisticsList();
+        return epdcScreenService.frontPagePersonInfoStatistics();
     }
 
     /**
      * 首页-房屋类型统计接口
+     *
      * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO>
      * @author zhangfenghe
      * @since 2021/8/11 19:38
      */
     @GetMapping("frontPage/houseTypeStatistics")
-    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics(){
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics() {
-        return epdcScreenService.FrontPageHouseTypeStatistics();
+        return epdcScreenService.frontPageHouseTypeStatistics();
+    }
+
+    /**
+     * 疫情防控-疫苗接种情况统计
+     *
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 23:16
+     */
+    @GetMapping("epidemic/vaccinationStatistics")
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+        return epdcScreenService.epidemicVaccinationStatistics();
+    }
+
+    /**
+     * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 10:10
+     */
+    @GetMapping("epidemic/communityVaccinationStatistics")
+    public Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) {
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.epidemicCommunityVaccinationStatisticsList(formDto);
+    }
+
+    /**
+     * 疫情防控-接种企业统计
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 11:15
+     */
+    @GetMapping("epidemic/companyVaccinationStatistics")
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList(){
+        return epdcScreenService.epidemicCompanyVaccinationStatisticsList();
+    }
+
+    /**
+     * 疫情防控-疫苗接种年龄分布
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO>
+     * @author jyyzz
+     * @since 2021/8/12 12:21
+     */
+    @GetMapping("vaccination/ageVaccinationStatistics")
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.VaccinationAgeVaccinationStatistics(formDto);
     }
 }

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.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
-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.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<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList();
+    Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> 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<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics();
+    Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics();
+
+    /**
+     * 疫情防控-疫苗接种情况统计
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 23:26
+     */
+    @GetMapping(value = "analysis/screen/epidemic/vaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics();
+
+    /**
+     * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 10:10
+     */
+    @GetMapping(value = "analysis/screen/epidemic/communityVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto);
+
+    /**
+     * 疫情防控-接种企业统计
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 11:19
+     */
+    @GetMapping(value = "analysis/screen/epidemic/companyVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList();
+
+    /**
+     * 疫情防控-疫苗接种年龄分布
+     * @params [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO>
+     * @author jyyzz
+     * @since 2021/8/12 12:29
+     */
+    @GetMapping(value = "analysis/screen/vaccination/ageVaccinationStatistics",consumes = MediaType.APPLICATION_JSON_VALUE)
+    Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto);
 }

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.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
-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.feign.AnalysisFeignClient;
 import org.springframework.stereotype.Component;
 
@@ -37,12 +36,33 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     }
 
     @Override
-    public Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList() {
+    public Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatistics() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPagePersonInfoStatisticsList");
     }
 
     @Override
-    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics() {
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics() {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"FrontPageHouseTypeStatistics");
     }
+
+    @Override
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatistics");
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCommunityVaccinationStatisticsList",formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicCompanyVaccinationStatisticsList");
+    }
+
+    @Override
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"vaccinationAgeVaccinationStatistics",formDto);
+    }
+
 }

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.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
-import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPagePersonInfoStatisticsResultDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenGridGovernanceItemResultDTO;
 
 import java.util.List;
 
@@ -41,7 +40,7 @@ public interface EpdcScreenService {
      * @author zhangfenghe
      * @since 2021/8/11 17:19
      */
-    Result<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList();
+    Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatistics();
 
     /**
      * 首页-房屋类型统计接口
@@ -49,6 +48,34 @@ public interface EpdcScreenService {
      * @author zhangfenghe
      * @since 2021/8/11 19:39
      */
-    Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics();
+    Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics();
+
+    /**
+     * 疫情防控-疫苗接种情况统计
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicVaccinationStatisticsResultDTO>
+     * @author zhangfenghe
+     * @since 2021/8/11 23:22
+     */
+    Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics();
+
+    /**
+     * 疫情防控-社区接种情况统计（社区接种情况总览、地图数据）
+     * [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 10:03
+     */
+    Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto);
+
+    /**
+     * 疫情防控-接种企业统计
+     * @params []
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 11:17
+     */
+    Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList();
+
+    Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDTO);
 
 }

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.form.EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO;
-import com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenFrontPageHouseTypeStatisticsResultDTO;
+import com.elink.esua.epdc.dto.analysis.pc.screen.result.*;
-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.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<List<EpdcScreenFrontPagePersonInfoStatisticsResultDTO>> frontPagePersonInfoStatisticsList() {
+    public Result<EpdcScreenFrontPagePersonInfoStatisticsResultDTO> frontPagePersonInfoStatistics() {
-        return analysisFeignClient.frontPagePersonInfoStatisticsList();
+        return analysisFeignClient.frontPagePersonInfoStatistics();
     }
 
     @Override
-    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> FrontPageHouseTypeStatistics() {
+    public Result<EpdcScreenFrontPageHouseTypeStatisticsResultDTO> frontPageHouseTypeStatistics() {
-        return analysisFeignClient.FrontPageHouseTypeStatistics();
+        return analysisFeignClient.frontPageHouseTypeStatistics();
+    }
+
+    @Override
+    public Result<EpdcScreenEpidemicVaccinationStatisticsResultDTO> epidemicVaccinationStatistics() {
+        return analysisFeignClient.epidemicVaccinationStatistics();
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>> epidemicCommunityVaccinationStatisticsList(EpdcScreenEpidemicCommunityVaccinationStatisticsFormDTO formDto) {
+        return analysisFeignClient.epidemicCommunityVaccinationStatisticsList(formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenEpidemicCompanyVaccinationStatisticsResultDTO>> epidemicCompanyVaccinationStatisticsList() {
+        return analysisFeignClient.epidemicCompanyVaccinationStatisticsList();
+    }
+
+    @Override
+    public Result<EpdcScreenVaccinationAgeVaccinationStatisticsResultDTO> vaccinationAgeVaccinationStatistics(EpdcScreenVaccinationAgeVaccinationStatisticsFormDTO formDTO) {
+        return analysisFeignClient.vaccinationAgeVaccinationStatistics(formDTO);
     }
 
 }

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit d4185d93c86e09c2b284906e65fb2d6d15c37e6c
+Subproject commit 12c59c0577125d310e1304170496c33bea8e4487