大屏疫情防控模块修改

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<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenEpidemicCommunityVaccinationStatisticsResultDTO>>
+     * @author zhangfenghe
+     * @since 2021/8/12 10:10
+     */
+    @GetMapping("epidemic/vaccinationStatistics/new")
+    public Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto){
+        return epdcScreenService.epidemicVaccinationStatisticsNew(formDto);
+    }
 }

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<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto);
+    @GetMapping("analysis/screen/epidemic/vaccinationStatistics/new")
+    Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto);
 }

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<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getTestingPointList",formDto);
     }
+
+    @Override
+    public Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatisticsNew",formDto);
+    }
 }

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;
@@ -304,4 +305,6 @@ public interface EpdcScreenService {
      * @Date 14:13 2021-09-10
      **/
     Result<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto);
+
+    Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto);
 }

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<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto) {
         return analysisFeignClient.getTestingPointList(formDto);
     }
+
+    @Override
+    public Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) {
+        return analysisFeignClient.epidemicVaccinationStatisticsNew(formDto);
+    }
 }

epdc-cloud-client-yushan

@@ -1 +1 @@
-Subproject commit 632952b6e320eb76c88dd7152e906648e4b10851
+Subproject commit d81d0d313a4556e4c6317e7924f98a8b0f6ce2ff

epdc-cloud-commons-yushan

@@ -1 +1 @@
-Subproject commit 9d7cf7e81ccc634751f032f72e5333a90eb40ee2
+Subproject commit 128c6a4bfb8087999b492a6febfdde984623fe3a