添加 获取当前用户信息和权限

CODE/smart-community/operate-api/src/main/java/com/community/huiju/controller/UserController.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.community.commom.constant.Constant;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
+import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
 import io.swagger.annotations.Api;
@@ -56,4 +57,24 @@ public class UserController {
     }
 
 
+    @ApiOperation(value = "获取用户信息",nickname = "获取用户信息")
+    @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token"),
+    })
+    @RequestMapping(value = "/user/info",method = RequestMethod.GET)
+    public ResponseBean getInfo(HttpSession session) {
+        ResponseBean response = new ResponseBean();
+
+        UserElement userElement = (UserElement) session.getAttribute(Constant.WEB_USER_SESSION);
+        if (null == userElement) {
+            response.addError("请登录!");
+            return response;
+        }
+
+        response = iToUserService.getInfo(userElement.getId());
+
+        return response;
+    }
+
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/dao/ToSysRoleMapper.java

@@ -3,6 +3,8 @@ package com.community.huiju.dao;
 import com.community.huiju.model.ToSysRole;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 @Mapper
 public interface ToSysRoleMapper {
     int deleteByPrimaryKey(Integer id);
@@ -16,4 +18,11 @@ public interface ToSysRoleMapper {
     int updateByPrimaryKeySelective(ToSysRole record);
 
     int updateByPrimaryKey(ToSysRole record);
+
+    /**
+     * 根据用户ID查询所有角色
+     * @param userId
+     * @return
+     */
+    List<ToSysRole> selectRoleByUserId(Integer userId);
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToSysRoleService.java

@@ -0,0 +1,18 @@
+package com.community.huiju.service;
+
+import com.community.huiju.model.ToSysRole;
+
+import java.util.List;
+
+/**
+ * 角色 业务
+ * @author weiximei
+ */
+public interface IToSysRoleService {
+    /**
+     * 根据用户ID查询所有角色
+     * @param userId
+     * @return
+     */
+    List<ToSysRole> selectRoleByUserId(Integer userId);
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/IToUserService.java

@@ -16,4 +16,11 @@ public interface IToUserService {
      */
     ResponseBean login(String loginName,String code);
 
+    /**
+     * 获取用户信息
+     * @param userId
+     * @return
+     */
+    ResponseBean getInfo(Integer userId);
+
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToSysRoleServiceImpl.java

@@ -0,0 +1,24 @@
+package com.community.huiju.service.impl;
+
+import com.community.huiju.dao.ToSysRoleMapper;
+import com.community.huiju.model.ToSysRole;
+import com.community.huiju.service.IToSysRoleService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+@Service("iToSysRoleService")
+@Slf4j
+public class ToSysRoleServiceImpl implements IToSysRoleService {
+
+    @Autowired
+    private ToSysRoleMapper toSysRoleMapper;
+
+    @Override
+    public List<ToSysRole> selectRoleByUserId(Integer userId) {
+
+        return toSysRoleMapper.selectRoleByUserId(userId);
+    }
+}

CODE/smart-community/operate-api/src/main/java/com/community/huiju/service/impl/ToUserServerImpl.java

@@ -3,7 +3,9 @@ package com.community.huiju.service.impl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.utils.AccountValidatorUtil;
 import com.community.huiju.common.code.cache.AppkeyCache;
+import com.community.huiju.dao.ToSysRoleMapper;
 import com.community.huiju.dao.ToUserMapper;
+import com.community.huiju.model.ToSysRole;
 import com.community.huiju.model.ToUser;
 import com.community.huiju.service.IToUserService;
 import com.community.huiju.vo.ToUserVO;
@@ -13,6 +15,8 @@ import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service("iToUserServer")
 @Slf4j
 public class ToUserServerImpl implements IToUserService {
@@ -20,6 +24,9 @@ public class ToUserServerImpl implements IToUserService {
     @Autowired
     private ToUserMapper toUserMapper;
 
+    @Autowired
+    private ToSysRoleMapper toSysRoleMapper;
+
     @Override
     public ResponseBean login(String loginName, String code) {
 
@@ -52,4 +59,25 @@ public class ToUserServerImpl implements IToUserService {
         response.addSuccess(userVO);
         return response;
     }
+
+
+    @Override
+    public ResponseBean getInfo(Integer userId) {
+        ResponseBean response = new ResponseBean();
+        ToUser toUser = toUserMapper.selectByPrimaryKey(userId);
+        if (toUser == null) {
+            response.addError("用户不存在!");
+            return response;
+        }
+
+        ToUserVO toUserVO = new ToUserVO();
+        BeanUtils.copyProperties(toUser,toUserVO);
+
+        List<ToSysRole> sysRoleList = toSysRoleMapper.selectRoleByUserId(userId);
+        toUserVO.setRoles(sysRoleList);
+
+        response.addSuccess(toUserVO);
+
+        return response;
+    }
 }

CODE/smart-community/operate-api/src/main/java/com/community/huiju/vo/ToUserVO.java

@@ -1,10 +1,12 @@
 package com.community.huiju.vo;
 
+import com.community.huiju.model.ToSysRole;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Date;
+import java.util.List;
 
 /**
  * @author weiximei
@@ -49,4 +51,7 @@ public class ToUserVO {
     /** 用户token **/
     private String token;
 
+    /** 角色 **/
+    private List<ToSysRole> roles;
+
 }

CODE/smart-community/operate-api/src/main/resources/mapper/ToSysRoleMapper.xml

@@ -125,4 +125,10 @@
       update_date = #{updateDate,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
+
+  <select id="selectRoleByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
+    select
+    role.*
+     from to_sys_user_role ur left join to_sys_role role on ur.role_id = role.id where ur.user_id=#{userId}
+  </select>
 </mapper>

CODE/smart-community/zuul/src/main/resources/mapper/ToSysRoleMapper.xml

@@ -129,7 +129,7 @@
   <select id="selectRoleByUserId" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
     role.*
-     from to_sys_user_role ur left join ta_sys_role role on ur.role_id = role.id where ur.user_id=#{userId}
+     from to_sys_user_role ur left join to_sys_role role on ur.role_id = role.id where ur.user_id=#{userId}
   </select>
 
 </mapper>