Commit 35f70d8c authored by wujipeng's avatar wujipeng
Browse files

优化

parent b833e12b
......@@ -41,21 +41,21 @@ public class StudentCourseController {
@Resource
private AuthenticatedUserService authenticatedUserService;
@ApiOperation("学生端-学习中心-我的课程-日历")
@ApiOperation("日历")
@PostMapping("/schedule")
public Result<List<ClassVO>> schedule(@RequestBody(required = false) CourseRangeQueryDTO query,
HttpServletRequest request) {
return Result.data(studentCourseService.schedule(query, currentStudent(request).getId()));
}
@ApiOperation("学生端-学习中心-我的课程-日历-详情")
@ApiOperation("日历-详情")
@PostMapping("/schedule/detail")
public Result<ClassSubjectVO> detail(@RequestBody CourseDateQueryDTO query,
HttpServletRequest request) {
return Result.data(studentCourseService.detail(query, currentStudent(request).getId()));
}
@ApiOperation(value = "学生端-学习中心-我的课程-今日课程",
@ApiOperation(value = "今日课程",
notes = "路径userId为旧版兼容字段,服务端始终查询当前登录学员")
@GetMapping("/today/course/{userId}")
public Result<List<CalendarVO>> today(@PathVariable String userId, HttpServletRequest request) {
......@@ -63,23 +63,13 @@ public class StudentCourseController {
return Result.data(studentCourseService.today(currentStudent(request).getId()));
}
@ApiOperation("学生端-学习中心-我的课程-汇总")
@ApiOperation("汇总")
@PostMapping("/student/course/summary")
public Result<Map<String, Integer>> summary(
@RequestBody(required = false) CourseRangeQueryDTO query, HttpServletRequest request) {
return Result.data(studentCourseService.summary(query, currentStudent(request).getId()));
}
@ApiOperation(value = "今日课程-签到(已停用)",
notes = "请迁移至/attendance/student/check-in")
@PostMapping("/today/course/signIn")
public Result<Boolean> legacySignIn(@RequestBody CalendarDTO requestBody,
HttpServletRequest request) {
// 即使是停用入口也先校验身份,避免匿名请求借由错误信息探测内部接口结构。
currentStudent(request);
return Result.data(studentCourseService.rejectLegacySignIn(requestBody));
}
/** 统一完成JWT解析和学员角色校验,Controller不信任任何客户端用户标识。 */
private UserEntity currentStudent(HttpServletRequest request) {
UserEntity student = authenticatedUserService.current(request);
......
......@@ -25,6 +25,4 @@ public interface StudentCourseService {
/** 统计当前学员在指定范围内的课程及出勤情况。 */
Map<String, Integer> summary(CourseRangeQueryDTO query, String studentId);
/** 原签到入口只返回迁移提示,正式签到必须经过AttendanceService的IP和验证码校验。 */
Boolean rejectLegacySignIn(CalendarDTO request);
}
......@@ -188,11 +188,6 @@ public class StudentCourseServiceImpl implements StudentCourseService {
return result;
}
@Override
public Boolean rejectLegacySignIn(CalendarDTO request) {
throw new BusinessException("原签到接口已停用,请使用 /attendance/student/check-in 完成IP和验证码校验");
}
/** 将课程状态统一为英文枚举,避免日历、详情和汇总各自使用不同的中文状态。 */
private void enrichStudentCourses(List<ClassSubjectVO> courses,
List<ClassSubjectAttendanceEntity> attendance,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment