更改登录返回信息

user_auth/src/main/java/com/huaxu/controller/UserController.java

@@ -53,17 +53,17 @@ public class UserController {
      */
     @RequestMapping(value = "login", method = RequestMethod.POST)
     @ApiOperation(value = "登录")
-    public AjaxMessage< List<UserDto>> login(String mobile, String tenatId) {
+    public AjaxMessage< User> login(String mobile, String tenatId) {
         User user=new User();
         user.setPhone(mobile);
         user.setTenantId(tenatId);
       ;
-        List<UserDto> userDtos = userService.chooseUser(user);
-        if(userDtos==null){
+        User user2 = userService.chooseUser(user);
+        if(user2==null){
             return new AjaxMessage<>(ResultStatus.ROLE_HAS_DISABLE);
         }
 
-        return new AjaxMessage<>(ResultStatus.OK,userDtos);
+        return new AjaxMessage<>(ResultStatus.OK,user2);
     }
     /**
      * 退出

user_auth/src/main/java/com/huaxu/service/UserService.java

@@ -82,7 +82,7 @@ public interface UserService {
     IPage<User> selectPage(User user, IPage<User> page);
     User findUser(User user);
 
-    List<UserDto> chooseUser(User user);
+    User chooseUser(User user);
     boolean logOut(String token);
 
     /**

user_auth/src/main/java/com/huaxu/service/impl/UserServiceImpl.java

@@ -171,13 +171,13 @@ public class UserServiceImpl implements UserService {
 
 
     @Override
-    public List<UserDto> chooseUser(User user) {
+    public User chooseUser(User user) {
 
 
         user=findUser(user);
         UserDto userDto=new UserDto();
         userDto.setPhone(user.getPhone());
-        List<UserDto> loginInfos = userMapper.findLoginInfo(userDto);
+
         Set<GrantedAuthority> grantedAuthorities = new HashSet<>();
         OAuth2Authentication oAuth2Authentication = (OAuth2Authentication) SecurityContextHolder.getContext().getAuthentication();
         LoginUser loginUser = (LoginUser) oAuth2Authentication.getPrincipal();
@@ -229,7 +229,7 @@ public class UserServiceImpl implements UserService {
         OAuth2AccessToken accessToken = authorizationServerTokenServices.createAccessToken(oAuth2AuthenticationNew);
 
         insertLoginLog(loginUser,"登录");
-        return loginInfos;
+        return user;
     }
 
     private void getDataPermission(int permissionType,User user, List<ProgramItem> programItemList){

user_center/src/main/java/com/huaxu/controller/RoleController.java

@@ -1,10 +1,12 @@
 package com.huaxu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.api.R;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.dto.RoleDto;
 import com.huaxu.dto.RoleRequestDto;
 import com.huaxu.entity.Role;
+import com.huaxu.entity.RoleOrg;
 import com.huaxu.entity.UserEntity;
 import com.huaxu.entity.UserGroup;
 import com.huaxu.model.AjaxMessage;
@@ -128,4 +130,12 @@ public class RoleController {
         return new AjaxMessage<>(ResultStatus.OK,
                 roleService.updateRoleMenuRelations(role));
     }
+    @RequestMapping(value = "getRoleOrgs", method = RequestMethod.POST)
+    @ApiOperation(value = "配置角色菜单")
+    AjaxMessage<List<RoleOrg>> getRoleOrgs(@ApiParam(value = "角色id", required = true)@RequestParam Integer id){
+        RoleOrg roleOrg=new RoleOrg();
+        roleOrg.setRoleId(id);
+        return new AjaxMessage<>(ResultStatus.OK,
+                roleService.getRoleOrgs(roleOrg));
+    }
 }

user_center/src/main/java/com/huaxu/dao/RoleMenuMapper.java

@@ -3,6 +3,7 @@ package com.huaxu.dao;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.entity.RoleMenu;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -53,7 +54,7 @@ public interface RoleMenuMapper {
      * @param roleMenus 实例对象的集合
      * @return 影响行数
      */
-    int batchInsert(List<RoleMenu> roleMenus);
+    int batchInsert(@Param("roleMenus") List<RoleMenu> roleMenus);
 
     /**
      * 修改数据

user_center/src/main/java/com/huaxu/dto/RoleDto.java

@@ -18,5 +18,7 @@ public class RoleDto {
      */
     @ApiModelProperty(value = "角色描述")
     private String description;
+    @ApiModelProperty(value = "角色描述")
+    private Integer permissionType;
 
 }

user_center/src/main/java/com/huaxu/service/RoleService.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dto.RoleDto;
 import com.huaxu.dto.RoleRequestDto;
 import com.huaxu.entity.Role;
+import com.huaxu.entity.RoleOrg;
 import com.huaxu.entity.UserEntity;
 
 import java.util.List;
@@ -83,5 +84,6 @@ public interface RoleService {
     IPage<RoleDto> selectPage(Role role, IPage<RoleDto> page);
      List<UserEntity>findUsersByRole(Role role);
      int updateRoleMenuRelations(RoleRequestDto dto);
+     List<RoleOrg>getRoleOrgs(RoleOrg roleOrg);
 
 }

user_center/src/main/java/com/huaxu/service/impl/RoleServiceImpl.java

@@ -37,6 +37,7 @@ public class RoleServiceImpl implements RoleService {
     @Autowired
     private RedisUtil redisUtil;
 
+
     /**
      * 通过ID查询单条数据
      *
@@ -224,4 +225,10 @@ public class RoleServiceImpl implements RoleService {
         roleMenuMapper.batchInsert(menus);
         return 0;
     }
+
+    @Override
+    public List<RoleOrg> getRoleOrgs(RoleOrg roleOrg) {
+       ;
+        return  roleOrgMapper.selectList(roleOrg);
+    }
 }