From ae730953cc862892f81b07f43d040732731fc9f9 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Thu, 2 Sep 2021 19:19:49 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E5=A4=9A=E5=85=83=E6=9C=8D=E5=8A=A1-=E5=85=9A=E5=91=98?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E6=8E=A5=E5=8F=A3=E4=BB=A3=E7=A0=81=E5=BC=80?= =?UTF-8?q?=E5=8F=91=20api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiScreenController.java | 26 +++++++++++++++++++ .../esua/epdc/feign/AnalysisFeignClient.java | 20 ++++++++++++++ .../fallback/AnalysisFeignClientFallback.java | 10 +++++++ .../esua/epdc/service/EpdcScreenService.java | 18 +++++++++++++ .../service/impl/EpdcScreenServiceImpl.java | 10 +++++++ 5 files changed, 84 insertions(+) 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 6bead3e..274d01b 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 @@ -312,4 +312,30 @@ public class ApiScreenController { ValidatorUtils.validateEntity(formDto); return epdcScreenService.itemList(formDto); } + + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/partyMemberServices") + public Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.partyMemberServices(formDto); + } + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 15:30 + */ + @GetMapping("multipleService/mapPartyMemberServices") + public Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto){ + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.mapPartyMemberServices(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 8c47bcd..cd4425b 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 @@ -255,4 +255,24 @@ public interface AnalysisFeignClient { */ @GetMapping("analysis/screen/gridGovernance/mapItemList") Result> itemList(EpdcScreenItemListFormDTO formDto); + + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 15:30 + */ + @GetMapping("analysis/screen/multipleService/partyMemberServices") + Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 15:30 + */ + @GetMapping("analysis/screen/multipleService/mapPartyMemberServices") + Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO 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 f83ef22..0d1066d 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 @@ -135,4 +135,14 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"itemList",formDto); } + @Override + public Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"partyMemberServices",formDto); + } + + @Override + public Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"mapPartyMemberServices",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 44862b9..d909d5f 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 @@ -223,4 +223,22 @@ public interface EpdcScreenService { */ Result> itemList(EpdcScreenItemListFormDTO formDto); + /** + * 多元服务-党员服务列表 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 15:30 + */ + Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto); + + /** + * 多元服务-地图党员服务 + * @params [formDto] + * @return com.elink.esua.epdc.commons.tools.utils.Result> + * @author zhangfenghe + * @since 2021/9/2 15:30 + */ + Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO 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 76915ca..bfe1fe0 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 @@ -136,4 +136,14 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.itemList(formDto); } + @Override + public Result> partyMemberServices(EpdcScreenPartyMemberServicesFormDTO formDto) { + return analysisFeignClient.partyMemberServices(formDto); + } + + @Override + public Result> mapPartyMemberServices(EpdcScreenMapPartyMemberServicesFormDTO formDto) { + return analysisFeignClient.mapPartyMemberServices(formDto); + } + }