Merge remote-tracking branch 'origin/feature/phaseOne' into feature/appletsModify

# Conflicts:
#	epdc-cloud-api/src/main/java/com/elink/esua/epdc/modules/news/feign/NewsFeignClient.java

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

@@ -389,4 +389,43 @@ public class ApiScreenController {
         ValidatorUtils.validateEntity(formDto);
         return epdcScreenService.getMapVolunteerServices(formDto);
     }
+
+    /**
+     * @Author zhangfenghe
+     * @Description 多元服务-物业服务列表
+     * @Date 15:17 2021/9/14
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPropertyListResultDTO>>
+     **/
+    @GetMapping("multipleService/propertyListServices")
+    public Result<List<EpdcScreenPropertyListResultDTO>> propertyListServices(EpdcScreenBasePageFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.getPropertyListServices(formDto);
+    }
+
+    /**
+     * @Author zhangfenghe
+     * @Description 多元服务-地图-物业服务列表
+     * @Date 15:21 2021/9/14
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenMapPropertyServicesResultDTO>>
+     **/
+    @GetMapping("multipleService/mapPropertyServices")
+    public Result<List<EpdcScreenMapPropertyServicesResultDTO>> mapPropertyServices(EpdcScreenBasePageFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.getMapPropertyServices(formDto);
+    }
+    /**
+     * 疫情防控 - 监测点列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenTestingPointResultDTO>>
+     * @Author zhangyong
+     * @Date 14:13 2021-09-10
+     **/
+    @GetMapping("vaccination/testingPoint")
+    public Result<List<EpdcScreenTestingPointResultDTO>> testingPoint(EpdcScreenBasePageFormDTO formDto){
+        ValidatorUtils.validateEntity(formDto);
+        return epdcScreenService.getTestingPointList(formDto);
+    }
 }

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

@@ -314,4 +314,35 @@ public interface AnalysisFeignClient {
      */
     @GetMapping("analysis/screen/multipleService/mapVolunteerServices")
     Result<List<EpdcScreenActListResultDTO>> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto);
+
+    /**
+     * @Author zhangfenghe
+     * @Description 多元服务-物业服务列表
+     * @Date 15:31 2021/9/14
+     * @Param [formDTO]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPropertyListResultDTO>>
+     **/
+    @GetMapping("analysis/screen/multipleService/propertyListServices")
+    Result<List<EpdcScreenPropertyListResultDTO>> getPropertyListServices(EpdcScreenBasePageFormDTO formDTO);
+
+    /**
+     * @Author zhangfenghe
+     * @Description 多元服务-地图-物业服务
+     * @Date 15:33 2021/9/14
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenMapPropertyServicesResultDTO>>
+     **/
+    @GetMapping("analysis/screen/multipleService/mapPropertyServices")
+    Result<List<EpdcScreenMapPropertyServicesResultDTO>> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto);
+
+    /**
+     * 疫情防控 - 监测点列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenTestingPointResultDTO>>
+     * @Author zhangyong
+     * @Date 14:13 2021-09-10
+     **/
+    @GetMapping("analysis/screen/vaccination/testingPoint")
+    Result<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto);
 }

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

@@ -164,4 +164,19 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient {
     public Result<List<EpdcScreenActListResultDTO>> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapVolunteerServices",formDto);
     }
+
+    @Override
+    public Result<List<EpdcScreenPropertyListResultDTO>> getPropertyListServices(EpdcScreenBasePageFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getPropertyListServices",formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenMapPropertyServicesResultDTO>> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapPropertyServices",formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto) {
+        return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getTestingPointList",formDto);
+    }
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/EpdcScreenService.java

@@ -277,4 +277,31 @@ public interface EpdcScreenService {
      */
     Result<List<EpdcScreenActListResultDTO>> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto);
     
+    /**
+     * @Author zhangfenghe
+     * @Description 多元服务-物业服务列表
+     * @Date 15:26 2021/9/14
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenPropertyListResultDTO>>
+     **/
+    Result<List<EpdcScreenPropertyListResultDTO>> getPropertyListServices(EpdcScreenBasePageFormDTO formDto);
+    
+    /**
+     * @Author zhangfenghe
+     * @Description 多元服务-地图-物业服务
+     * @Date 15:36 2021/9/14
+     * @Param [formDto]
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List < com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenMapPropertyServicesResultDTO>>
+     **/
+    Result<List<EpdcScreenMapPropertyServicesResultDTO>> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto);
+
+    /**
+     * 疫情防控 - 监测点列表
+     *
+     * @param formDto
+     * @return com.elink.esua.epdc.commons.tools.utils.Result<java.util.List<com.elink.esua.epdc.dto.analysis.pc.screen.result.EpdcScreenTestingPointResultDTO>>
+     * @Author zhangyong
+     * @Date 14:13 2021-09-10
+     **/
+    Result<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto);
 }

epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java

@@ -165,4 +165,19 @@ public class EpdcScreenServiceImpl implements EpdcScreenService {
     public Result<List<EpdcScreenActListResultDTO>> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) {
         return analysisFeignClient.getMapVolunteerServices(formDto);
     }
+
+    @Override
+    public Result<List<EpdcScreenPropertyListResultDTO>> getPropertyListServices(EpdcScreenBasePageFormDTO formDto) {
+        return analysisFeignClient.getPropertyListServices(formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenMapPropertyServicesResultDTO>> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto) {
+        return analysisFeignClient.getMapPropertyServices(formDto);
+    }
+
+    @Override
+    public Result<List<EpdcScreenTestingPointResultDTO>> getTestingPointList(EpdcScreenBasePageFormDTO formDto) {
+        return analysisFeignClient.getTestingPointList(formDto);
+    }
 }