From 4343266054e28681594402013bea2513c18dd5e0 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Wed, 1 Dec 2021 11:06:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=96=B0=E5=A2=9E=E8=AE=AE?= =?UTF-8?q?=E9=A2=98=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiScreenController.java | 14 ++++++++++++++ .../elink/esua/epdc/feign/AnalysisFeignClient.java | 13 ++++++++++++- .../fallback/AnalysisFeignClientFallback.java | 5 +++++ .../elink/esua/epdc/service/EpdcScreenService.java | 10 ++++++++++ .../epdc/service/impl/EpdcScreenServiceImpl.java | 5 +++++ 5 files changed, 46 insertions(+), 1 deletion(-) 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 d76a698..45f598c 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 @@ -289,6 +289,20 @@ public class ApiScreenController { * 网格治理-议题详情 * * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/8/20 19:35 + */ + @GetMapping("gridGovernance/issueDetail") + public Result issueDetail(EpdcScreenIssueDetailFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.issueDetail(formDto); + } + + /** + * 网格治理-议题处理进展 + * + * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result> * @author lc * @since 2021/8/21 17:36 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 296c605..371dfed 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 @@ -224,7 +224,7 @@ public interface AnalysisFeignClient { Result vaccinationPersonVaccinationStatistics(EpdcScreenVaccinationPersonVaccinationStatisticsFormDTO formDto); /** - * 网格治理项目详情 + * 网格治理-项目详情 * * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result @@ -234,6 +234,17 @@ public interface AnalysisFeignClient { @GetMapping(value = "analysis/screen/gridGovernance/itemDetail",consumes = MediaType.APPLICATION_JSON_VALUE) Result itemDetail(EpdcScreenItemDetailFormDTO formDto); + /** + * 网格治理-议题详情 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/8/20 19:35 + */ + @GetMapping(value = "analysis/screen/gridGovernance/issueDetail",consumes = MediaType.APPLICATION_JSON_VALUE) + Result issueDetail(EpdcScreenIssueDetailFormDTO 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 3a958bb..bd8b0fc 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 @@ -126,6 +126,11 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"itemDetail",formDto); } + @Override + public Result issueDetail(EpdcScreenIssueDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"issueDetail",formDto); + } + @Override public Result> issueProgress(EpdcScreenIssueProgressFormDTO formDto) { return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"issueProgress",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 9cee32b..d87b7f6 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 @@ -204,6 +204,16 @@ public interface EpdcScreenService { */ Result itemDetail(EpdcScreenItemDetailFormDTO formDto); + /** + * 网格治理-项目详情 + * + * @param formDto + * @return com.elink.esua.epdc.commons.tools.utils.Result + * @author lc + * @since 2021/8/20 19:35 + */ + Result issueDetail(EpdcScreenIssueDetailFormDTO 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 15c6452..8261128 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 @@ -127,6 +127,11 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { return analysisFeignClient.itemDetail(formDto); } + @Override + public Result issueDetail(EpdcScreenIssueDetailFormDTO formDto) { + return analysisFeignClient.issueDetail(formDto); + } + @Override public Result> issueProgress(EpdcScreenIssueProgressFormDTO formDto) { return analysisFeignClient.issueProgress(formDto);