From 753d75014bcbbe18642df9ad4e2ca5ee14064add Mon Sep 17 00:00:00 2001 From: zhangfh Date: Tue, 31 Aug 2021 00:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=20bug?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../esua/epdc/controller/ApiAdminController.java | 2 +- .../esua/epdc/controller/ApiAppUserController.java | 6 +++--- .../com/elink/esua/epdc/feign/AdminFeignClient.java | 4 ++-- .../com/elink/esua/epdc/feign/UserFeignClient.java | 12 ++++++------ .../feign/fallback/AdminFeignClientFallback.java | 2 +- .../epdc/feign/fallback/UserFeignClientFallback.java | 2 +- .../com/elink/esua/epdc/service/AdminService.java | 2 +- .../esua/epdc/service/impl/AdminServiceImpl.java | 6 +++--- .../esua/epdc/service/impl/AppUserServiceImpl.java | 2 +- 9 files changed, 19 insertions(+), 19 deletions(-) diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java index a1e914b..46ba411 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/controller/ApiAdminController.java @@ -5,7 +5,7 @@ import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.commons.tools.validator.ValidatorUtils; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.service.AdminService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; 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 11efc63..6117157 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 @@ -397,7 +397,7 @@ public class ApiAppUserController { * @author zhangfenghe * @since 2021/8/30 9:08 */ - @PostMapping("partyBuilding/brightIdentity/recommended") + @PostMapping("partyMember/brightIdentity/recommended") public Result recommended(String id){ return appUserService.recommended(id); @@ -410,8 +410,8 @@ public class ApiAppUserController { * @author zhangfenghe * @since 2021/8/30 9:08 */ - @PostMapping("partyBuilding/brightIdentity/recommendedCancel") - public Result recommendedCancel(String id){ + @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/AdminFeignClient.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java index 6609ad1..15e6da0 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/AdminFeignClient.java @@ -8,8 +8,8 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; -import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.feign.fallback.AdminFeignClientFallback; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.http.MediaType; @@ -167,6 +167,6 @@ public interface AdminFeignClient { * @author zhangfenghe * @since 2021/8/28 18:41 */ - @GetMapping("admin/sysUser/gridmanList") + @GetMapping("sys/sysUser/gridmanList") Result> getGridmanList(EpdcAppGridManFormDTO formDto); } 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 5a1686a..12585cf 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 @@ -455,8 +455,8 @@ public interface UserFeignClient { * @author jyyzz * @since 2021/8/28 20:28 */ - @GetMapping(value = "app-user/partyMember/dentityDetail",consumes = MediaType.APPLICATION_JSON_VALUE) - Result getDentityDetail(Long userId); + @GetMapping(value = "app-user/partyMember/dentityDetail/{userId}",consumes = MediaType.APPLICATION_JSON_VALUE) + Result getDentityDetail(@PathVariable("userId") String userId); /** * 党建引领-党员亮身份推荐 @@ -465,8 +465,8 @@ public interface UserFeignClient { * @author zhangfenghe * @since 2021/8/30 9:08 */ - @PostMapping(value = "app-user/partyMember/dentityDetail/recommended",consumes = MediaType.APPLICATION_JSON_VALUE) - Result recommended(String id); + @PostMapping(value = "app-user/partyMember/brightIdentity/recommended/{id}",consumes = MediaType.APPLICATION_JSON_VALUE) + Result recommended(@PathVariable("id") String id); /** @@ -476,7 +476,7 @@ public interface UserFeignClient { * @author zhangfenghe * @since 2021/8/30 9:08 */ - @PostMapping(value = "app-user/partyMember/dentityDetail/recommendedCancel",consumes = MediaType.APPLICATION_JSON_VALUE) - Result recommendedCaancel(String id); + @PostMapping(value = "app-user/partyMember/brightIdentity/recommendedCancel/{id}",consumes = MediaType.APPLICATION_JSON_VALUE) + Result recommendedCaancel(@PathVariable("id") String id); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java index 911cf7f..79775eb 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/feign/fallback/AdminFeignClientFallback.java @@ -9,8 +9,8 @@ import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.SysUserDTO; import com.elink.esua.epdc.dto.epdc.GridLeaderRegisterDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.epdc.result.EpdcAppIndexPanelResultDTO; -import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.feign.AdminFeignClient; import org.springframework.stereotype.Component; 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 c1764e2..dc38510 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 @@ -219,7 +219,7 @@ public class UserFeignClientFallback implements UserFeignClient { } @Override - public Result getDentityDetail(Long userId) { + public Result getDentityDetail(String userId) { return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"getDentityDetail",userId); } diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java index ee3e86d..1c627ba 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/AdminService.java @@ -3,7 +3,7 @@ package com.elink.esua.epdc.service; import com.elink.esua.epdc.commons.tools.security.user.UserDetail; import com.elink.esua.epdc.commons.tools.utils.Result; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; diff --git a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java index dc5aa41..94e0884 100644 --- a/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java +++ b/epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java @@ -10,7 +10,7 @@ import com.elink.esua.epdc.dto.CompleteDeptDTO; import com.elink.esua.epdc.dto.DeptOption; import com.elink.esua.epdc.dto.ParentAndAllDeptDTO; import com.elink.esua.epdc.dto.epdc.form.EpdcAppGridManFormDTO; -import com.elink.esua.epdc.dto.result.EpdcAppGridManListResultDTO; +import com.elink.esua.epdc.dto.epdc.result.EpdcAppGridManListResultDTO; import com.elink.esua.epdc.dto.result.EpdcAppWorkLogUserResult; import com.elink.esua.epdc.dto.result.EpdcWorkLogUserDetailDTO; import com.elink.esua.epdc.feign.AdminFeignClient; @@ -126,10 +126,10 @@ public class AdminServiceImpl implements AdminService { @Override public Result> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) { - if(null == userDetail){ + /*if(null == userDetail){ return new Result>().error("获取Token信息失败"); } - formDto.setDeptId(userDetail.getDeptId()); + formDto.setDeptId(userDetail.getDeptId());*/ return adminFeignClient.getGridmanList(formDto); } } 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 82d4a30..053ffe2 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,7 +1422,7 @@ public class AppUserServiceImpl implements AppUserService { if (null == userDetail) { return new Result().error("获取用户信息失败"); } - return userFeignClient.getDentityDetail(userDetail.getId()); + return userFeignClient.getDentityDetail(userDetail.getDeptId().toString()); } @Override