deason 3 lat temu
rodzic
commit
04b6188dda

+ 1 - 9
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/OfflineExamController.java

@@ -76,8 +76,7 @@ public class OfflineExamController extends ControllerSupport {
     @GetMapping("/getOfflineCourse")
     public List<OfflineExamCourseInfo> getOfflineCourse() {
         User user = getAccessUser();
-        List<OfflineExamCourseInfo> offlineExamCourseInfos = offlineExamService.getOfflineCourse(user.getUserId());
-        return offlineExamCourseInfos;
+        return offlineExamService.getOfflineCourse(user.getUserId());
     }
 
     /**
@@ -88,13 +87,6 @@ public class OfflineExamController extends ControllerSupport {
     @ApiOperation(value = "离线考试:开始考试")
     @GetMapping("/startOfflineExam")
     public void startOfflineExam(@RequestParam long examStudentId) {
-        Check.isNull(examStudentId, "examStudentId不能为空");
-
-        boolean isEnable = examStudentService.isEnableExamStudent(examStudentId);
-        if (!isEnable) {
-            throw new StatusException("000500", "当前考生已禁用!");
-        }
-
         offlineExamService.startOfflineExam(examStudentId);
     }
 

+ 6 - 2
examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/client/ExamProcessController.java

@@ -52,6 +52,9 @@ public class ExamProcessController extends ControllerSupport {
     @Autowired
     private ExamScoreService examScoreService;
 
+    @Autowired
+    private OfflineExamService offlineExamService;
+
     @ApiOperation(value = "获取在线考试待考列表")
     @PostMapping("/queryExamList")
     public List<OnHandExamInfo> queryExamList() {
@@ -146,13 +149,14 @@ public class ExamProcessController extends ControllerSupport {
     @ApiOperation(value = "获取离线考试列表")
     @PostMapping("/getOfflineCourse")
     public List<OfflineExamCourseInfo> getOfflineCourse() {
-        return null;
+        User user = getAccessUser();
+        return offlineExamService.getOfflineCourse(user.getUserId());
     }
 
     @ApiOperation(value = "离线考试:开始考试")
     @PostMapping("/startOfflineExam")
     public void startOfflineExam(@RequestParam long examStudentId) {
-
+        offlineExamService.startOfflineExam(examStudentId);
     }
 
     @ApiOperation(value = "离线考试:交卷")

+ 11 - 0
examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/OfflineExamServiceImpl.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 import cn.com.qmth.examcloud.api.commons.enums.ExamSpecialSettingsType;
 import cn.com.qmth.examcloud.api.commons.enums.ExamType;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordFileAnswerRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamStudentRepo;
@@ -74,6 +75,9 @@ public class OfflineExamServiceImpl implements OfflineExamService {
     @Autowired
     private ExamRecordFileAnswerRepo examRecordFileAnswerRepo;
 
+    @Autowired
+    private ExamStudentService examStudentService;
+
     @Value("${app.upyun.uploadUrl}")
     private String upyunUploadUrl;
 
@@ -164,6 +168,13 @@ public class OfflineExamServiceImpl implements OfflineExamService {
 
     @Override
     public void startOfflineExam(Long examStudentId) {
+        Check.isNull(examStudentId, "examStudentId不能为空");
+
+        boolean isEnable = examStudentService.isEnableExamStudent(examStudentId);
+        if (!isEnable) {
+            throw new StatusException("000500", "当前考生已禁用!");
+        }
+
         SysPropertyCacheBean stuClientLoginLimit = CacheHelper.getSysProperty("STU_CLIENT_LOGIN_LIMIT");
         boolean stuClientLoginLimitBoolean = false;
         if (stuClientLoginLimit.getHasValue()) {