From e124b18d1481456f6beba7cee8406dc76ea1e5b2 Mon Sep 17 00:00:00 2001 From: zhangfh Date: Wed, 1 Sep 2021 11:20:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20bug?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epdc/controller/ApiAppUserController.java | 25 ----------------- .../esua/epdc/feign/UserFeignClient.java | 28 +++---------------- .../fallback/UserFeignClientFallback.java | 15 ++-------- .../esua/epdc/service/AppUserService.java | 18 ------------ .../epdc/service/impl/AppUserServiceImpl.java | 14 ++-------- epdc-cloud-client-yushan | 2 +- 6 files changed, 11 insertions(+), 91 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java index 0528923..6dfd4ae 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAppUserController.java @@ -389,29 +389,4 @@ public class ApiAppUserController { public Result getDentityDetail(@LoginUser TokenDto userDetail){ return appUserService.getDentityDetail(userDetail); } - /** - * 党建引领-党员亮身份推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping("partyMember/brightIdentity/recommended") - public Result recommended(String id){ - return appUserService.recommended(id); - - } - - /** - * 党建引领-党员亮身份取消推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping("partyMember/brightIdentity/recommendedCancel/{id}") - public Result recommendedCancel(@PathVariable("id") String id){ - return appUserService.recommendedCancel(id); - - } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java index 12585cf..9757948 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/UserFeignClient.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.feign; +import com.elink.esua.epdc.common.token.dto.TokenDto; import com.elink.esua.epdc.commons.tools.constant.ServiceConstant; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.CachingUserInfoDTO; @@ -26,7 +27,7 @@ import java.util.List; * @email yujintao@elink-cn.com * @date 2019/9/7 9:27 */ -@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPDC_USER_SERVER, fallback = UserFeignClientFallback.class,url = "http://localhost:9068") public interface UserFeignClient { /** @@ -455,28 +456,7 @@ public interface UserFeignClient { * @author jyyzz * @since 2021/8/28 20:28 */ - @GetMapping(value = "app-user/partyMember/dentityDetail/{userId}",consumes = MediaType.APPLICATION_JSON_VALUE) - Result getDentityDetail(@PathVariable("userId") String userId); - - /** - * 党建引领-党员亮身份推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping(value = "app-user/partyMember/brightIdentity/recommended/{id}",consumes = MediaType.APPLICATION_JSON_VALUE) - Result recommended(@PathVariable("id") String id); - - - /** - * 党建引领-党员亮身份取消推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - @PostMapping(value = "app-user/partyMember/brightIdentity/recommendedCancel/{id}",consumes = MediaType.APPLICATION_JSON_VALUE) - Result recommendedCaancel(@PathVariable("id") String id); + @GetMapping(value = "app-user/partyMember/dentityDetail",consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDentityDetail(EpdcAppIdentityDetailFormDTO userDetail); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java index dc38510..30e3334 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/UserFeignClientFallback.java @@ -1,5 +1,6 @@ package com.elink.esua.epdc.feign.fallback; +import com.elink.esua.epdc.common.token.dto.TokenDto; 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; @@ -219,17 +220,7 @@ public class UserFeignClientFallback implements UserFeignClient { } @Override - public Result getDentityDetail(String userId) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"getDentityDetail",userId); - } - - @Override - public Result recommended(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"recommended",id); - } - - @Override - public Result recommendedCaancel(String id) { - return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"recommendedCaancel",id); + public Result getDentityDetail(EpdcAppIdentityDetailFormDTO userDetail) { + return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"getDentityDetail",userDetail); } } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java index 3b8eda2..bdcd030 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AppUserService.java @@ -322,22 +322,4 @@ public interface AppUserService { */ Result getDentityDetail(TokenDto userDetail); - /** - * 党建引领-党员亮身份推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - Result recommended(String id); - - /** - * 党建引领-党员亮身份取消推荐 - * @params [id] - * @return com.elink.esua.epdc.commons.tools.utils.Result - * @author zhangfenghe - * @since 2021/8/30 9:08 - */ - Result recommendedCancel(String id); - } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java index ba04a39..36491a2 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AppUserServiceImpl.java @@ -1422,17 +1422,9 @@ public class AppUserServiceImpl implements AppUserService { if (null == userDetail) { return new Result().error("获取用户信息失败"); } - return userFeignClient.getDentityDetail(userDetail.getUserId()); - } - - @Override - public Result recommended(String id) { - return userFeignClient.recommended(id); - } - - @Override - public Result recommendedCancel(String id) { - return userFeignClient.recommendedCaancel(id); + EpdcAppIdentityDetailFormDTO identityDetailFormDTO =new EpdcAppIdentityDetailFormDTO(); + identityDetailFormDTO.setUserId(userDetail.getUserId()); + return userFeignClient.getDentityDetail(identityDetailFormDTO); } } diff --git a/epdc-cloud-client-yushan b/epdc-cloud-client-yushan index d453a20..632952b 160000 --- a/epdc-cloud-client-yushan +++ b/epdc-cloud-client-yushan @@ -1 +1 @@ -Subproject commit d453a20b76d8593d49c93551e6eea02c3ed13948 +Subproject commit 632952b6e320eb76c88dd7152e906648e4b10851