update api

examcloud-exchange-outer-api/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/bean/OuterSubjectiveQuestionBean.java

@@ -17,12 +17,12 @@ public class OuterSubjectiveQuestionBean implements JsonSerializable{
 
 	@ApiModelProperty(value = "大题号", example = "1", required = true)
 	private Integer mainNumber;
-	
+
 	@ApiModelProperty(value = "大题名称", example = "XX", required = true)
 	private String mainTitle;
-	
+
 	@ApiModelProperty(value = "小题号", example = "XX", required = true)
-	private String subNumber;
+	private Integer subNumber;
 
 	@ApiModelProperty(value = "小题分", example = "1", required = true)
 	private Double totalScore;
@@ -43,11 +43,11 @@ public class OuterSubjectiveQuestionBean implements JsonSerializable{
 		this.mainTitle = mainTitle;
 	}
 
-	public String getSubNumber() {
+	public Integer getSubNumber() {
 		return subNumber;
 	}
 
-	public void setSubNumber(String subNumber) {
+	public void setSubNumber(Integer subNumber) {
 		this.subNumber = subNumber;
 	}
 

examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/bean/OuterQuestionBean.java

@@ -13,7 +13,7 @@ public class OuterQuestionBean implements JsonSerializable {
 
     private String mainTitle; //大题名称
 
-    private String subNumber; //小题号
+    private Integer subNumber; //小题号
 
     private Double totalScore; //小题分
 
@@ -33,11 +33,11 @@ public class OuterQuestionBean implements JsonSerializable {
         this.mainTitle = mainTitle;
     }
 
-    public String getSubNumber() {
+    public Integer getSubNumber() {
         return subNumber;
     }
 
-    public void setSubNumber(String subNumber) {
+    public void setSubNumber(Integer subNumber) {
         this.subNumber = subNumber;
     }
 

examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/impl/OutletPaperStructServiceImpl.java

@@ -15,6 +15,8 @@ import cn.com.qmth.examcloud.exchange.outer.service.OutletPaperStructService;
 import cn.com.qmth.examcloud.exchange.outer.service.bean.OuterCourseBean;
 import cn.com.qmth.examcloud.exchange.outer.service.bean.OuterQuestionBean;
 import cn.com.qmth.examcloud.question.commons.core.paper.DefaultQuestionGroup;
+import cn.com.qmth.examcloud.question.commons.core.paper.DefaultQuestionStructureWrapper;
+import cn.com.qmth.examcloud.question.commons.core.paper.DefaultQuestionUnitWrapper;
 import cn.com.qmth.examcloud.support.cache.CacheHelper;
 import cn.com.qmth.examcloud.support.cache.bean.ExtractConfigCacheBean;
 import cn.com.qmth.examcloud.support.cache.bean.ExtractConfigDetailCacheBean;
@@ -61,20 +63,41 @@ public class OutletPaperStructServiceImpl implements OutletPaperStructService {
             ExtractConfigPaperCacheBean extractConfigPaper = CacheHelper.getExtractConfigPaper(examId, courseCode, examPaper.getGroupCode(), examPaper.getPaperId());
             List<DefaultQuestionGroup> questionGroupList = extractConfigPaper.getDefaultPaper().getQuestionGroupList();
 
-            log.info("start setting questions...");
-            List<OuterQuestionBean> questions = new ArrayList<>();
-            for (DefaultQuestionGroup group : questionGroupList) {
-                log.info(group.getGroupName());
-                //todo
-            }
-
-            return questions;
+            return this.parseSubjectiveQuestions(questionGroupList);
         } catch (Exception e) {
             log.error(e.getMessage(), e);
             return new ArrayList<>();
         }
     }
 
+    private List<OuterQuestionBean> parseSubjectiveQuestions(List<DefaultQuestionGroup> questionGroupList) {
+        log.info("parseSubjectiveQuestions start...");
+
+        List<OuterQuestionBean> subjectiveQuestions = new ArrayList<>();
+
+        int order = 0;
+        for (int i = 0; i < questionGroupList.size(); i++) {
+            DefaultQuestionGroup group = questionGroupList.get(i);
+            log.info(group.getGroupName() + " - " + group.getGroupScore() + " - " + group.getQuestionWrapperList().size());
+
+            for (DefaultQuestionStructureWrapper questionWrapper : group.getQuestionWrapperList()) {
+                for (DefaultQuestionUnitWrapper questionUnitWrapper : questionWrapper.getQuestionUnitWrapperList()) {
+                    // questionUnitWrapper.getQuestionType(); todo
+
+                    OuterQuestionBean subjectiveQuestion = new OuterQuestionBean();
+                    subjectiveQuestion.setMainNumber(i + 1);
+                    subjectiveQuestion.setMainTitle(group.getGroupName());
+                    subjectiveQuestion.setSubNumber(++order);
+                    subjectiveQuestion.setTotalScore(questionUnitWrapper.getQuestionScore());
+
+                    subjectiveQuestions.add(subjectiveQuestion);
+                }
+            }
+        }
+
+        return subjectiveQuestions;
+    }
+
     /**
      * 获取考试相关联的课程列表
      *