From 5073a245f53fd5ca936e779be8c6b9b19d42f67d Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 11 七月 2024 09:47:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/main/java/com/ycl/jxkg/controller/admin/ExamController.java | 68 ++++++++++++++++++++++++++++------
1 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
index 3532a3d..9e46068 100644
--- a/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
+++ b/src/main/java/com/ycl/jxkg/controller/admin/ExamController.java
@@ -1,21 +1,23 @@
package com.ycl.jxkg.controller.admin;
-import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.base.Result;
+import com.ycl.jxkg.domain.form.AddTimeForm;
+import com.ycl.jxkg.domain.form.ExamForm;
+import com.ycl.jxkg.domain.form.ForceSubmitForm;
+import com.ycl.jxkg.domain.query.ExamQuery;
+import com.ycl.jxkg.domain.vo.admin.exam.ExamPaperMarkVO;
import com.ycl.jxkg.group.Add;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.security.access.prepost.PreAuthorize;
-import lombok.RequiredArgsConstructor;
-import java.util.List;
-import org.springframework.validation.annotation.Validated;
-import javax.validation.constraints.NotEmpty;
+import com.ycl.jxkg.group.Update;
+import com.ycl.jxkg.service.ExamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import com.ycl.jxkg.service.ExamService;
-import com.ycl.jxkg.base.Result;
-import com.ycl.jxkg.domain.form.ExamForm;
-import com.ycl.jxkg.domain.query.ExamQuery;
import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
/**
* 鑰冭瘯 鍓嶇鎺у埗鍣�
@@ -27,7 +29,7 @@
@RequiredArgsConstructor
@Api(value = "鑰冭瘯", tags = "鑰冭瘯绠＄悊")
@RestController
-@RequestMapping("/api/exam")
+@RequestMapping("/api/admin/exam")
public class ExamController {
private final ExamService examService;
@@ -80,4 +82,46 @@
public Result list() {
return examService.all();
}
+
+ @GetMapping("/mark/paper/{id}")
+ @PreAuthorize("hasAuthority('exam:markPaper')")
+ @ApiOperation(value = "鑾峰彇鑰冭瘯缁撴灉淇℃伅", notes = "鑾峰彇鑰冭瘯缁撴灉淇℃伅")
+ public Result getMarkResultInfo(@PathVariable("id") Integer id) {
+ return examService.getMarkResultInfo(id);
+ }
+
+ @GetMapping("/mark/paper/{examId}/{userId}")
+ @PreAuthorize("hasAuthority('exam:markPaper')")
+ @ApiOperation(value = "鑾峰彇闃呭嵎淇℃伅", notes = "鑾峰彇闃呭嵎淇℃伅")
+ public Result getMarkPaperInfo(@PathVariable("examId") Integer examId, @PathVariable("userId") Integer userId) {
+ return examService.getMarkPaperInfo(examId, userId);
+ }
+
+ @PostMapping("/mark/paper")
+ @ApiOperation(value = "鎻愪氦鎵规敼", notes = "鎻愪氦鎵规敼")
+ public Result submitMarkPaper(@RequestBody ExamPaperMarkVO form) {
+ return examService.submitMarkPaper(form);
+ }
+
+ @GetMapping("/monitor/list")
+ @PreAuthorize("hasAuthority('exam:monitor:list')")
+ @ApiOperation(value = "鑰冭瘯鐩戞帶鍒楄〃", notes = "鑰冭瘯鐩戞帶鍒楄〃")
+ public Result monitorList(ExamQuery query) {
+ return examService.monitorList(query);
+ }
+
+ @PostMapping("/add/time")
+ @PreAuthorize("hasAuthority('exam:add:time')")
+ @ApiOperation(value = "娣诲姞鑰冭瘯鏃堕暱", notes = "娣诲姞鑰冭瘯鏃堕暱")
+ public Result addTime(@RequestBody @Validated AddTimeForm form) {
+ return examService.addTime(form);
+ }
+
+ @PostMapping("/force/submit")
+ @PreAuthorize("hasAuthority('exam:add:time')")
+ @ApiOperation(value = "寮哄埗鎻愪氦璇曞嵎", notes = "寮哄埗鎻愪氦璇曞嵎")
+ public Result forceSubmit(@RequestBody @Validated ForceSubmitForm form) {
+ return examService.forceSubmit(form);
+ }
+
}
--
Gitblit v1.8.0