Merge remote-tracking branch 'origin/master'

src/main/java/cn/com/qmth/examcloud/support/cache/CacheHelper.java

@@ -97,7 +97,7 @@ public class CacheHelper {
      * @return
      */
     public static BasePaperCacheBean getBasePaper(String paperId) {
-        return ObjectRedisCacheProcessor.get("Q_BASE_PAPER:", new Object[]{paperId},
+        return ObjectRedisCacheProcessor.get("Q_PAPER:BASE_", new Object[]{paperId},
                 BasePaperCacheBean.class, "EC-CORE-QUESTION",
                 "cn.com.qmth.examcloud.core.questions.service.cache.BasePaperCache");
     }

src/main/java/cn/com/qmth/examcloud/support/cache/bean/ExtractConfigPaperCacheBean.java

@@ -0,0 +1,27 @@
+package cn.com.qmth.examcloud.support.cache.bean;
+
+import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
+import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
+
+/**
+ * @Description 调卷规则的试卷结构缓存实体
+ * @Author lideyin
+ * @Date 2019/7/30 14:36
+ */
+public class ExtractConfigPaperCacheBean extends RandomCacheBean {
+    private static final long serialVersionUID = 6309635978462557320L;
+
+    /**
+     * 试卷结构
+     */
+    private DefaultPaper defaultPaper;
+
+    public DefaultPaper getDefaultPaper() {
+        return defaultPaper;
+    }
+
+    public void setDefaultPaper(DefaultPaper defaultPaper) {
+        this.defaultPaper = defaultPaper;
+    }
+
+}