ssyg/SIMS
2
0
Fork 0
mirror of https://github.com/suyiiyii/SIMS.git synced 2025-06-03 12:56:10 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

调整获取userId的方式

Browse Source
This commit is contained in:
suyiiyii 2024-09-07 17:49:56 +08:00
parent 394156a639
commit dd4ba94d61
3 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/top/suyiiyii/sims/controller/RecordController.java
View File

@ -8,6 +8,7 @@ import org.modelmapper.ModelMapper;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import top.suyiiyii.sims.common.AuthAccess; import top.suyiiyii.sims.common.AuthAccess;
import top.suyiiyii.sims.common.JwtInterceptor;
import top.suyiiyii.sims.common.Result; import top.suyiiyii.sims.common.Result;
import top.suyiiyii.sims.dto.CommonResponse; import top.suyiiyii.sims.dto.CommonResponse;
import top.suyiiyii.sims.dto.RecordDto; import top.suyiiyii.sims.dto.RecordDto;
@ -60,11 +61,9 @@ RecordController {
public Result<List<RecordDto>> record(@RequestParam(defaultValue = "0") int page, public Result<List<RecordDto>> record(@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "10") int size,
HttpServletRequest request) { HttpServletRequest request) {
HttpSession session = request.getSession(); int userId = JwtInterceptor.getUserIdFromReq(request);
String token = (String) session.getAttribute("token");
String userId = JwtUtils.extractUserId(token);
List<RecordDto> recordDtos = new ArrayList<>(); List<RecordDto> recordDtos = new ArrayList<>();
List<Record> records = recordService.getMyAllRecords(page, size, userId); List<Record> records = recordService.getMyAllRecords(page, size,String.valueOf(userId));
for (Record record : records) { for (Record record : records) {
RecordDto recordDto = modelMapper.map(record, RecordDto.class); RecordDto recordDto = modelMapper.map(record, RecordDto.class);
recordDto.setCategoryName(categoryService.getCategoryName(record.getCategoryId())); recordDto.setCategoryName(categoryService.getCategoryName(record.getCategoryId()));
@ -198,12 +197,9 @@ RecordController {
@RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size, @RequestParam(defaultValue = "10") int size,
String categoryName,HttpServletRequest request) { String categoryName,HttpServletRequest request) {
HttpSession session = request.getSession();
String token = (String) session.getAttribute("token"); int userId = JwtInterceptor.getUserIdFromReq(request);
String userId = JwtUtils.extractUserId(token);
if (userId==null){
throw new RuntimeException("请先登录");
}
List<Integer> studentIds = new ArrayList<>(); List<Integer> studentIds = new ArrayList<>();
//CategoryName不是奖励或者惩罚 //CategoryName不是奖励或者惩罚
if (!categoryName.equals("奖励") if (!categoryName.equals("奖励")

1
src/main/java/top/suyiiyii/sims/dto/UserDto.java
View File

@ -15,6 +15,7 @@ import java.util.List;
@Data @Data
public class UserDto { public class UserDto {
private Integer userId; private Integer userId;
private Integer studentId;
private String username; private String username;
private String grade; private String grade;
private String userGroup; private String userGroup;

24
src/main/java/top/suyiiyii/sims/service/UserService.java
View File

@ -78,6 +78,13 @@ public class UserService {
user = mpUserMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getUsername, req.getUsername())); user = mpUserMapper.selectOne(new LambdaQueryWrapper<User>().eq(User::getUsername, req.getUsername()));
rbacService.addRoleWithUserId(user.getId(), "user"); rbacService.addRoleWithUserId(user.getId(), "user");
} }
public User selectByUsername(String username) {
return userMapper.selectByUserName(username);
}
public void updatePassword(User user) {
userMapper.updatePassword(user);
}
public List<UserDto> findAllUsers() { public List<UserDto> findAllUsers() {
@ -99,18 +106,19 @@ public class UserService {
public UserDto findUser(Integer id) { public UserDto findUser(Integer id) {
UserDto UserDto = new UserDto(); UserDto userDto = new UserDto();
User user = userMapper.selectById(id); User user = userMapper.selectById(id);
if (user == null) { if (user == null) {
throw new ServiceException("用户不存在"); throw new ServiceException("用户不存在");
} }
UserDto.setUserId(user.getId()); userDto.setUserId(user.getId());
UserDto.setUsername(user.getUsername()); userDto.setUsername(user.getUsername());
UserDto.setGrade(user.getGrade()); userDto.setGrade(user.getGrade());
UserDto.setUserGroup(user.getUserGroup()); userDto.setUserGroup(user.getUserGroup());
UserDto.setRoles(new ArrayList<>()); userDto.setStudentId(user.getStudentId());
userDto.setRoles(new ArrayList<>());
//TODO: 获取用户角色 //TODO: 获取用户角色
return UserDto; return userDto;
} }
public User selectByUserId(Integer studentId) { public User selectByUserId(Integer studentId) {
@ -119,5 +127,7 @@ public class UserService {
public List<Role> selectRolesById(Integer studentId) { public List<Role> selectRolesById(Integer studentId) {
return roleMapper.selectRolesById(studentId); return roleMapper.selectRolesById(studentId);
} public Integer getStudentIdByUserId(Integer userId) {
return userMapper.getStudentIdByUserId(userId);
} }
} }