update api

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

@@ -34,7 +34,6 @@ public class ExamRecordPaperStructController extends ControllerSupport {
     @ApiOperation(value = "获取考试记录试卷结构")
     @GetMapping("/getExamRecordPaperStruct")
     public ExamRecordPaperStructEntity getExamRecordPaperStruct(@RequestParam Long examRecordDataId, @RequestParam(required = false) String fromCache) {
-        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         if (fromCache != null) {
             examRecordDataId = examRecordDataSyncService.getExamRecordDataIdByCacheId(examRecordDataId);
             if (examRecordDataId == null) {

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/controller/PracticeController.java

@@ -2,7 +2,6 @@ package cn.com.qmth.examcloud.core.oe.admin.api.controller;
 
 import cn.com.qmth.examcloud.api.commons.security.bean.User;
 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.service.ExamRecordDataSyncService;
 import cn.com.qmth.examcloud.core.oe.admin.service.PracticeService;
 import cn.com.qmth.examcloud.core.oe.admin.service.bean.PracticeCourseInfo;
@@ -45,7 +44,6 @@ public class PracticeController extends ControllerSupport {
     @ApiOperation(value = "练习课程列表")
     @GetMapping("/queryPracticeCourseList")
     public List<PracticeCourseInfo> queryPracticeCourseList(@RequestParam Long examId) {
-        Check.isNull(examId, "examId不能为空");
         User user = getAccessUser();
         return practiceService.queryPracticeCourseList(examId, user.getUserId());
     }
@@ -59,7 +57,6 @@ public class PracticeController extends ControllerSupport {
     @ApiOperation(value = "课程练习记录详情")
     @GetMapping("/queryPracticeRecordList")
     public List<PracticeRecordInfo> queryPracticeRecordList(@RequestParam Long examStudentId) {
-        Check.isNull(examStudentId, "examStudentId不能为空");
         return practiceService.queryPracticeRecordList(examStudentId);
     }
 
@@ -71,7 +68,6 @@ public class PracticeController extends ControllerSupport {
     @ApiOperation(value = "单次练习答题情况统计")
     @GetMapping("/getPracticeDetailInfo")
     public PracticeDetailInfo getPracticeDetailInfo(@RequestParam Long examRecordDataId, @RequestParam(required = false) String fromCache) {
-        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         if (fromCache != null) {
             examRecordDataId = examRecordDataSyncService.getExamRecordDataIdByCacheId(examRecordDataId);
             if (examRecordDataId == null) {

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

@@ -5,7 +5,6 @@ import cn.com.qmth.examcloud.api.commons.security.bean.User;
 import cn.com.qmth.examcloud.commons.exception.StatusException;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordDataBeanConvert;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordDataDomain;
-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.entity.ExamRecordDataEntity;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordPaperStructEntity;
@@ -74,7 +73,6 @@ public class ExamProcessController extends ControllerSupport {
     @ApiOperation(value = "练习课程列表")
     @PostMapping("/queryPracticeCourseList")
     public List<PracticeCourseInfo> queryPracticeCourseList(@RequestParam Long examId) {
-        Check.isNull(examId, "examId不能为空");
         User user = getAccessUser();
         return practiceService.queryPracticeCourseList(examId, user.getUserId());
     }
@@ -82,14 +80,12 @@ public class ExamProcessController extends ControllerSupport {
     @ApiOperation(value = "课程练习记录详情")
     @PostMapping("/queryPracticeRecordList")
     public List<PracticeRecordInfo> queryPracticeRecordList(@RequestParam Long examStudentId) {
-        Check.isNull(examStudentId, "examStudentId不能为空");
         return practiceService.queryPracticeRecordList(examStudentId);
     }
 
     @ApiOperation(value = "单次练习答题情况统计")
     @PostMapping("/getPracticeDetailInfo")
     public PracticeDetailInfo getPracticeDetailInfo(@RequestParam Long examRecordDataId, @RequestParam(required = false) String fromCache) {
-        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         if (fromCache != null) {
             examRecordDataId = examRecordDataSyncService.getExamRecordDataIdByCacheId(examRecordDataId);
             if (examRecordDataId == null) {
@@ -102,7 +98,6 @@ public class ExamProcessController extends ControllerSupport {
     @ApiOperation(value = "获取考试记录试卷结构")
     @PostMapping("/getExamRecordPaperStruct")
     public ExamRecordPaperStructEntity getExamRecordPaperStruct(@RequestParam Long examRecordDataId, @RequestParam(required = false) String fromCache) {
-        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         if (fromCache != null) {
             examRecordDataId = examRecordDataSyncService.getExamRecordDataIdByCacheId(examRecordDataId);
             if (examRecordDataId == null) {
@@ -115,14 +110,12 @@ public class ExamProcessController extends ControllerSupport {
     @ApiOperation(value = "获取交卷之后的所有试题作答信息")
     @PostMapping("/getExamRecordQuestions")
     public ExamRecordQuestionsEntity getExamRecordQuestions(@RequestParam Long examRecordDataId, @RequestParam(required = false) String fromCache) {
-        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         if (fromCache != null) {
             examRecordDataId = examRecordDataSyncService.getExamRecordDataIdByCacheId(examRecordDataId);
             if (examRecordDataId == null) {
                 throw new StatusException("1001", "未找到数据");
             }
         }
-
         return examRecordQuestionsService.getExamRecordQuestionsAndFixExamRecordDataIfNecessary(examRecordDataId);
     }
 

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamRecordDataSyncServiceImpl.java

@@ -1,5 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataSyncRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamRecordDataSyncEntity;
 import cn.com.qmth.examcloud.core.oe.admin.service.ExamRecordDataSyncService;
@@ -12,13 +13,15 @@ public class ExamRecordDataSyncServiceImpl implements ExamRecordDataSyncService
     @Autowired
     private ExamRecordDataSyncRepo examRecordDataSyncRepo;
 
-
     @Override
-    public Long getExamRecordDataIdByCacheId(Long cacheId) {
-        ExamRecordDataSyncEntity e = examRecordDataSyncRepo.findByCacheId(cacheId);
+    public Long getExamRecordDataIdByCacheId(Long tempExamRecordDataId) {
+        Check.isNull(tempExamRecordDataId, "tempExamRecordDataId不能为空");
+
+        ExamRecordDataSyncEntity e = examRecordDataSyncRepo.findByCacheId(tempExamRecordDataId);
         if (e != null) {
             return e.getDbId();
         }
+
         return null;
     }
 

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

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.core.oe.admin.base.Constants;
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.NewQuestionType;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.Sentence;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
@@ -46,6 +47,8 @@ public class ExamRecordPaperStructServiceImpl implements ExamRecordPaperStructSe
 
     @Override
     public ExamRecordPaperStructEntity getExamRecordPaperStruct(Long examRecordDataId) {
+        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
+
         ExamRecordDataEntity examRecordDataEntity = GlobalHelper.getEntity(examRecordDataRepo, examRecordDataId, ExamRecordDataEntity.class);
         String paperStructId = examRecordDataEntity.getPaperStructId();
         ExamRecordPaperStructEntity examRecordPaperStruct = null;

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

@@ -2,6 +2,7 @@ package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 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.base.utils.QuestionTypeUtil;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
@@ -190,6 +191,7 @@ public class ExamRecordQuestionsServiceImpl implements ExamRecordQuestionsServic
 
     @Override
     public ExamRecordQuestionsEntity getExamRecordQuestionsAndFixExamRecordDataIfNecessary(Long examRecordDataId) {
+        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
         ExamRecordDataEntity examRecordData = GlobalHelper.getEntity(examRecordDataRepo,
                 examRecordDataId, ExamRecordDataEntity.class);
         return getExamRecordQuestionsAndFixExamRecordDataIfNecessary(examRecordData);

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/PracticeServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.com.qmth.examcloud.core.oe.admin.service.impl;
 
 import cn.com.qmth.examcloud.commons.util.StringUtil;
+import cn.com.qmth.examcloud.core.oe.admin.base.utils.Check;
 import cn.com.qmth.examcloud.core.oe.admin.base.utils.QuestionTypeUtil;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordDataRepo;
 import cn.com.qmth.examcloud.core.oe.admin.dao.ExamRecordQuestionsRepo;
@@ -33,7 +34,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-
 /**
  * @author chenken
  * @date 2018年9月7日 上午11:05:18
@@ -63,9 +63,9 @@ public class PracticeServiceImpl implements PracticeService {
 
     @Override
     public List<PracticeCourseInfo> queryPracticeCourseList(Long examId, Long studentId) {
-        if (examId == null || studentId == null) {
-            return null;
-        }
+        Check.isNull(examId, "examId不能为空");
+        Check.isNull(studentId, "studentId不能为空");
+
         List<ExamStudentEntity> examStudentList = examStudentRepo.findByExamIdAndStudentId(examId, studentId);
         if (examStudentList == null || examStudentList.size() == 0) {
             return null;
@@ -152,9 +152,8 @@ public class PracticeServiceImpl implements PracticeService {
 
     @Override
     public List<PracticeRecordInfo> queryPracticeRecordList(Long examStudentId) {
-        if (examStudentId == null) {
-            return null;
-        }
+        Check.isNull(examStudentId, "examStudentId不能为空");
+
         List<ExamRecordDataEntity> examRecordDataList = examRecordDataRepo.findByExamStudentId(examStudentId);
         List<PracticeRecordInfo> practiceRecords = new ArrayList<PracticeRecordInfo>();
         ExamStudentEntity examStudent = examStudentRepo.findByExamStudentId(examStudentId);
@@ -234,14 +233,13 @@ public class PracticeServiceImpl implements PracticeService {
 
     @Override
     public PracticeDetailInfo getPracticeDetailInfo(Long examRecordDataId) {
-        if (examRecordDataId == null) {
-            return null;
-        }
+        Check.isNull(examRecordDataId, "examRecordDataId不能为空");
+
         PracticeDetailInfo practiceDetailInfo = new PracticeDetailInfo();
         //取出试卷结构
         ExamRecordPaperStructEntity examRecordPaperStruct = examRecordPaperStructService.getExamRecordPaperStruct(examRecordDataId);
         DefaultPaper defaultPaper = examRecordPaperStruct.getDefaultPaper();
-        List<PaperStructInfo> paperStructInfos = new ArrayList<PaperStructInfo>();
+        List<PaperStructInfo> paperStructInfos = new ArrayList<>();
         List<DefaultQuestionGroup> questionGroupList = defaultPaper.getQuestionGroupList();
         //取出作答记录
         ExamRecordQuestionsEntity examRecordQuestions =