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 bccd2ae..2198294 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 @@ -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> + **/ + @GetMapping("multipleService/propertyListServices") + public Result> 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> + **/ + @GetMapping("multipleService/mapPropertyServices") + public Result> mapPropertyServices(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapPropertyServices(formDto); + } + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + @GetMapping("vaccination/testingPoint") + public Result> testingPoint(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getTestingPointList(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 937a717..0546b31 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 @@ -314,4 +314,35 @@ public interface AnalysisFeignClient { */ @GetMapping("analysis/screen/multipleService/mapVolunteerServices") Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * @Author zhangfenghe + * @Description 多元服务-物业服务列表 + * @Date 15:31 2021/9/14 + * @Param [formDTO] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("analysis/screen/multipleService/propertyListServices") + Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDTO); + + /** + * @Author zhangfenghe + * @Description 多元服务-地图-物业服务 + * @Date 15:33 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + @GetMapping("analysis/screen/multipleService/mapPropertyServices") + Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + @GetMapping("analysis/screen/vaccination/testingPoint") + Result> getTestingPointList(EpdcScreenBasePageFormDTO 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 4d22494..044cf05 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 @@ -164,4 +164,19 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapVolunteerServices",formDto); } + + @Override + public Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getPropertyListServices",formDto); + } + + @Override + public Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapPropertyServices",formDto); + } + + @Override + public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getTestingPointList",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 bdea4b3..1ebbd5d 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 @@ -276,5 +276,32 @@ public interface EpdcScreenService { * @since 2021/9/2 15:30 */ Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * @Author zhangfenghe + * @Description 多元服务-物业服务列表 + * @Date 15:26 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDto); + + /** + * @Author zhangfenghe + * @Description 多元服务-地图-物业服务 + * @Date 15:36 2021/9/14 + * @Param [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + **/ + Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto); + /** + * 疫情防控 - 监测点列表 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @Author zhangyong + * @Date 14:13 2021-09-10 + **/ + Result> getTestingPointList(EpdcScreenBasePageFormDTO 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 c123ab0..37cbb4a 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 @@ -165,4 +165,19 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { return analysisFeignClient.getMapVolunteerServices(formDto); } + + @Override + public Result> getPropertyListServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getPropertyListServices(formDto); + } + + @Override + public Result> getMapPropertyServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getMapPropertyServices(formDto); + } + + @Override + public Result> getTestingPointList(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getTestingPointList(formDto); + } }