获取所有奖惩记录,改了userMapper里面一个错的命名

src/main/java/top/suyiiyii/sims/controller/RecordController.java

@@ -1,22 +1,78 @@
 package top.suyiiyii.sims.controller;
 
 import io.swagger.v3.oas.annotations.Operation;
+
+import org.springframework.beans.factory.annotation.Autowired;
+
 import org.springframework.web.bind.annotation.*;
 import top.suyiiyii.sims.common.Result;
 import top.suyiiyii.sims.dto.CommonResponse;
 import top.suyiiyii.sims.dto.RecordDto;
+import top.suyiiyii.sims.entity.Record;
+import top.suyiiyii.sims.entity.Role;
+import top.suyiiyii.sims.entity.User;
+import top.suyiiyii.sims.entity.UserRole;
+import top.suyiiyii.sims.mapper.CategoryMapper;
+import top.suyiiyii.sims.mapper.UserMapper;
+import top.suyiiyii.sims.service.CategoryService;
+import top.suyiiyii.sims.service.RecordService;
+import top.suyiiyii.sims.service.RoleService;
 
+import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
 @RestController
-public class RecordController {
+public class
-
+RecordController {
+    @Autowired
+    RecordService recordService;
+    @Autowired
+    UserMapper userMapper;
+    @Autowired
+    RoleService roleService;
+    @Autowired
+    CategoryService categoryService;
 
     @Operation(summary = "获取所有奖惩记录")
     @GetMapping("/admin/record")
     public Result<List<RecordDto>> adminRecord(Integer page, Integer size) {
-        return Result.success(new ArrayList<>());
+        List<RecordDto> recordDtos=new ArrayList<>();
+        List<Record> records = recordService.getAllRecords(page, size);
+        for (Record record : records) {
+            RecordDto recordDto = new RecordDto();
+            Integer studentId=record.getStudentId();
+            recordDto.setStudentId(studentId);
+            User user = userMapper.selectByUserId(studentId);
+            recordDto.setName(user.getUsername());
+            recordDto.setGrade(user.getGrade());
+            recordDto.setGroup(user.getUserGroup());
+            List<Role> roles = roleService.selectRolesById(studentId);
+            ArrayList<String> roleName = new ArrayList<>();
+            for (Role role : roles) {
+                roleName.add(role.getRoleName());
+            }
+            recordDto.setRoles(roleName);
+            categoryService.getCategoryName(record.getCategoryId());
+            categoryService.getsubCategoryName(record.getCategoryId());
+            recordDto.setDate(record.getDate());
+            recordDto.setContent(record.getContent());
+            recordDto.setReason(record.getReason());
+            recordDto.setContent(record.getContent());
+            recordDto.setAmount(record.getAmount());
+            recordDto.setRemark(record.getRemark());
+            recordDto.setIsRevoked(record.getIsRevoked());
+            // 撤销日期
+            recordDto.setRevokeDate(record.getRevokeDate());
+            recordDto.setRevokeReason(record.getRevokeReason());
+            recordDto.setRevokeRemark(record.getRevokeRemark());
+            recordDto.setOperatorUserId(record.getOperatorUserId());
+            recordDto.setLastUpdateTime(record.getLastUpdateTime());
+            recordDtos.add(recordDto);
+        }
+
+
+        return Result.success(recordDtos);
     }
 
     @Operation(summary = "获取自己的奖惩记录")

src/main/java/top/suyiiyii/sims/dto/RecordDto.java

@@ -5,18 +5,27 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
 @NoArgsConstructor
 public class RecordDto {
-    private Integer id;
+
     // 用户ID
-    private Integer userId;
+    private Integer studentId;
-    // 奖惩类型
+
-    private String type;
+    private String name;
-    // 奖惩类别ID
+
-    private Integer categoryId;
+    private String grade;
+
+    private String group;
+
+    private List<String> roles;
+
+    private String categoryName;
+
+    private String subCategoryName;
     // 奖惩日期
     private LocalDateTime date;
     // 奖惩内容

src/main/java/top/suyiiyii/sims/entity/Record.java

@@ -12,7 +12,7 @@ import java.time.LocalDateTime;
  * @Author tortoise
  * @Date 2024/8/9 14:04
  * @PackageName:top.suyiiyii.sims.entity
- * @ClassName: Record
+ * @ClassName: RecordMapper
  * @Description: TODO
  * @Version 1.0
  */
@@ -24,9 +24,8 @@ public class Record {
     @TableId("id")
     private Integer id;
     // 用户ID
-    private Integer userId;
+    private Integer StudentId;
-    // 奖惩类型
+
-    private String type;
     // 奖惩类别ID
     private Integer categoryId;
     // 奖惩日期

src/main/java/top/suyiiyii/sims/mapper/CategoryMapper.java

@@ -0,0 +1,22 @@
+package top.suyiiyii.sims.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Select;
+
+/**
+ * @Author tortoise
+ * @Date 2024/8/16 23:31
+ * @PackageName:top.suyiiyii.sims.mapper
+ * @ClassName: CategoryMapper
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Mapper
+public interface CategoryMapper {
+    @Select("SELECT * FROM category WHERE categoryId=#{id}")
+    String getCategoryName(Integer categoryId);
+
+    @Select("SELECT categoryName FROM category WHERE categoryId=#{categoryId}")
+
+        String getSubCategoryName(Integer categoryId);
+}

src/main/java/top/suyiiyii/sims/mapper/RecordMapper.java

@@ -0,0 +1,24 @@
+package top.suyiiyii.sims.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
+import top.suyiiyii.sims.dto.RecordDto;
+import top.suyiiyii.sims.entity.Record;
+
+import java.util.List;
+
+/**
+ * @Author tortoise
+ * @Date 2024/8/16 21:39
+ * @PackageName:top.suyiiyii.sims.mapper
+ * @ClassName: RecordMapper
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Mapper
+public interface RecordMapper {
+    //分页查询
+@Select("select * from record limit #{page},#{size}")
+    List<Record> getAllRecords(Integer page, Integer size);
+}

src/main/java/top/suyiiyii/sims/mapper/RoleMapper.java

@@ -51,7 +51,7 @@ public interface RoleMapper {
             "FROM role " +
             "WHERE role_id IN " +
             "(SELECT role_id FROM user_role WHERE user_id = #{user_id})")
-    List<UserRole> selectRolesById(@Param("user_id") int id);
+    List<Role> selectRolesById(@Param("user_id") int id);
 
 @Select("SELECT role_name FROM role WHERE role_id=#{roleId}")
     List<String> selectRoleNamesByRoleId(Integer roleId);

src/main/java/top/suyiiyii/sims/mapper/UserMapper.java

@@ -49,7 +49,7 @@ public interface UserMapper extends BaseMapper<User> {
 
     /**
      * 根据ID查询用户信息
-     * @param id 用户ID
+     * @param
      * @return 用户对象
      */
     @Select("SELECT id, user_id, username, password, name, email, `group` from user WHERE id = #{Id}")

src/main/java/top/suyiiyii/sims/service/CategoryService.java

@@ -0,0 +1,28 @@
+package top.suyiiyii.sims.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import top.suyiiyii.sims.mapper.CategoryMapper;
+
+/**
+ * @Author tortoise
+ * @Date 2024/8/16 23:32
+ * @PackageName:top.suyiiyii.sims.service
+ * @ClassName: CategoryService
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Service
+public class CategoryService {
+    @Autowired
+    CategoryMapper categoryMapper;
+
+
+    public String getCategoryName(Integer id) {
+            return categoryMapper.getCategoryName(id);
+    }
+
+    public String getsubCategoryName(Integer categoryId) {
+        return categoryMapper.getSubCategoryName(categoryId);
+    }
+}

src/main/java/top/suyiiyii/sims/service/RecordService.java

@@ -0,0 +1,30 @@
+package top.suyiiyii.sims.service;
+
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import top.suyiiyii.sims.dto.RecordDto;
+import top.suyiiyii.sims.entity.Record;
+import top.suyiiyii.sims.mapper.RecordMapper;
+
+import java.util.List;
+
+/**
+ * @Author tortoise
+ * @Date 2024/8/16 21:47
+ * @PackageName:top.suyiiyii.sims.service
+ * @ClassName: RecordService
+ * @Description: TODO
+ * @Version 1.0
+ */
+@Service
+public class RecordService {
+    @Autowired
+    RecordMapper recordMapper;
+
+
+    public List<Record> getAllRecords(Integer page, Integer size) {
+
+        return recordMapper.getAllRecords(page, size);
+    }
+}

src/main/java/top/suyiiyii/sims/service/RoleService.java

@@ -41,7 +41,7 @@ public class RoleService {
      * @param Id
      * @return: java.util.List<top.suyiiyii.sims.entity.Role>
      */
-    List<UserRole> selectRolesById(int id){
+    public List<Role> selectRolesById(int id){
         return roleMapper.selectRolesById(id);
     }
 

src/main/java/top/suyiiyii/sims/service/UserService.java

@@ -62,10 +62,10 @@ public class UserService {
         }
         HashSet<Permissions> permissionsSet = new HashSet<>();
         Integer id = dbUser.getId();
-        List<UserRole> UserRoles = roleMapper.selectRolesById(id);
+        List<Role> roles = roleMapper.selectRolesById(id);
-        for (UserRole userRole : UserRoles) {
+        for (Role role : roles) {
             //根据roleid找所有permissionId
-            List<RolePermission> rolePerminsion = permissionsMapper.getRolePerminsionByRoleId(userRole.getRoleId());
+            List<RolePermission> rolePerminsion = permissionsMapper.getRolePerminsionByRoleId(role.getRoleId());
             for (RolePermission rolePermission : rolePerminsion) {
                 Integer permissionId = rolePermission.getPermissionId();
                 //根据permissionId找permission
@@ -126,9 +126,9 @@ public class UserService {
             UserDto.setGroup(user.getUserGroup());
             UserDto.setRoles(new ArrayList<>());
             Integer id = user.getId();
-            List<UserRole> userRoles = roleMapper.selectRolesById(id);
+            List<Role> roles = roleMapper.selectRolesById(id);
-            for (UserRole userRole : userRoles) {
+            for (Role role : roles) {
-                Integer roleId = userRole.getRoleId();
+                Integer roleId = role.getRoleId();
                 // 获取一个角色的名称列表
                 List<String> roleNameList = roleMapper.selectRoleNamesByRoleId(roleId);
                 // 累加角色名称到用户的角色列表中
@@ -147,9 +147,9 @@ public class UserService {
         UserDto.setGrade(user.getGrade());
         UserDto.setGroup(user.getUserGroup());
         UserDto.setRoles(new ArrayList<>());
-        List<UserRole> userRoles = roleMapper.selectRolesById(id);
+        List<Role> roles = roleMapper.selectRolesById(id);
-        for (UserRole userRole : userRoles) {
+        for (Role role : roles) {
-            Integer roleId = userRole.getRoleId();
+            Integer roleId = role.getRoleId();
             // 获取一个角色的名称列表
             List<String> roleNameList = roleMapper.selectRoleNamesByRoleId(roleId);
             // 累加角色名称到用户的角色列表中