From 01c33fed88ba0b4b8556f2347e52614f3c25068b Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 18 Aug 2021 14:42:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20?= =?UTF-8?q?=E9=A6=96=E9=A1=B5-=E7=BB=84=E7=BB=87=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E4=BC=A0=E5=8F=82-typeKey=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/elink/esua/epdc/controller/ApiScreenController.java | 5 +++-- .../java/com/elink/esua/epdc/feign/AnalysisFeignClient.java | 2 +- .../epdc/feign/fallback/AnalysisFeignClientFallback.java | 4 ++-- .../java/com/elink/esua/epdc/service/EpdcScreenService.java | 2 +- .../elink/esua/epdc/service/impl/EpdcScreenServiceImpl.java | 4 ++-- epdc-cloud-client-yushan | 2 +- epdc-cloud-commons-yushan | 2 +- 7 files changed, 11 insertions(+), 10 deletions(-) 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 1280117..4ff8417 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 @@ -180,8 +180,9 @@ public class ApiScreenController { * @since 2021/8/11 14:32 */ @GetMapping("frontPage/deptInfoList") - public Result> frontPageDeptInfoList() { - return epdcScreenService.frontPageDeptInfoList(); + public Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.frontPageDeptInfoList(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 49fdfd5..b8e20ee 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 @@ -156,7 +156,7 @@ public interface AnalysisFeignClient { * @since 2021/8/11 17:18 */ @GetMapping(value = "analysis/screen/frontPage/deptInfoList",consumes = MediaType.APPLICATION_JSON_VALUE) - Result> frontPageDeptInfoList(); + Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO 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 7a2faa8..971aa5f 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 @@ -81,8 +81,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER, "partyMemberAge"); } @Override - public Result> frontPageDeptInfoList() { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPageDeptInfoList"); + public Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"frontPageDeptInfoList",formDto); } @Override 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 0723c5d..49a097f 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 @@ -131,7 +131,7 @@ public interface EpdcScreenService { * @athor zhangfenghe * @since 2021/8/11 14:32 */ - Result> frontPageDeptInfoList(); + Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO 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 cd4ad8e..0d658e8 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 @@ -82,8 +82,8 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.partyMemberAge(); } @Override - public Result> frontPageDeptInfoList() { - return analysisFeignClient.frontPageDeptInfoList(); + public Result> frontPageDeptInfoList(EpdcScreenFrontPageDeptInfoFormDTO formDto) { + return analysisFeignClient.frontPageDeptInfoList(formDto); } @Override diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index 688b6ec..c660ca3 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit 688b6ec20ea6e5868994c27d8d67cae5238654ed +Subproject commit c660ca360356218f48dbdb987f4fba70f7642435 diff --git a/epdc-cloud-commons-yushan b/epdc-cloud-commons-yushan index b2a4ab3..235f56d 160000 --- a/epdc-cloud-commons-yushan +++ b/epdc-cloud-commons-yushan @@ -1 +1 @@ -Subproject commit b2a4ab3cff9f848c77e7ec6b428321639270f734 +Subproject commit 235f56d5ea756317efe54c5e0d4be0ac45e09155