diff --git a/src/main/java/com/shanzhu/oe/controller/JudgeQuestionController.java b/src/main/java/com/shanzhu/oe/controller/JudgeQuestionController.java index 4afce3f..133deaf 100644 --- a/src/main/java/com/shanzhu/oe/controller/JudgeQuestionController.java +++ b/src/main/java/com/shanzhu/oe/controller/JudgeQuestionController.java @@ -32,9 +32,9 @@ public class JudgeQuestionController { public R add(@RequestBody JudgeQuestion judgeQuestion) { int res = judgeQuestionService.add(judgeQuestion); if (res != 0) { - return buildApiResult(200,"添加成功",res); + return ApiResultHandler.buildApiResult(200,"添加成功",res); } - return buildApiResult(400,"添加失败",res); + return ApiResultHandler.buildApiResult(400,"添加失败",res); } /** @@ -45,7 +45,7 @@ public class JudgeQuestionController { @GetMapping("/judgeQuestionId") public R findOnlyQuestionId() { JudgeQuestion res = judgeQuestionService.findOnlyQuestionId(); - return buildApiResult(200,"查询成功",res); + return ApiResultHandler.buildApiResult(200,"查询成功",res); } /** @@ -58,8 +58,8 @@ public class JudgeQuestionController { public R edit(@RequestBody JudgeQuestion judgeQuestion) { int res = judgeQuestionService.edit(judgeQuestion); if (res != 0) { - return buildApiResult(200,"修改成功",res); + return ApiResultHandler.buildApiResult(200,"修改成功",res); } - return buildApiResult(400,"修改失败",res); + return ApiResultHandler.buildApiResult(400,"修改失败",res); } } diff --git a/src/main/java/com/shanzhu/oe/controller/LoginController.java b/src/main/java/com/shanzhu/oe/controller/LoginController.java index 277e567..13a1554 100644 --- a/src/main/java/com/shanzhu/oe/controller/LoginController.java +++ b/src/main/java/com/shanzhu/oe/controller/LoginController.java @@ -36,8 +36,8 @@ public class LoginController { */ @PostMapping("/login") public R login(@RequestBody Login login, HttpServletResponse response) { - Integer username = login(); - String password = login(); + Integer username = login.getUsername(); + String password = login.getPassword(); //登录管理员 Admin adminRes = loginService.adminLogin(username, password); @@ -51,7 +51,7 @@ public class LoginController { response.addCookie(token); response.addCookie(role); - return buildApiResult(200, "请求成功", adminRes); + return ApiResultHandler.buildApiResult(200, "请求成功", adminRes); } //登录教师 @@ -63,7 +63,7 @@ public class LoginController { role.setPath("/"); response.addCookie(token); response.addCookie(role); - return buildApiResult(200, "请求成功", teacherRes); + return ApiResultHandler.buildApiResult(200, "请求成功", teacherRes); } //登录选 @@ -75,10 +75,10 @@ public class LoginController { role.setPath("/"); response.addCookie(token); response.addCookie(role); - return buildApiResult(200, "请求成功", studentRes); + return ApiResultHandler.buildApiResult(200, "请求成功", studentRes); } - return buildApiResult(400, "请求失败", null); + return ApiResultHandler.buildApiResult(400, "请求失败", null); } /** diff --git a/src/main/java/com/shanzhu/oe/controller/ScoreController.java b/src/main/java/com/shanzhu/oe/controller/ScoreController.java index 47dc29a..328873b 100644 --- a/src/main/java/com/shanzhu/oe/controller/ScoreController.java +++ b/src/main/java/com/shanzhu/oe/controller/ScoreController.java @@ -14,6 +14,7 @@ import java.util.List; /** * 考试成绩 控制层 * + */ @RestController @RequiredArgsConstructor @@ -29,7 +30,7 @@ public class ScoreController { @GetMapping("/scores") public R> findAll() { List res = scoreService.findAll(); - return buildApiResult(200, "查询所有学生成绩", res); + return ApiResultHandler.buildApiResult(200, "查询所有学生成绩", res); } /** @@ -47,7 +48,7 @@ public class ScoreController { @PathVariable("studentId") Integer studentId ) { IPage res = scoreService.findById(new Page<>(page, size), studentId); - return buildApiResult(200, "根据ID查询成绩", res); + return ApiResultHandler.buildApiResult(200, "根据ID查询成绩", res); } /** diff --git a/src/main/java/com/shanzhu/oe/controller/StudentController.java b/src/main/java/com/shanzhu/oe/controller/StudentController.java index dae6253..e2a39f4 100644 --- a/src/main/java/com/shanzhu/oe/controller/StudentController.java +++ b/src/main/java/com/shanzhu/oe/controller/StudentController.java @@ -49,7 +49,7 @@ public class StudentController { IPage res = studentService.findAll( new Page<>(page, size), name, grade, tel, institute, major, clazz ); - return buildApiResult(200, "分页查询所有学生", res); + return ApiResultHandler.buildApiResult(200, "分页查询所有学生", res); } /** @@ -62,9 +62,9 @@ public class StudentController { public R findById(@PathVariable("studentId") Integer studentId) { Student res = studentService.findById(studentId); if (res != null) { - return buildApiResult(200, "请求成功", res); + return ApiResultHandler.buildApiResult(200, "请求成功", res); } else { - return buildApiResult(404, "查询的用户不存在", null); + return ApiResultHandler.buildApiResult(404, "查询的用户不存在", null); } } @@ -76,7 +76,7 @@ public class StudentController { */ @DeleteMapping("/student/{studentId}") public R deleteById(@PathVariable("studentId") Integer studentId) { - return buildApiResult(200, "删除成功", studentService.deleteById(studentId)); + return ApiResultHandler.buildApiResult(200, "删除成功", studentService.deleteById(studentId)); } /** @@ -89,9 +89,9 @@ public class StudentController { public R update(@RequestBody Student student) { int res = studentService.update(student); if (res != 0) { - return buildApiResult(200, "更新成功", res); + return ApiResultHandler.buildApiResult(200, "更新成功", res); } - return buildApiResult(400, "更新失败", res); + return ApiResultHandler.buildApiResult(400, "更新失败", res); } /**