diff --git a/src/main/java/cn/dcsy/stsy/controllers/BasicController.java b/src/main/java/cn/dcsy/stsy/controllers/BasicController.java index c8c7693..60086ec 100644 --- a/src/main/java/cn/dcsy/stsy/controllers/BasicController.java +++ b/src/main/java/cn/dcsy/stsy/controllers/BasicController.java @@ -24,7 +24,7 @@ public class BasicController { /** * 网站主页 */ -// @GetMapping("/**") + @GetMapping("/index") public ResponseEntity index() { log.info("访问主页"); BaseResponse response = new BaseResponse("欢迎", 200, "Success", "这是故事管理系统主页"); @@ -40,4 +40,15 @@ public class BasicController { return userService.login(username, password); } + @GetMapping("/user/{userId}") + public ResponseEntity getUserCurrent(@PathVariable String userId) { + log.info("获取用户 {}", userId); + if (!userId.matches("^[0-9]+$")) { + return ResponseEntity.status(403).body( + new BaseResponse("PathValueError", 40301, "参数错误", null) + ); + } + return userService.getUserInfo(userId); + } + } diff --git a/src/main/java/cn/dcsy/stsy/dao/UserDAO.java b/src/main/java/cn/dcsy/stsy/dao/UserDAO.java index fa30223..fa28216 100644 --- a/src/main/java/cn/dcsy/stsy/dao/UserDAO.java +++ b/src/main/java/cn/dcsy/stsy/dao/UserDAO.java @@ -21,4 +21,10 @@ public class UserDAO { log.info("\t> Mysql 读取"); return userMapper.getPasswordByUsername(userName); } + + public UserDemoDO getUserById(String userId) { + log.info("[DAO] 执行 getUserById 方法"); + log.info("\t> Mysql 读取"); + return userMapper.getUserById(Long.parseLong(userId)); + } } diff --git a/src/main/java/cn/dcsy/stsy/mappers/UserMapper.java b/src/main/java/cn/dcsy/stsy/mappers/UserMapper.java index 437d18b..4d1aa6a 100644 --- a/src/main/java/cn/dcsy/stsy/mappers/UserMapper.java +++ b/src/main/java/cn/dcsy/stsy/mappers/UserMapper.java @@ -12,4 +12,7 @@ import org.apache.ibatis.annotations.Select; public interface UserMapper { @Select("SELECT * FROM stories_system.user_demo WHERE username = #{username}") UserDemoDO getPasswordByUsername(String username); + + @Select("SELECT * FROM stories_system.user_demo WHERE id = #{userId}") + UserDemoDO getUserById(long userId); } diff --git a/src/main/java/cn/dcsy/stsy/service/UserService.java b/src/main/java/cn/dcsy/stsy/service/UserService.java index a4c17a5..c887c70 100644 --- a/src/main/java/cn/dcsy/stsy/service/UserService.java +++ b/src/main/java/cn/dcsy/stsy/service/UserService.java @@ -9,4 +9,6 @@ import org.springframework.http.ResponseEntity; */ public interface UserService { ResponseEntity login(String username, String password); + + ResponseEntity getUserInfo(String userId); } diff --git a/src/main/java/cn/dcsy/stsy/service/impl/UserServiceImpl.java b/src/main/java/cn/dcsy/stsy/service/impl/UserServiceImpl.java index 9cd9de4..c79d8ec 100644 --- a/src/main/java/cn/dcsy/stsy/service/impl/UserServiceImpl.java +++ b/src/main/java/cn/dcsy/stsy/service/impl/UserServiceImpl.java @@ -22,10 +22,10 @@ public class UserServiceImpl implements UserService { @Override public ResponseEntity login(String username, String password) { UserDemoDO userDemoDO = userDAO.getPasswordByUserName(username); - log.info(String.valueOf(userDemoDO)); if (userDemoDO != null){ + log.info(userDemoDO.toString()); if (userDemoDO.getPassword().equals(password)){ - BaseResponse response = new BaseResponse("登录成功", 200, "Success", "用户已登录"); + BaseResponse response = new BaseResponse("登录成功", 200, "Success", userDemoDO); return ResponseEntity.ok(response); } else { BaseResponse response = new BaseResponse("登录失败", 404, "Error", "密码错误"); @@ -36,4 +36,18 @@ public class UserServiceImpl implements UserService { return ResponseEntity.status(404).body(response); } } + + @Override + public ResponseEntity getUserInfo(String userId) { + UserDemoDO getUser = userDAO.getUserById(userId); + if (getUser != null) { + return ResponseEntity.ok().body( + new BaseResponse("Success", 200, "获取成功", getUser) + ); + } else { + return ResponseEntity.status(404).body( + new BaseResponse("UserNotExist", 40401, "用户不存在", null) + ); + } + } }