update

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/ObjectiveQuestionStructureService.java

@@ -1,16 +0,0 @@
-/*
- * *************************************************
- * Copyright (c) 2018 QMTH. All Rights Reserved.
- * Created by Deason on 2018-10-22 15:28:16.
- * *************************************************
- */
-
-package cn.com.qmth.examcloud.core.print.service;
-
-/**
- * @author: fengdesheng
- * @since: 2018/10/22
- */
-public interface ObjectiveQuestionStructureService {
-
-}

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/SubjectiveQuestionStructureService.java → examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/QuestionStructureService.java

@@ -11,6 +11,14 @@ package cn.com.qmth.examcloud.core.print.service;
  * @author: fengdesheng
  * @since: 2018/10/22
  */
-public interface SubjectiveQuestionStructureService {
+public interface QuestionStructureService {
+
+    /**
+     * 保存试卷试题结构
+     *
+     * @param examId
+     * @param paperId
+     */
+    void savePaperQuestionStructure(Long examId, String paperId);
 
 }

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/bean/questionstructure/PaperQuestionStructureInfo.java

@@ -0,0 +1,49 @@
+/*
+ * *************************************************
+ * Copyright (c) 2018 QMTH. All Rights Reserved.
+ * Created by Deason on 2018-11-16 14:34:43.
+ * *************************************************
+ */
+
+package cn.com.qmth.examcloud.core.print.service.bean.questionstructure;
+
+import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
+import cn.com.qmth.examcloud.core.print.entity.ObjectiveQuestionStructure;
+import cn.com.qmth.examcloud.core.print.entity.SubjectiveQuestionStructure;
+
+import java.util.List;
+
+/**
+ * 试卷的试题结构
+ *
+ * @author: fengdesheng
+ * @since: 2018/11/16
+ */
+public class PaperQuestionStructureInfo implements JsonSerializable {
+    private static final long serialVersionUID = 1L;
+    /**
+     * 客观题列表
+     */
+    private List<ObjectiveQuestionStructure> objectives;
+    /**
+     * 主观题列表
+     */
+    private List<SubjectiveQuestionStructure> subjectives;
+
+    public List<ObjectiveQuestionStructure> getObjectives() {
+        return objectives;
+    }
+
+    public void setObjectives(List<ObjectiveQuestionStructure> objectives) {
+        this.objectives = objectives;
+    }
+
+    public List<SubjectiveQuestionStructure> getSubjectives() {
+        return subjectives;
+    }
+
+    public void setSubjectives(List<SubjectiveQuestionStructure> subjectives) {
+        this.subjectives = subjectives;
+    }
+
+}

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/CoursePaperServiceImpl.java

@@ -17,6 +17,7 @@ import cn.com.qmth.examcloud.core.print.enums.PaperStatus;
 import cn.com.qmth.examcloud.core.print.repository.CoursePaperRepository;
 import cn.com.qmth.examcloud.core.print.repository.CourseStatisticRepository;
 import cn.com.qmth.examcloud.core.print.service.CoursePaperService;
+import cn.com.qmth.examcloud.core.print.service.QuestionStructureService;
 import cn.com.qmth.examcloud.core.print.service.bean.coursepaper.CoursePaperConvert;
 import cn.com.qmth.examcloud.core.print.service.bean.coursepaper.CoursePaperInfo;
 import cn.com.qmth.examcloud.core.print.service.bean.coursepaper.CoursePaperQuery;
@@ -45,6 +46,8 @@ public class CoursePaperServiceImpl implements CoursePaperService {
     private CoursePaperRepository coursePaperRepository;
     @Autowired
     private CourseStatisticRepository courseStatisticRepository;
+    @Autowired
+    private QuestionStructureService questionStructureService;
 
     @Override
     public List<CoursePaperInfo> getCoursePaperList(CoursePaperQuery query) {
@@ -99,8 +102,8 @@ public class CoursePaperServiceImpl implements CoursePaperService {
         //否则新增
         coursePaperRepository.save(coursePaper);
 
-        //保存试卷结构
-        this.savePaperQuestionStructure(coursePaper.getExamId(), coursePaper.getPaperId());
+        //保存试卷试题结构
+        questionStructureService.savePaperQuestionStructure(coursePaper.getExamId(), coursePaper.getPaperId());
 
         //如果当前考试课程"只有一种试卷类型"且"未分配试卷"，则默认分配该试卷
         SearchBuilder searches = new SearchBuilder()
@@ -129,10 +132,6 @@ public class CoursePaperServiceImpl implements CoursePaperService {
         courseStatisticRepository.save(statistics);
     }
 
-    private void savePaperQuestionStructure(Long examId, String paperId) {
-        //todo
-    }
-
     @Override
     public File downloadPaperStructure(Long examId, String paperId) {
         //todo

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/ObjectiveQuestionStructureServiceImpl.java

@@ -1,24 +0,0 @@
-/*
- * *************************************************
- * Copyright (c) 2018 QMTH. All Rights Reserved.
- * Created by Deason on 2018-10-22 15:28:26.
- * *************************************************
- */
-
-package cn.com.qmth.examcloud.core.print.service.impl;
-
-import cn.com.qmth.examcloud.core.print.repository.ObjectiveQuestionStructureRepository;
-import cn.com.qmth.examcloud.core.print.service.ObjectiveQuestionStructureService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-/**
- * @author: fengdesheng
- * @since: 2018/10/17
- */
-@Service
-public class ObjectiveQuestionStructureServiceImpl implements ObjectiveQuestionStructureService {
-    @Autowired
-    private ObjectiveQuestionStructureRepository objectiveQuestionStructureRepository;
-
-}

examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/SubjectiveQuestionStructureServiceImpl.java → examcloud-core-print-service/src/main/java/cn/com/qmth/examcloud/core/print/service/impl/QuestionStructureServiceImpl.java

@@ -7,8 +7,9 @@
 
 package cn.com.qmth.examcloud.core.print.service.impl;
 
+import cn.com.qmth.examcloud.core.print.repository.ObjectiveQuestionStructureRepository;
 import cn.com.qmth.examcloud.core.print.repository.SubjectiveQuestionStructureRepository;
-import cn.com.qmth.examcloud.core.print.service.SubjectiveQuestionStructureService;
+import cn.com.qmth.examcloud.core.print.service.QuestionStructureService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -19,9 +20,16 @@ import org.springframework.stereotype.Service;
  * @since: 2018/10/17
  */
 @Service
-public class SubjectiveQuestionStructureServiceImpl implements SubjectiveQuestionStructureService {
-    private static final Logger log = LoggerFactory.getLogger(SubjectiveQuestionStructureServiceImpl.class);
+public class QuestionStructureServiceImpl implements QuestionStructureService {
+    private static final Logger log = LoggerFactory.getLogger(QuestionStructureServiceImpl.class);
     @Autowired
     private SubjectiveQuestionStructureRepository subjectiveQuestionStructureRepository;
+    @Autowired
+    private ObjectiveQuestionStructureRepository objectiveQuestionStructureRepository;
+
+    @Override
+    public void savePaperQuestionStructure(Long examId, String paperId) {
+        //todo
+    }
 
 }