一些小错

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

@@ -17,6 +17,7 @@ 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 top.suyiiyii.sims.service.UserService;
 
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -28,7 +29,7 @@ RecordController {
     @Autowired
     RecordService recordService;
     @Autowired
-    UserMapper userMapper;
+    UserService UserService;
     @Autowired
     RoleService roleService;
     @Autowired
@@ -36,18 +37,21 @@ RecordController {
 
     @Operation(summary = "获取所有奖惩记录")
     @GetMapping("/admin/record")
-    public Result<List<RecordDto>> adminRecord(Integer page, Integer size) {
+    public Result<List<RecordDto>> adminRecord(
+            @RequestParam(defaultValue = "0") int page,
+            @RequestParam(defaultValue = "10") int size) {
         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);
+            User user = UserService.selectByUserId(studentId);
             recordDto.setName(user.getUsername());
             recordDto.setGrade(user.getGrade());
             recordDto.setGroup(user.getUserGroup());
-            List<Role> roles = roleService.selectRolesById(studentId);
+            List<Role> roles = UserService.selectRolesById(studentId);
             ArrayList<String> roleName = new ArrayList<>();
             for (Role role : roles) {
                 roleName.add(role.getRoleName());

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

@@ -17,6 +17,6 @@ public class UserDto {
     private Integer userId;
     private String username;
     private String grade;
-    private String group;
+    private String userGroup;
     private List<String> roles; // 角色名称列表
 }

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

@@ -13,10 +13,10 @@ import org.apache.ibatis.annotations.Select;
  */
 @Mapper
 public interface CategoryMapper {
-    @Select("SELECT * FROM category WHERE categoryId=#{id}")
+    @Select("SELECT * FROM reward_punishment_category WHERE category_id=#{id}")
     String getCategoryName(Integer categoryId);
 
-    @Select("SELECT categoryName FROM category WHERE categoryId=#{categoryId}")
+    @Select("SELECT category_name FROM reward_punishment_category WHERE category_id=#{categoryId}")
 
         String getSubCategoryName(Integer categoryId);
 }

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

@@ -22,7 +22,7 @@ public interface UserMapper extends BaseMapper<User> {
      * @param user 新用户对象
      * @return 影响的行数
      */
-    @Insert("insert INTO user (id,user_id, username, password, name, email, `group`) VALUES (#{id},#{userId}, #{username}, #{password}, #{name}, #{email}, #{group})")
+    @Insert("insert INTO user (id,student_id, username, password, name, email, userGroup) VALUES (#{id},#{studentId}, #{username}, #{password}, #{name}, #{email}, #{userGroup})")
     int addUser(User user);
 
     /**
@@ -39,11 +39,11 @@ public interface UserMapper extends BaseMapper<User> {
      * @return 影响的行数
      */
     @Update("UPDATE user SET " +
-            "user_id = #{userId}, " +
+            "student_id = #{userId}, " +
             "username = #{username}, " +
             "name = #{name}, " +
             "email = #{email}, " +
-            "`group` = #{group} " +
+            "userGroup = #{group} " +
             "WHERE id = #{id}")
     int updateUser(User user);
 
@@ -52,21 +52,21 @@ public interface UserMapper extends BaseMapper<User> {
      * @param
      * @return 用户对象
      */
-    @Select("SELECT id, user_id, username, password, name, email, `group` from user WHERE id = #{Id}")
+    @Select("SELECT id, student_id, username, password, name, email,user_group from user WHERE id = #{id}")
-    User selectByUserId(Integer userId);
+    User selectByUserId(Integer id);
 
     /**
      * 根据iD查询用户信息
      * @param
      * @return 用户对象
      */
-    @Select("SELECT id, user_id, username, password, name, email, `group` from user WHERE id = #{Id}")
+    @Select("SELECT id, student_id, username, password, name, email,grade, user_group from user WHERE id = #{id}")
-    User selectById(Integer Id);
+    User selectById(Integer id);
     /**
      * 查询所有用户信息
      * @return 用户列表
      */
-    @Select("SELECT id, user_id, username, password, name, email,grade, `group` FROM user")
+    @Select("SELECT id, student_id, username, password, name, email, grade, user_group FROM user")
     List<User> selectAll();
 
   @Select("select * from user where username = #{username}")

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

@@ -123,7 +123,7 @@ public class UserService {
             UserDto.setUserId(user.getId());
             UserDto.setUsername(user.getUsername());
             UserDto.setGrade(user.getGrade());
-            UserDto.setGroup(user.getUserGroup());
+            UserDto.setUserGroup(user.getUserGroup());
             UserDto.setRoles(new ArrayList<>());
             Integer id = user.getId();
             List<Role> roles = roleMapper.selectRolesById(id);
@@ -145,7 +145,7 @@ public class UserService {
         UserDto.setUserId(user.getId());
         UserDto.setUsername(user.getUsername());
         UserDto.setGrade(user.getGrade());
-        UserDto.setGroup(user.getUserGroup());
+        UserDto.setUserGroup(user.getUserGroup());
         UserDto.setRoles(new ArrayList<>());
         List<Role> roles = roleMapper.selectRolesById(id);
         for (Role role : roles) {
@@ -159,4 +159,12 @@ public class UserService {
 
         return UserDto;
     }
+
+    public User selectByUserId(Integer studentId) {
+        return userMapper.selectByUserId(studentId);
+    }
+
+    public List<Role> selectRolesById(Integer studentId) {
+        return roleMapper.selectRolesById(studentId);
+    }
 }