Merge remote-tracking branch 'origin/master'

# Conflicts:
#	epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java
#	epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java
#	epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AnalysisFeignClientFallback.java
#	epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java
#	epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java

epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiScreenController.java

@@ -470,6 +470,18 @@ public class ApiScreenController {
         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);
+    }
+
     /**
      * 社区网格核酸人员信息
      * @params [formDto]

epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AnalysisFeignClient.java

@@ -371,6 +371,16 @@ public interface AnalysisFeignClient {
     @GetMapping("analysis/screen/epidemic/vaccinationStatistics/new")
     Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> 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);
+
     /**
      * 社区网格核酸人员信息
      * @params [formDto]

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;
@@ -196,6 +192,11 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"epidemicVaccinationStatisticsNew",formDto);
     }
 
+    @Override
+    public Result getUserStateCount(EpdcScreenUserStateFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getUserStateCount",formDto);
+    }
+
     @Override
     public Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getEpidemicUserInfoList",formDto);

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;
 
@@ -328,6 +322,15 @@ public interface EpdcScreenService {
 
     Result<List<EpdcScreenVaccinationDeptStatisticsDTO>> 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);
+
     /**
      * 社区网格核酸人员信息
      * @params [formDto]

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;
 
@@ -197,6 +193,14 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
         return analysisFeignClient.epidemicVaccinationStatisticsNew(formDto);
     }
 
+    @Override
+    public Result getUserStateCount(EpdcScreenUserStateFormDTO formDto) {
+        if(StringUtils.isBlank(formDto.getCommunityId())){
+            return new Result().error("社区id不可为空");
+        }
+        return analysisFeignClient.getUserStateCount(formDto);
+    }
+
     @Override
     public Result<List<ApiEpidemicUserInfoResultDTO>> getEpidemicUserInfoList(ApiEpidemicUserInfoListFormDTO formDto) {
         return analysisFeignClient.getEpidemicUserInfoList(formDto);