代码提交 bug代码更新

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;

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")
+    @PostMapping("partyMember/brightIdentity/recommendedCancel/{id}")
-    public Result recommendedCancel(String id){
+    public Result recommendedCancel(@PathVariable("id") String id){
         return appUserService.recommendedCancel(id);
 
     }

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<List<EpdcAppGridManListResultDTO>> getGridmanList(EpdcAppGridManFormDTO formDto);
 }

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)
+    @GetMapping(value = "app-user/partyMember/dentityDetail/{userId}",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result<EpdcAppIdentityDetailResultDTO>  getDentityDetail(Long userId);
+    Result<EpdcAppIdentityDetailResultDTO>  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)
+    @PostMapping(value = "app-user/partyMember/brightIdentity/recommended/{id}",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result recommended(String id);
+    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)
+    @PostMapping(value = "app-user/partyMember/brightIdentity/recommendedCancel/{id}",consumes = MediaType.APPLICATION_JSON_VALUE)
-    Result recommendedCaancel(String id);
+    Result recommendedCaancel(@PathVariable("id") String id);
 }
 

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;
 

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<EpdcAppIdentityDetailResultDTO> getDentityDetail(Long userId) {
+    public Result<EpdcAppIdentityDetailResultDTO> getDentityDetail(String userId) {
         return ModuleUtils.feignConError(ServiceConstant.EPDC_USER_SERVER,"getDentityDetail",userId);
     }
 

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;
 

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<List<EpdcAppGridManListResultDTO>> getGridmanList(UserDetail userDetail, EpdcAppGridManFormDTO formDto) {
-        if(null == userDetail){
+        /*if(null == userDetail){
           return  new Result<List<EpdcAppGridManListResultDTO>>().error("获取Token信息失败");
         }
-        formDto.setDeptId(userDetail.getDeptId());
+        formDto.setDeptId(userDetail.getDeptId());*/
         return adminFeignClient.getGridmanList(formDto);
     }
 }

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<EpdcAppIdentityDetailResultDTO>().error("获取用户信息失败");
         }
-        return userFeignClient.getDentityDetail(userDetail.getId());
+        return userFeignClient.getDentityDetail(userDetail.getDeptId().toString());
     }
 
     @Override