From aa8c266c733dcf5632d15f28b87e5dd538547f18 Mon Sep 17 00:00:00 2001 From: liuchuang <123456> Date: Sat, 21 Aug 2021 13:57:35 +0800 Subject: [PATCH] =?UTF-8?q?202108=E7=89=88=E5=A4=A7=E5=B1=8F-=E7=BD=91?= =?UTF-8?q?=E6=A0=BC=E6=B2=BB=E7=90=86=E9=A1=B9=E7=9B=AE=E8=AF=A6=E6=83=85?= =?UTF-8?q?=E6=8E=A5=E5=8F=A3=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../elink/esua/epdc/controller/ApiScreenController.java | 9 +++++---- .../com/elink/esua/epdc/feign/AnalysisFeignClient.java | 7 +++---- .../epdc/feign/fallback/AnalysisFeignClientFallback.java | 4 ++-- .../com/elink/esua/epdc/service/EpdcScreenService.java | 4 ++-- .../esua/epdc/service/impl/EpdcScreenServiceImpl.java | 4 ++-- 5 files changed, 14 insertions(+), 14 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 3efc826..6c86fe6 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 @@ -276,13 +276,14 @@ public class ApiScreenController { /** * 网格治理项目详情 * - * @param id + * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result * @author lc * @since 2021/8/20 19:35 */ - @GetMapping("gridGovernance/itemDetail/{id}") - public Result itemDetail(@PathVariable("id") String id) { - return epdcScreenService.itemDetail(id); + @GetMapping("gridGovernance/itemDetail") + public Result itemDetail(EpdcScreenItemDetailFormDTO formDto) { + ValidatorUtils.validateEntity(formDto); + return epdcScreenService.itemDetail(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 09e94cd..795ad09 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 @@ -11,7 +11,6 @@ import com.elink.esua.epdc.feign.fallback.AnalysisFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -229,11 +228,11 @@ public interface AnalysisFeignClient { /** * 网格治理项目详情 * - * @param id + * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result * @author lc * @since 2021/8/20 19:35 */ - @GetMapping(value = "analysis/screen/gridGovernance/itemDetail/{id}",consumes = MediaType.APPLICATION_JSON_VALUE) - Result itemDetail(@PathVariable String id); + @GetMapping(value = "analysis/screen/gridGovernance/itemDetail",consumes = MediaType.APPLICATION_JSON_VALUE) + Result itemDetail(EpdcScreenItemDetailFormDTO 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 559dee9..68af49c 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 @@ -121,8 +121,8 @@ public class AnalysisFeignClientFallback implements AnalysisFeignClient { } @Override - public Result itemDetail(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"itemDetail",id); + public Result itemDetail(EpdcScreenItemDetailFormDTO formDto) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_ANALYSIS_SERVER,"itemDetail",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 421e8ca..761ed14 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 @@ -196,11 +196,11 @@ public interface EpdcScreenService { /** * 网格治理项目详情 * - * @param id + * @param formDto * @return com.elink.esua.epdc.commons.tools.utils.Result * @author lc * @since 2021/8/20 19:35 */ - Result itemDetail(String id); + Result itemDetail(EpdcScreenItemDetailFormDTO 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 c4952bc..43ddab5 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 @@ -122,8 +122,8 @@ public class EpdcScreenServiceImpl implements EpdcScreenService { } @Override - public Result itemDetail(String id) { - return analysisFeignClient.itemDetail(id); + public Result itemDetail(EpdcScreenItemDetailFormDTO formDto) { + return analysisFeignClient.itemDetail(formDto); } }