From 8d42b23c07433f11cb0b1e16d9c74b0e29fd35ce Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 05 七月 2024 09:57:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java b/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
index 9cc7334..43d7e39 100644
--- a/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/student/StudentExamController.java
@@ -1,14 +1,13 @@
package com.ycl.jxkg.controller.student;
import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.query.ExamQuery;
import com.ycl.jxkg.domain.vo.ExamSubmitVO;
+import com.ycl.jxkg.domain.vo.StartExamVO;
import com.ycl.jxkg.service.ExamService;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
/**
* @author锛歺p
@@ -16,10 +15,32 @@
*/
@RestController
@RequiredArgsConstructor
-@RequestMapping(value = "/api/student/exampaper/answer")
+@RequestMapping(value = "/api/student/exam")
public class StudentExamController {
private final ExamService examService;
+
+ /**
+ * 瀛﹀憳绔�冭瘯鍒嗛〉
+ *
+ * @param query
+ * @return
+ */
+ @PostMapping("/page")
+ public Result examList(ExamQuery query) {
+ return examService.studentPage(query);
+ }
+
+ /**
+ * 寮�濮嬭�冭瘯
+ *
+ * @param id
+ * @return
+ */
+ @PostMapping("/start/{id}")
+ public Result start(@PathVariable("id") Integer id) {
+ return examService.start(id);
+ }
/**
* 涓诲姩鎻愪氦璇曞嵎
@@ -27,8 +48,8 @@
* @param submitData
* @return
*/
- @PostMapping("/exam/submit")
- public Result examSubmit(@RequestBody @Validated ExamSubmitVO submitData) {
+ @PostMapping("/submit")
+ public Result examSubmit(@RequestBody @Validated StartExamVO submitData) {
return examService.examSubmit(submitData);
}
@@ -38,8 +59,8 @@
* @param submitData
* @return
*/
- @PostMapping("/exam/timing")
- public Result timingExamSubmit(@RequestBody @Validated ExamSubmitVO submitData) {
+ @PostMapping("/timing")
+ public Result timingExamSubmit(@RequestBody @Validated StartExamVO submitData) {
return examService.timingSubmit(submitData);
}
--
Gitblit v1.8.0