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 274d01b..bccd2ae 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 @@ -3,13 +3,12 @@ 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.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.service.EpdcScreenService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @@ -338,4 +337,56 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.mapPartyMemberServices(formDto); } + + /** + * 多元服务-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/communityServices") + public Result> communityServices(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getCommunityServices(formDto); + } + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/mapCommunityServices") + public Result> mapCommunityServices(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapCommunityServices(formDto); + } + + /** + * 多元服务-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/volunteerServices") + public Result> volunteerServices(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getVolunteerServices(formDto); + } + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/mapVolunteerServices") + public Result> mapVolunteerServices(EpdcScreenBasePageFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.getMapVolunteerServices(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 7b06540..937a717 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 @@ -274,4 +274,44 @@ public interface AnalysisFeignClient { */ @GetMapping("analysis/screen/multipleService/mapPartyMemberServices") Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("analysis/screen/multipleService/communityServices") + Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("analysis/screen/multipleService/mapCommunityServices") + Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("analysis/screen/multipleService/volunteerServices") + Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + @GetMapping("analysis/screen/multipleService/mapVolunteerServices") + Result> getMapVolunteerServices(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 0d1066d..4d22494 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 @@ -145,4 +145,23 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"mapPartyMemberServices",formDto); } + @Override + public Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getCommunityServices",formDto); + } + + @Override + public Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapCommunityServices",formDto); + } + + @Override + public Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getVolunteerServices",formDto); + } + + @Override + public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"getMapVolunteerServices",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 d909d5f..bdea4b3 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 @@ -241,4 +241,40 @@ public interface EpdcScreenService { */ Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto); + /** + * 多元服务-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-社区服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto); + + /** + * 多元服务-地图-志愿服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zy + * @since 2021/9/2 15:30 + */ + Result> getMapVolunteerServices(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 bfe1fe0..c123ab0 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 @@ -146,4 +146,23 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.mapPartyMemberServices(formDto); } + @Override + public Result> getCommunityServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getCommunityServices(formDto); + } + + @Override + public Result> getMapCommunityServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getMapCommunityServices(formDto); + } + + @Override + public Result> getVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getVolunteerServices(formDto); + } + + @Override + public Result> getMapVolunteerServices(EpdcScreenBasePageFormDTO formDto) { + return analysisFeignClient.getMapVolunteerServices(formDto); + } }