角色管理

src/main/java/com/water/watersys/components/Result.java

@@ -5,7 +5,7 @@ import lombok.Getter;
 @Getter
 public class Result<T> {
 
-    private Integer code;       // 状态码
+    private Integer status;       // 状态码
 
     private String msg;     // 返回消息
 
@@ -14,8 +14,8 @@ public class Result<T> {
     public Result() {
     }
     
-    public Result(Integer code, String msg, T data) {
-        this.code = code;
+    public Result(Integer status, String msg, T data) {
+        this.status = status;
         this.msg = msg;
         this.data = data;
     }

src/main/java/com/water/watersys/controller/UserController.java

@@ -2,9 +2,11 @@ package com.water.watersys.controller;
 
 import cn.dev33.satoken.stp.StpUtil;
 import com.water.watersys.components.Result;
+import com.water.watersys.model.domain.RoleSys;
 import com.water.watersys.model.dto.ChangePassword;
 import com.water.watersys.model.dto.ChangeUserInfo;
 import com.water.watersys.model.vo.UserOv;
+import com.water.watersys.service.RoleSysService;
 import com.water.watersys.service.UserSysService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -13,6 +15,8 @@ import org.springframework.web.bind.annotation.*;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.util.List;
+
 
 @RestController
 @CrossOrigin
@@ -21,6 +25,9 @@ public class UserController {
     @Resource
     private UserSysService userSysService;
 
+    @Resource
+    private RoleSysService roleSysService;
+
     static Logger logger= LoggerFactory.getLogger(UserController.class);
 
 
@@ -29,8 +36,11 @@ public class UserController {
     public Result<UserOv> user() {
         Object loginId = StpUtil.getLoginId();
         UserOv userOv = userSysService.getUser((String) loginId);
+        List<RoleSys> role =  roleSysService.getRole(loginId);
+        userOv.setRole(role);
         logger.info("用户信息获取={}", userOv);
-        if (userOv != null) {
+
+        if (userOv.getStatus() != null) {
             return Result.success(userOv);
         }else {
             return Result.notFoundFail();
@@ -73,7 +83,4 @@ public class UserController {
             return Result.createFail();
         }
     }
-
-
-
 }

src/main/java/com/water/watersys/mapper/RoleSysMapper.java

@@ -0,0 +1,25 @@
+package com.water.watersys.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.water.watersys.model.domain.RoleSys;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+
+/**
+* @author mac
+* @description 针对表【role_sys】的数据库操作Mapper
+* @createDate 2025-04-13 10:57:50
+* @Entity generator.domain.RoleSys
+*/
+@Mapper
+public interface RoleSysMapper extends BaseMapper<RoleSys> {
+
+    @Select("select b.id, b.role_name from user_role_sys a left join role_sys b on a.role_id = b.id where a.user_id = #{loginId}")
+    List<RoleSys> getRoleList(Object loginId);
+}
+
+
+
+

src/main/java/com/water/watersys/model/domain/RoleSys.java

@@ -0,0 +1,69 @@
+package com.water.watersys.model.domain;
+
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * 
+ * @TableName role_sys
+ */
+@Data
+public class RoleSys {
+    /**
+     * 
+     */
+    private Integer id;
+
+    /**
+     * 角色名
+     */
+    private String roleName;
+
+    /**
+     * 创建时间
+     */
+    private Date createdTime;
+
+    /**
+     * 修改时间
+     */
+    private Date updatedTime;
+
+    @Override
+    public boolean equals(Object that) {
+        if (this == that) {
+            return true;
+        }
+        if (that == null) {
+            return false;
+        }
+        if (getClass() != that.getClass()) {
+            return false;
+        }
+        RoleSys other = (RoleSys) that;
+        return (this.getId() == null ? other.getId() == null : this.getId().equals(other.getId()))
+            && (this.getRoleName() == null ? other.getRoleName() == null : this.getRoleName().equals(other.getRoleName()));
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
+        result = prime * result + ((getRoleName() == null) ? 0 : getRoleName().hashCode());
+        return result;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", roleName=").append(roleName);
+        sb.append("]");
+        return sb.toString();
+    }
+}

src/main/java/com/water/watersys/model/domain/UserSys.java

@@ -15,7 +15,7 @@ public class UserSys {
     /**
      * 
      */
-    @TableId(value="id",type = IdType.AUTO )
+    @TableId(value="id",type = IdType.AUTO)
     private Integer id;
 
     /**

src/main/java/com/water/watersys/model/vo/UserOv.java

@@ -1,8 +1,10 @@
 package com.water.watersys.model.vo;
 
+import com.water.watersys.model.domain.RoleSys;
 import lombok.Data;
 
 import java.util.Date;
+import java.util.List;
 
 @Data
 public class UserOv {
@@ -13,4 +15,5 @@ public class UserOv {
     private Integer status;
     private Date createdTime;
     private Date updatedTime;
+    private List<RoleSys> role;
 }

src/main/java/com/water/watersys/service/RoleSysService.java

@@ -0,0 +1,17 @@
+package com.water.watersys.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.water.watersys.model.domain.RoleSys;
+
+import java.util.List;
+
+/**
+* @author mac
+* @description 针对表【role_sys】的数据库操作Service
+* @createDate 2025-04-13 10:57:50
+*/
+
+public interface RoleSysService extends IService<RoleSys> {
+
+    List<RoleSys> getRole(Object loginId);
+}

src/main/java/com/water/watersys/service/impl/RoleSysServiceImpl.java

@@ -0,0 +1,32 @@
+package com.water.watersys.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.water.watersys.mapper.RoleSysMapper;
+import com.water.watersys.model.domain.RoleSys;
+import com.water.watersys.service.RoleSysService;
+import jakarta.annotation.Resource;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+* @author mac
+* @description 针对表【role_sys】的数据库操作Service实现
+* @createDate 2025-04-13 10:57:50
+*/
+@Service
+public class RoleSysServiceImpl extends ServiceImpl<RoleSysMapper, RoleSys>
+    implements RoleSysService {
+    @Resource
+    private RoleSysMapper roleSysMapper;
+
+    @Override
+    public List<RoleSys> getRole(Object loginId) {
+        return roleSysMapper.getRoleList(loginId);
+    }
+}
+
+
+
+

src/main/resources/application.yml

@@ -27,6 +27,8 @@ sa-token:
   # ????????
   is-log: true
 
+  is-read-header: true
+
 
 springdoc:
   api-docs:

src/main/resources/mapper/RoleSysMapper.xml

@@ -0,0 +1,15 @@
+<?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="com.water.watersys.mapper.RoleSysMapper">
+
+    <resultMap id="BaseResultMap" type="com.water.watersys.model.domain.RoleSys">
+            <id property="id" column="id" />
+            <result property="roleName" column="role_name" />
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        id,role_name
+    </sql>
+</mapper>