manager|权限接口调整

@@ -91,6 +91,8 @@ C:BRANCH 分支
      */
      */
     private String modifyUserName;
     private String modifyUserName;
 
 
+    private String hidden;
+
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
 
 
     public Long getId() {
     public Long getId() {
@@ -221,6 +223,18 @@ C:BRANCH 分支
         this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
         this.modifyUserName = modifyUserName == null ? null : modifyUserName.trim();
     }
     }
 
 
+    public String getHidden() {
+        return hidden;
+    }
+
+    public void setHidden(String hidden) {
+        this.hidden = hidden;
+    }
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
     @Override
     @Override
     public String toString() {
     public String toString() {
         StringBuilder sb = new StringBuilder();
         StringBuilder sb = new StringBuilder();

 package com.fedex.connect.manager.controller.sys;
 package com.fedex.connect.manager.controller.sys;
 
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
-import org.springframework.web.bind.annotation.PathVariable;
 
 
 public interface ISysPrivilegeController {
 public interface ISysPrivilegeController {
-    ResponseVo getPrivilege(@PathVariable Long userId);
+    ResponseVo getPrivilege();
 }
 }

 package com.fedex.connect.manager.controller.sys.impl;
 package com.fedex.connect.manager.controller.sys.impl;
 
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.manager.controller.base.BaseController;
 import com.fedex.connect.manager.controller.base.BaseController;
 import com.fedex.connect.manager.controller.sys.ISysPrivilegeController;
 import com.fedex.connect.manager.controller.sys.ISysPrivilegeController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
 
 
@@ -18,9 +18,13 @@ import org.springframework.web.bind.annotation.RestController;
 public class SysPrivilegeController extends BaseController implements ISysPrivilegeController {
 public class SysPrivilegeController extends BaseController implements ISysPrivilegeController {
 
 
     @Override
     @Override
-    @GetMapping(value = {"/{userId}"})
-    @ApiOperation(value = "根据用户ID获取菜单")
-    public ResponseVo getPrivilege(@PathVariable Long userId){
-        return privilegeService.getPrivilegeByUserId(userId);
+    @GetMapping(value = {"/getPrivilege"})
+    @ApiOperation(value = "获取菜单")
+    public ResponseVo getPrivilege(){
+        /**
+         * 获取当前用户信息
+         */
+        User user = this.getCurrentUserInfo();
+        return privilegeService.getPrivilege(user);
     }
     }
 }
 }

 package com.fedex.connect.manager.service.sys;
 package com.fedex.connect.manager.service.sys;
 
 
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
+import com.fedex.connect.common.model.sys.User;
 
 
 public interface IPrivilegeService {
 public interface IPrivilegeService {
-    ResponseVo getPrivilegeByUserId(Long id);
+    ResponseVo getPrivilege(User user);
 }
 }

@@ -3,6 +3,7 @@ package com.fedex.connect.manager.service.sys.impl;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.contants.DatabaseConstants;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.dependencies.date.vo.ResponseVo;
 import com.fedex.connect.common.model.sys.Privilege;
 import com.fedex.connect.common.model.sys.Privilege;
+import com.fedex.connect.common.model.sys.User;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRole;
 import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.common.model.sys.UserRoleExample;
 import com.fedex.connect.manager.service.base.BaseService;
 import com.fedex.connect.manager.service.base.BaseService;
@@ -18,14 +19,14 @@ import java.util.stream.Collectors;
 @Slf4j
 @Slf4j
 public class PrivilegeServiceImpl extends BaseService implements IPrivilegeService {
 public class PrivilegeServiceImpl extends BaseService implements IPrivilegeService {
 
 
-    public ResponseVo getPrivilegeByUserId(Long id){
+    public ResponseVo getPrivilege(User user){
         /**
         /**
          * 获取到该用户的角色
          * 获取到该用户的角色
          */
          */
         UserRoleExample example = new UserRoleExample();
         UserRoleExample example = new UserRoleExample();
         UserRoleExample.Criteria criteria = example.createCriteria();
         UserRoleExample.Criteria criteria = example.createCriteria();
         criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID);
         criteria.andStatusEqualTo(DatabaseConstants.GLOBAL_STATUS_VALID);
-        criteria.andUserIdEqualTo(id);
+        criteria.andUserIdEqualTo(user.getId());
         List<UserRole> userRoles = userRoleRepository.selectByExample(example);
         List<UserRole> userRoles = userRoleRepository.selectByExample(example);
         /**
         /**
          * 根据角色获取菜单权限
          * 根据角色获取菜单权限
@@ -40,6 +41,9 @@ public class PrivilegeServiceImpl extends BaseService implements IPrivilegeServi
              * 获取权限
              * 获取权限
              */
              */
             List<Privilege> privilegesByIds = privilegeRepository.findPrivilegesByIds(byRoleIds);
             List<Privilege> privilegesByIds = privilegeRepository.findPrivilegesByIds(byRoleIds);
+            for (Privilege privilegesById : privilegesByIds) {
+                privilegesById.setHidden("false");
+            }
             return responseUtils.success(privilegesByIds);
             return responseUtils.success(privilegesByIds);
         }
         }