Просмотр исходного кода

20230716(2)-完成用户信息接口

iaun 3 лет назад
Родитель
Сommit
f2fd06ecb5

+ 6 - 3
src/main/java/cn/iaun/it/ItApplication.java

@@ -4,12 +4,15 @@ import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.TimeZone;
+
 @SpringBootApplication
 @MapperScan("cn.iaun.it.mapper")
 public class ItApplication {
 
-	public static void main(String[] args) {
-		SpringApplication.run(ItApplication.class, args);
-	}
+    public static void main(String[] args) {
+        TimeZone.setDefault(TimeZone.getTimeZone("GMT+8"));
+        SpringApplication.run(ItApplication.class, args);
+    }
 
 }

+ 7 - 10
src/main/java/cn/iaun/it/controller/ItUserController.java

@@ -1,14 +1,12 @@
 package cn.iaun.it.controller;
 
-import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserInfoVo;
 import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import cn.iaun.it.service.ItUserService;
 import cn.iaun.it.util.Result;
 import cn.iaun.it.util.ResultCode;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/user")
 public class ItUserController {
@@ -18,20 +16,19 @@ public class ItUserController {
         this.itUserService = itUserService;
     }
 
-    @RequestMapping(value = "/get")
-    public Result<List<ItUser>> getUser() {
-        return new Result<>(ResultCode.SUCCESS, itUserService.getAll());
-    }
-
-
     @PostMapping(value = "/login")
     public Result<ItUserLoginInfoVo> login(@RequestBody LoginRequest request) {
-        ItUserLoginInfoVo itUserLoginInfoVo = itUserService.loginByUserAndPassword(request.user, request.password);
+        ItUserLoginInfoVo itUserLoginInfoVo = itUserService.getTokenByUserAndPassword(request.user, request.password);
         if (itUserLoginInfoVo == null) {
             return new Result<>(ResultCode.USER_WRONG_USER_OR_PASSWORD, null);
         }
         return new Result<>(ResultCode.SUCCESS, itUserLoginInfoVo);
     }
+
+    @GetMapping(value = "/info")
+    public Result<ItUserInfoVo> info(@RequestAttribute("userId") Long userId) {
+        return new Result<>(ResultCode.SUCCESS, itUserService.getUserInfoByUserId(userId));
+    }
 }
 
 class LoginRequest {

+ 13 - 0
src/main/java/cn/iaun/it/mapper/ItRolePermissionMapper.java

@@ -0,0 +1,13 @@
+package cn.iaun.it.mapper;
+
+import cn.iaun.it.model.ItRolePermission;
+import cn.iaun.it.model.vo.permission.ItRoleSysPermissionVo;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+import java.util.List;
+
+@Mapper
+public interface ItRolePermissionMapper extends BaseMapper<ItRolePermission> {
+    List<ItRoleSysPermissionVo> getRolePermissionsByRoleId(Long roleId);
+}

+ 3 - 12
src/main/java/cn/iaun/it/mapper/ItUserMapper.java

@@ -1,23 +1,14 @@
 package cn.iaun.it.mapper;
 
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserInfoVo;
 import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Select;
 
 @Mapper
 public interface ItUserMapper extends BaseMapper<ItUser> {
-    //    @Select(
-    //            "select u.user_id as user_id, u.user as user, u.display_name as display_name, u.phone_number as phone_number, u.role_id as role_id, " +
-    //                    "r.name as role_name " +
-    //                    "from it_user u left join it_role r on u.role_id = r.role_id " +
-    //                    "where u.user = #{user} and u.password = #{password} limit 1"
-    //    )
-    @Select(
-            "select u.user_id as user_id " +
-                    "from it_user u " +
-                    "where u.user = #{user} and u.password = #{password} limit 1"
-    )
     ItUserLoginInfoVo selectItUserLoginInfo(String user, String password);
+
+    ItUserInfoVo selectUserInfo(Long userId);
 }

+ 31 - 0
src/main/java/cn/iaun/it/model/vo/permission/ItRoleSysPermissionVo.java

@@ -0,0 +1,31 @@
+package cn.iaun.it.model.vo.permission;
+
+public class ItRoleSysPermissionVo {
+    Long sysId;
+    String sysName;
+
+
+    @Override
+    public String toString() {
+        return "ItRoleSysPermissionVo{" +
+                "sysId=" + sysId +
+                ", sysName=" + sysName +
+                '}';
+    }
+
+    public Long getSysId() {
+        return sysId;
+    }
+
+    public void setSysId(Long sysId) {
+        this.sysId = sysId;
+    }
+
+    public String getSysName() {
+        return sysName;
+    }
+
+    public void setSysName(String sysName) {
+        this.sysName = sysName;
+    }
+}

+ 12 - 18
src/main/java/cn/iaun/it/model/vo/user/ItUserInfoVo.java

@@ -1,41 +1,35 @@
 package cn.iaun.it.model.vo.user;
 
+import cn.iaun.it.model.vo.permission.ItRoleSysPermissionVo;
+
+import java.util.List;
+
 public class ItUserInfoVo {
-    private Long userId;
     private String user;
     private String displayName;
     private String phoneNumber;
     private Long roleId;
     private String roleName;
-    private String token;
+    private List<ItRoleSysPermissionVo> permissions;
 
     @Override
     public String toString() {
-        return "ItUserLoginInfoVo{" +
-                "userId='" + userId + '\'' +
-                ", user='" + user + '\'' +
+        return "ItUserInfoVo{" +
+                "user='" + user + '\'' +
                 ", displayName='" + displayName + '\'' +
                 ", phoneNumber='" + phoneNumber + '\'' +
                 ", roleId=" + roleId +
                 ", roleName='" + roleName + '\'' +
-                ", token='" + token + '\'' +
+                ", permissions=" + permissions +
                 '}';
     }
 
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public String getToken() {
-        return token;
+    public List<ItRoleSysPermissionVo> getPermissions() {
+        return permissions;
     }
 
-    public void setToken(String token) {
-        this.token = token;
+    public void setPermissions(List<ItRoleSysPermissionVo> permissions) {
+        this.permissions = permissions;
     }
 
     public String getUser() {

+ 4 - 1
src/main/java/cn/iaun/it/service/ItUserService.java

@@ -1,6 +1,7 @@
 package cn.iaun.it.service;
 
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.user.ItUserInfoVo;
 import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 
 import java.util.List;
@@ -9,5 +10,7 @@ import java.util.List;
 public interface ItUserService {
     List<ItUser> getAll();
 
-    ItUserLoginInfoVo loginByUserAndPassword(String user, String password);
+    ItUserLoginInfoVo getTokenByUserAndPassword(String user, String password);
+
+    ItUserInfoVo getUserInfoByUserId(Long userId);
 }

+ 21 - 2
src/main/java/cn/iaun/it/service/impl/ItUserServiceImpl.java

@@ -1,7 +1,10 @@
 package cn.iaun.it.service.impl;
 
+import cn.iaun.it.mapper.ItRolePermissionMapper;
 import cn.iaun.it.mapper.ItUserMapper;
 import cn.iaun.it.model.ItUser;
+import cn.iaun.it.model.vo.permission.ItRoleSysPermissionVo;
+import cn.iaun.it.model.vo.user.ItUserInfoVo;
 import cn.iaun.it.model.vo.user.ItUserLoginInfoVo;
 import cn.iaun.it.service.ItUserService;
 import cn.iaun.it.util.MD5Util;
@@ -15,11 +18,13 @@ import java.util.concurrent.TimeUnit;
 @Service
 public class ItUserServiceImpl implements ItUserService {
     private final ItUserMapper itUserMapper;
+    private final ItRolePermissionMapper itRolePermissionMapper;
     private final RedisTemplate<String, String> redisTemplate;
     private final RedisUtil redisUtil;
 
-    public ItUserServiceImpl(ItUserMapper itUserMapper, RedisTemplate<String, String> redisTemplate, RedisUtil redisUtil) {
+    public ItUserServiceImpl(ItUserMapper itUserMapper, ItRolePermissionMapper itRolePermissionMapper, RedisTemplate<String, String> redisTemplate, RedisUtil redisUtil) {
         this.itUserMapper = itUserMapper;
+        this.itRolePermissionMapper = itRolePermissionMapper;
         this.redisTemplate = redisTemplate;
         this.redisUtil = redisUtil;
     }
@@ -30,7 +35,7 @@ public class ItUserServiceImpl implements ItUserService {
     }
 
     @Override
-    public ItUserLoginInfoVo loginByUserAndPassword(String user, String password) {
+    public ItUserLoginInfoVo getTokenByUserAndPassword(String user, String password) {
         ItUserLoginInfoVo itUserLoginInfoVo = itUserMapper.selectItUserLoginInfo(user, password);
         if (itUserLoginInfoVo == null) { // 找不到用户或账号密码错误
             return null;
@@ -55,4 +60,18 @@ public class ItUserServiceImpl implements ItUserService {
 
         return itUserLoginInfoVo;
     }
+
+    @Override
+    public ItUserInfoVo getUserInfoByUserId(Long userId) {
+        // 获取用户信息
+        ItUserInfoVo itUserInfo = itUserMapper.selectUserInfo(userId);
+        if (itUserInfo == null) {
+            return null;
+        }
+        // 获取角色权限
+        List<ItRoleSysPermissionVo> itRoleSysPermissionVos = itRolePermissionMapper.getRolePermissionsByRoleId(itUserInfo.getRoleId());
+        itUserInfo.setPermissions(itRoleSysPermissionVos);
+        return itUserInfo;
+    }
+
 }

+ 5 - 0
src/main/resources/application.yml

@@ -16,6 +16,9 @@ spring:
     host: localhost
     port: 6379
     password: hello6379
+  jackson:
+    time-zone: GMT+8
+
 
 config:
   token:
@@ -26,3 +29,5 @@ config:
 logging:
   level:
     cn.iaun.it.mapper: trace
+mybatis-plus:
+  mapper-locations: classpath*:/mapper/**/*Mapper.xml

+ 16 - 2
src/main/resources/db/data.sql

@@ -1,9 +1,23 @@
 delete
 from `it_user`;
 insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
-values ('test01', '测试01', '123456', '13012345678', 1);
+values ('user01', '用户01', '123456', '13000000000', 1);
 insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
-values ('test02', '测试02', '789456', '13012345678', 2);
+values ('user02', '用户02', '123456', '13000000001', 1);
+insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
+values ('user03', '用户03', '123456', '13000000002', 1);
+insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
+values ('yw01', '运维01', '789456', '13000000003', 2);
+insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
+values ('yw02', '运维02', '789456', '13000000004', 2);
+insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
+values ('yw03', '运维03', '789456', '13000000005', 2);
+insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
+values ('yw04', '运维04', '789456', '13000000006', 2);
+insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
+values ('admin01', '管理员01', '456123', '13000000007', 3);
+insert into `it_user` (`user`, `display_name`, `password`, `phone_number`, `role_id`)
+values ('admin02', '管理员02', '456123', '13000000007', 3);
 
 
 

+ 13 - 0
src/main/resources/mapper/ItRolePermissionMapper.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iaun.it.mapper.ItRolePermissionMapper">
+    <select id="getRolePermissionsByRoleId" resultType="cn.iaun.it.model.vo.permission.ItRoleSysPermissionVo">
+        select s.sys_id as sys_id, s.name as sys_name
+        from it_role r
+        left join it_role_permission rp on r.role_id = rp.role_id
+        left join it_sys s on rp.sys_id = s.sys_id
+        where
+        r.role_id = #{roleId}
+    </select>
+
+</mapper>

+ 22 - 0
src/main/resources/mapper/ItUserMapper.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="cn.iaun.it.mapper.ItUserMapper">
+
+    <select id="selectItUserLoginInfo" resultType="cn.iaun.it.model.vo.user.ItUserLoginInfoVo">
+        select u.user_id as user_id
+        from it_user u
+        where u.user = #{user} and u.password = #{password} limit 1
+    </select>
+    <select id="selectUserInfo" resultType="cn.iaun.it.model.vo.user.ItUserInfoVo">
+        select u.user         as user,
+               u.display_name as display_name,
+               u.phone_number as phone_number,
+               u.role_id      as role_id,
+               r.name         as role_name
+        from it_user u
+                 left join it_role r on u.role_id = r.role_id
+        where u.user_id = #{userId}
+        limit 1
+    </select>
+
+</mapper>