merge client api

examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/ExamRecordPaperStructController.java

@@ -1,6 +1,5 @@
 package cn.com.qmth.examcloud.core.oe.student.api.controller;
 
-import cn.com.qmth.examcloud.core.oe.student.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamRecordPaperStructService;
 import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
 import cn.com.qmth.examcloud.web.support.ControllerSupport;
@@ -29,7 +28,6 @@ public class ExamRecordPaperStructController extends ControllerSupport {
     @ApiOperation(value = "获取考试记录试卷结构")
     @GetMapping("/getExamRecordPaperStruct")
     public ExamRecordPaperStruct getExamRecordPaperStruct(@RequestParam Long examRecordDataId) {
-        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         return examRecordPaperStructService.getExamRecordPaperStruct(examRecordDataId);
     }
 

examcloud-core-oe-student-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/student/api/controller/client/ExamProcessController.java

@@ -3,7 +3,6 @@ package cn.com.qmth.examcloud.core.oe.student.api.controller.client;
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.commons.util.JsonUtil;
-import cn.com.qmth.examcloud.core.oe.student.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.student.bean.*;
 import cn.com.qmth.examcloud.core.oe.student.service.*;
 import cn.com.qmth.examcloud.support.Constants;
@@ -114,7 +113,6 @@ public class ExamProcessController extends ControllerSupport {
     @ApiOperation(value = "获取考试记录试卷结构")
     @PostMapping("/getExamRecordPaperStruct")
     public ExamRecordPaperStruct getExamRecordPaperStruct(@RequestParam Long examRecordDataId) {
-        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         return examRecordPaperStructService.getExamRecordPaperStruct(examRecordDataId);
     }
 
@@ -149,14 +147,12 @@ public class ExamProcessController extends ControllerSupport {
     @PostMapping("/getQuestionContent")
     public String getQuestionContent(@RequestParam String questionId) {
         User user = getAccessUser();
-        Check.isBlank(questionId, "questionId不能为空");
         return examRecordQuestionsService.getQuestionContentForClient(user.getUserId(), questionId);
     }
 
     @ApiOperation(value = "考试过程中-考生试题作答")
     @PostMapping("/submitQuestionAnswer")
-    public void submitQuestionAnswer(@RequestBody List<ExamStudentQuestionInfo> examQuestionInfos,
-                                     HttpServletRequest request) {
+    public void submitQuestionAnswer(@RequestBody List<ExamStudentQuestionInfo> examQuestionInfos, HttpServletRequest request) {
         if (LOGGER.isDebugEnabled()) {
             String strJosn = JsonUtil.toJson(examQuestionInfos);
             LOGGER.debug("ExamQuestionController--submitQuestionAnswer参数信息:" + strJosn);
@@ -177,6 +173,7 @@ public class ExamProcessController extends ControllerSupport {
     @ApiOperation(value = "保存活体检测结果")
     @PostMapping("/saveFaceBiopsyResult")
     public SaveFaceBiopsyResultResp saveFaceBiopsyResult(@RequestBody SaveFaceBiopsyResultReq req) {
+        // todo
         return null;
     }
 

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamRecordPaperStructServiceImpl.java

@@ -3,6 +3,7 @@ package cn.com.qmth.examcloud.core.oe.student.service.impl;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordPaperStructReq;
 import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamRecordPaperStructResp;
+import cn.com.qmth.examcloud.core.oe.student.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.student.service.ExamRecordPaperStructService;
 import cn.com.qmth.examcloud.support.examing.ExamRecordPaperStruct;
 import cn.com.qmth.examcloud.support.redis.RedisKeyHelper;
@@ -25,6 +26,7 @@ public class ExamRecordPaperStructServiceImpl implements ExamRecordPaperStructSe
 
     @Override
     public ExamRecordPaperStruct getExamRecordPaperStruct(Long examRecordDataId) {
+        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         String key = RedisKeyHelper.getBuilder().studentPaperKey(examRecordDataId);
         return redisClient.get(key, ExamRecordPaperStruct.class);
     }

examcloud-core-oe-student-service/src/main/java/cn/com/qmth/examcloud/core/oe/student/service/impl/ExamRecordQuestionsServiceImpl.java

@@ -6,6 +6,7 @@ import cn.com.qmth.examcloud.commons.util.JsonUtil;
 import cn.com.qmth.examcloud.core.oe.student.api.bean.StuExamQuestionBean;
 import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamRecordQuestionsReq;
 import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamRecordQuestionsResp;
+import cn.com.qmth.examcloud.core.oe.student.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.student.bean.ExamStudentQuestionInfo;
 import cn.com.qmth.examcloud.core.oe.student.dao.ExamRecordQuestionTempRepo;
 import cn.com.qmth.examcloud.core.oe.student.dao.entity.ExamQuestionTempEntity;
@@ -186,6 +187,9 @@ public class ExamRecordQuestionsServiceImpl implements ExamRecordQuestionsServic
 
     @Override
     public String getQuestionContentForClient(Long studentId, String questionId) {
+        Check.isBlank(questionId, "questionId不能为空");
+        Check.isNull(studentId, "studentId不能为空");
+
         ExamingSession examSessionInfo = examingSessionService.getExamingSession(studentId);
         if (examSessionInfo == null
                 || examSessionInfo.getExamingStatus().equals(ExamingStatus.INFORMAL)) {