Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-rmi.git

examcloud-core-print-api/src/main/java/cn/com/qmth/examcloud/core/print/api/bean/SyncCoursePaperBean.java

@@ -48,13 +48,21 @@ public class SyncCoursePaperBean implements JsonSerializable {
      */
     private Integer paperP;
     /**
-     * 试卷文件URL
+     * 试卷Word文件地址
      */
-    private String paperFileUrl;
+    private String paperWordUrl;
     /**
-     * 答案文件URL
+     * 答案Word文件地址
      */
-    private String answerFileUrl;
+    private String answerWordUrl;
+    /**
+     * 试卷页面地址
+     */
+    private String paperHtmlUrl;
+    /**
+     * 试卷PDF文件地址
+     */
+    private String paperPdfUrl;
 
     public Long getOrgId() {
         return orgId;
@@ -120,20 +128,36 @@ public class SyncCoursePaperBean implements JsonSerializable {
         this.paperP = paperP;
     }
 
-    public String getPaperFileUrl() {
-        return paperFileUrl;
+    public String getPaperWordUrl() {
+        return paperWordUrl;
+    }
+
+    public void setPaperWordUrl(String paperWordUrl) {
+        this.paperWordUrl = paperWordUrl;
+    }
+
+    public String getAnswerWordUrl() {
+        return answerWordUrl;
+    }
+
+    public void setAnswerWordUrl(String answerWordUrl) {
+        this.answerWordUrl = answerWordUrl;
+    }
+
+    public String getPaperHtmlUrl() {
+        return paperHtmlUrl;
     }
 
-    public void setPaperFileUrl(String paperFileUrl) {
-        this.paperFileUrl = paperFileUrl;
+    public void setPaperHtmlUrl(String paperHtmlUrl) {
+        this.paperHtmlUrl = paperHtmlUrl;
     }
 
-    public String getAnswerFileUrl() {
-        return answerFileUrl;
+    public String getPaperPdfUrl() {
+        return paperPdfUrl;
     }
 
-    public void setAnswerFileUrl(String answerFileUrl) {
-        this.answerFileUrl = answerFileUrl;
+    public void setPaperPdfUrl(String paperPdfUrl) {
+        this.paperPdfUrl = paperPdfUrl;
     }
 
 }

examcloud-core-questions-api-client/src/main/java/cn/com/qmth/examcloud/core/questions/api/client/ExtractConfigCloudServiceClient.java

@@ -75,4 +75,9 @@ public class ExtractConfigCloudServiceClient extends BasicCloudClientSupport imp
 		return post("extract_config/getBaseQuestion", req, GetQuestionResp.class);
 	}
 
+	@Override
+	public GetQuestionListResp getQuestionStructure(GetBasePaperReq req) {
+		return post("extract_config/getQuestionStructure", req, GetQuestionListResp.class);
+	}
+
 }

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/ExtractConfigCloudService.java

@@ -61,4 +61,11 @@ public interface ExtractConfigCloudService extends CloudService{
 	 * @return
 	 */
 	GetQuestionResp getBaseQuestion(GetQuestionReq req);
+	
+	/**
+	 * 根据试卷id查询主观题与客观题数量
+	 * @param req
+	 * @return
+	 */
+	GetQuestionListResp getQuestionStructure(GetBasePaperReq req);
 }

examcloud-core-questions-api/src/main/java/cn/com/qmth/examcloud/core/questions/api/response/GetQuestionListResp.java

@@ -10,6 +10,8 @@ public class GetQuestionListResp extends BaseResponse{
 	private static final long serialVersionUID = 5831902383553781609L;
 
 	private Map<String, DefaultQuestion> map;
+	
+	private String json;
 
 	public Map<String, DefaultQuestion> getMap() {
 		return map;
@@ -19,4 +21,11 @@ public class GetQuestionListResp extends BaseResponse{
 		this.map = map;
 	}
 
+	public String getJson() {
+		return json;
+	}
+
+	public void setJson(String json) {
+		this.json = json;
+	}
 }