diff --git a/src/main/java/top/suyiiyii/sims/controller/RecordController.java b/src/main/java/top/suyiiyii/sims/controller/RecordController.java index c6450a7..7a24a47 100644 --- a/src/main/java/top/suyiiyii/sims/controller/RecordController.java +++ b/src/main/java/top/suyiiyii/sims/controller/RecordController.java @@ -8,6 +8,7 @@ import org.modelmapper.ModelMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import top.suyiiyii.sims.common.AuthAccess; +import top.suyiiyii.sims.common.JwtInterceptor; import top.suyiiyii.sims.common.Result; import top.suyiiyii.sims.dto.CommonResponse; import top.suyiiyii.sims.dto.RecordDto; @@ -60,11 +61,9 @@ RecordController { public Result> record(@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, HttpServletRequest request) { - HttpSession session = request.getSession(); - String token = (String) session.getAttribute("token"); - String userId = JwtUtils.extractUserId(token); + int userId = JwtInterceptor.getUserIdFromReq(request); List recordDtos = new ArrayList<>(); - List records = recordService.getMyAllRecords(page, size, userId); + List records = recordService.getMyAllRecords(page, size,String.valueOf(userId)); for (Record record : records) { RecordDto recordDto = modelMapper.map(record, RecordDto.class); recordDto.setCategoryName(categoryService.getCategoryName(record.getCategoryId())); @@ -198,12 +197,9 @@ RecordController { @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size, String categoryName,HttpServletRequest request) { - HttpSession session = request.getSession(); - String token = (String) session.getAttribute("token"); - String userId = JwtUtils.extractUserId(token); - if (userId==null){ - throw new RuntimeException("请先登录"); - } + + int userId = JwtInterceptor.getUserIdFromReq(request); + List studentIds = new ArrayList<>(); //CategoryName不是奖励或者惩罚 if (!categoryName.equals("奖励") diff --git a/src/main/java/top/suyiiyii/sims/dto/UserDto.java b/src/main/java/top/suyiiyii/sims/dto/UserDto.java index 403a4c8..9123552 100644 --- a/src/main/java/top/suyiiyii/sims/dto/UserDto.java +++ b/src/main/java/top/suyiiyii/sims/dto/UserDto.java @@ -15,6 +15,7 @@ import java.util.List; @Data public class UserDto { private Integer userId; + private Integer studentId; private String username; private String grade; private String userGroup; diff --git a/src/main/java/top/suyiiyii/sims/service/UserService.java b/src/main/java/top/suyiiyii/sims/service/UserService.java index c47172b..b4c4941 100644 --- a/src/main/java/top/suyiiyii/sims/service/UserService.java +++ b/src/main/java/top/suyiiyii/sims/service/UserService.java @@ -78,6 +78,13 @@ public class UserService { user = mpUserMapper.selectOne(new LambdaQueryWrapper().eq(User::getUsername, req.getUsername())); rbacService.addRoleWithUserId(user.getId(), "user"); } + public User selectByUsername(String username) { + return userMapper.selectByUserName(username); + } + + public void updatePassword(User user) { + userMapper.updatePassword(user); + } public List findAllUsers() { @@ -99,18 +106,19 @@ public class UserService { public UserDto findUser(Integer id) { - UserDto UserDto = new UserDto(); + UserDto userDto = new UserDto(); User user = userMapper.selectById(id); if (user == null) { throw new ServiceException("用户不存在"); } - UserDto.setUserId(user.getId()); - UserDto.setUsername(user.getUsername()); - UserDto.setGrade(user.getGrade()); - UserDto.setUserGroup(user.getUserGroup()); - UserDto.setRoles(new ArrayList<>()); + userDto.setUserId(user.getId()); + userDto.setUsername(user.getUsername()); + userDto.setGrade(user.getGrade()); + userDto.setUserGroup(user.getUserGroup()); + userDto.setStudentId(user.getStudentId()); + userDto.setRoles(new ArrayList<>()); //TODO: 获取用户角色 - return UserDto; + return userDto; } public User selectByUserId(Integer studentId) { @@ -119,5 +127,7 @@ public class UserService { public List selectRolesById(Integer studentId) { return roleMapper.selectRolesById(studentId); + } public Integer getStudentIdByUserId(Integer userId) { + return userMapper.getStudentIdByUserId(userId); } }