From 591b69d2c2fedc5ba2db1c2a58375aad89e9a7fc Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Tue, 28 Sep 2021 14:52:51 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E5=85=91=E6=8D=A2=E5=B7=A5?= =?UTF-8?q?=E4=BD=9C=E7=AB=AF=E6=8E=A5=E5=8F=A3API?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...sFeignClient.java => PointsFeignClient.java} | 17 +++++------------ ...back.java => PointsFeignClientFallback.java} | 10 ++-------- .../service/impl/WorkPointsServiceImpl.java | 17 ++++------------- 3 files changed, 11 insertions(+), 33 deletions(-) rename esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/{WorkPointsFeignClient.java => PointsFeignClient.java} (68%) rename esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/{WorkPointsFeignClientFallback.java => PointsFeignClientFallback.java} (70%) diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkPointsFeignClient.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java similarity index 68% rename from esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkPointsFeignClient.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java index e20700bca..8de95718c 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/WorkPointsFeignClient.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/PointsFeignClient.java @@ -3,33 +3,26 @@ package com.elink.esua.epdc.feign; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.config.FeignRequestInterceptor; -import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.form.ExchangedCheckFormDTO; import com.elink.esua.epdc.dto.form.ExchangedListFormDTO; -import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.form.*; -import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.dto.result.ExchangedCheckResultDTO; import com.elink.esua.epdc.dto.result.ExchangedListResultDTO; -import com.elink.esua.epdc.feign.fallback.WorkItemFeignClientFallback; -import com.elink.esua.epdc.feign.fallback.WorkPointsFeignClientFallback; +import com.elink.esua.epdc.feign.fallback.PointsFeignClientFallback; 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 org.springframework.web.bind.annotation.PostMapping; import java.util.List; /** * 项目模块调用-移动app端 - * @Author LPF + * @Author wgf * @Date 2019/11/18 16:39 */ -@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = WorkPointsFeignClientFallback.class, configuration = FeignRequestInterceptor.class - ,url = "http://127.0.0.1:9070" +@FeignClient(name = ServiceConstant.EPDC_POINTS_SERVER, fallback = PointsFeignClientFallback.class, configuration = FeignRequestInterceptor.class +// ,url = "http://127.0.0.1:9070" ) -public interface WorkPointsFeignClient { +public interface PointsFeignClient { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPointsFeignClientFallback.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java similarity index 70% rename from esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPointsFeignClientFallback.java rename to esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java index ea1ac334b..63abd2bb9 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/WorkPointsFeignClientFallback.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/feign/fallback/PointsFeignClientFallback.java @@ -3,18 +3,12 @@ package com.elink.esua.epdc.feign.fallback; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.ModuleUtils; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.EventDeptFormDTO; import com.elink.esua.epdc.dto.form.ExchangedCheckFormDTO; import com.elink.esua.epdc.dto.form.ExchangedListFormDTO; -import com.elink.esua.epdc.dto.item.ItemEvaluateDeptDTO; -import com.elink.esua.epdc.dto.item.form.*; -import com.elink.esua.epdc.dto.item.result.*; import com.elink.esua.epdc.dto.result.ExchangedCheckResultDTO; import com.elink.esua.epdc.dto.result.ExchangedListResultDTO; -import com.elink.esua.epdc.feign.WorkItemFeignClient; -import com.elink.esua.epdc.feign.WorkPointsFeignClient; +import com.elink.esua.epdc.feign.PointsFeignClient; import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.PathVariable; import java.util.List; @@ -23,7 +17,7 @@ import java.util.List; * @Date 2021/9/28 11:39 */ @Component -public class WorkPointsFeignClientFallback implements WorkPointsFeignClient { +public class PointsFeignClientFallback implements PointsFeignClient { @Override public Result> getExchangedList(ExchangedListFormDTO formDto) { diff --git a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkPointsServiceImpl.java b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkPointsServiceImpl.java index e4259dd5a..27555b587 100644 --- a/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkPointsServiceImpl.java +++ b/esua-epdc/epdc-module/epdc-api/epdc-api-server/src/main/java/com/elink/esua/epdc/service/impl/WorkPointsServiceImpl.java @@ -18,20 +18,11 @@ package com.elink.esua.epdc.service.impl; import com.elink.esua.epdc.commons.tools.utils.Result; -import com.elink.esua.epdc.dto.category.EventCategoryDTO; -import com.elink.esua.epdc.dto.comment.form.WorkCommentReplyFormDTO; -import com.elink.esua.epdc.dto.comment.result.WorkEventsCommentsDTO; -import com.elink.esua.epdc.dto.events.EpdcEventsDetailDTO; -import com.elink.esua.epdc.dto.events.form.EpdcEventsReviewFormDTO; import com.elink.esua.epdc.dto.form.ExchangedCheckFormDTO; import com.elink.esua.epdc.dto.form.ExchangedListFormDTO; -import com.elink.esua.epdc.dto.issue.form.*; -import com.elink.esua.epdc.dto.issue.result.*; import com.elink.esua.epdc.dto.result.ExchangedCheckResultDTO; import com.elink.esua.epdc.dto.result.ExchangedListResultDTO; -import com.elink.esua.epdc.feign.WorkIssueFeignClient; -import com.elink.esua.epdc.feign.WorkPointsFeignClient; -import com.elink.esua.epdc.service.WorkIssueService; +import com.elink.esua.epdc.feign.PointsFeignClient; import com.elink.esua.epdc.service.WorkPointsService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -43,7 +34,7 @@ import java.util.List; public class WorkPointsServiceImpl implements WorkPointsService { @Autowired - private WorkPointsFeignClient workPointsFeignClient; + private PointsFeignClient pointsFeignClient; /** @@ -53,7 +44,7 @@ public class WorkPointsServiceImpl implements WorkPointsService { */ @Override public Result> getExchangedList(ExchangedListFormDTO formDto) { - return workPointsFeignClient.getExchangedList(formDto); + return pointsFeignClient.getExchangedList(formDto); } /** @@ -63,7 +54,7 @@ public class WorkPointsServiceImpl implements WorkPointsService { */ @Override public Result exchangedCheck(ExchangedCheckFormDTO formDto) { - return workPointsFeignClient.exchangedCheck(formDto); + return pointsFeignClient.exchangedCheck(formDto); }