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 45f598c..7a75923 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 @@ -469,4 +469,16 @@ public class ApiScreenController { public Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto){ return epdcScreenService.epidemicVaccinationStatisticsNew(formDto); } + + /** + * @describe: 获取指定社区下面的 以网格分组的已检测和未检测的核酸人数 + * @author wangtong + * @date 2022/4/13 14:37 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping("epidemic/vaccinationStatistics/getUserStateCount") + public Result getUserStateCount(EpdcScreenUserStateFormDTO formDto){ + return epdcScreenService.getUserStateCount(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 371dfed..3b0c562 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 @@ -370,4 +370,14 @@ public interface AnalysisFeignClient { Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); @GetMapping("analysis/screen/epidemic/vaccinationStatistics/new") Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto); + + /** + * @describe: 获取指定社区下面的 以网格分组的已检测和未检测的核酸人数 + * @author wangtong + * @date 2022/4/13 14:53 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + @GetMapping(value = "analysis/epidemic/vaccinationStatistics/getUserStateCount",consumes = MediaType.APPLICATION_JSON_VALUE) + Result getUserStateCount(EpdcScreenUserStateFormDTO 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 bd8b0fc..38b3bf4 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,12 +3,8 @@ 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.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; -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; @@ -195,4 +191,9 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatisticsNew",formDto); } + + @Override + public Result getUserStateCount(EpdcScreenUserStateFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getUserStateCount",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 d87b7f6..92f2584 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,15 +1,9 @@ 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; -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 java.util.List; @@ -327,4 +321,13 @@ public interface EpdcScreenService { Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto); Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto); + + /** + * @describe: 获取指定社区下面的 以网格分组的已检测和未检测的核酸人数 + * @author wangtong + * @date 2022/4/13 14:52 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result + */ + Result getUserStateCount(EpdcScreenUserStateFormDTO 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 8261128..a9ffebc 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,18 +1,14 @@ 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; -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.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import org.springframework.web.bind.annotation.GetMapping; import java.util.List; @@ -196,4 +192,12 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { public Result> epidemicVaccinationStatisticsNew(EpdcScreenEpidemicVaccinationStatisticsFormDTO formDto) { return analysisFeignClient.epidemicVaccinationStatisticsNew(formDto); } + + @Override + public Result getUserStateCount(EpdcScreenUserStateFormDTO formDto) { + if(StringUtils.isBlank(formDto.getCommunityId())){ + return new Result().error("社区id不可为空"); + } + return analysisFeignClient.getUserStateCount(formDto); + } }