deason 5 rokov pred
rodič
commit
73f5333cba

+ 41 - 24
src/main/java/cn/com/qmth/examcloud/support/cache/CacheHelper.java

@@ -1,17 +1,6 @@
 package cn.com.qmth.examcloud.support.cache;
 
-import cn.com.qmth.examcloud.support.cache.bean.AppCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.BasePaperCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.CourseCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamOrgPropertyCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamOrgSettingsCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamRecordPropertyCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.ExamSettingsCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.PrivilegeRolesCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.RootOrgPrivilegesCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.SmsAssemblyCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.StudentCacheBean;
-import cn.com.qmth.examcloud.support.cache.bean.SysPropertyCacheBean;
+import cn.com.qmth.examcloud.support.cache.bean.*;
 import cn.com.qmth.examcloud.web.cache.ObjectRedisCacheProcessor;
 
 /**
@@ -101,18 +90,46 @@ public class CacheHelper {
 				"cn.com.qmth.examcloud.core.basic.service.cache.RootOrgPrrivilegesCache");
 	}
 
-	/**
-	 * 获取原始试卷(题库实现)
-	 *
-	 * @param examId
-	 * @param courseCode
-	 * @param paperType
-	 * @return
-	 */
-	public static BasePaperCacheBean getBasePaper(Long examId, String courseCode,
-			String paperType) {
-		return null;
-	}
+    /**
+     * 获取调卷规则的试卷结构(题库)
+     *
+     * @param examId
+     * @param courseCode
+     * @param groupCode
+     * @return
+     */
+    public static PaperCacheBean getPaper(Long examId, String courseCode, String groupCode) {
+        return ObjectRedisCacheProcessor.get("Q_PAPER:", new Object[]{examId, courseCode, groupCode},
+                PaperCacheBean.class, "EC-CORE-QUESTION",
+                "cn.com.qmth.examcloud.core.questions.service.cache.PaperCache");
+    }
+
+    /**
+     * 获取试卷结构(题库)
+     *
+     * @param paperId
+     * @return
+     */
+    public static BasePaperCacheBean getBasePaper(String paperId) {
+        return ObjectRedisCacheProcessor.get("Q_BASE_PAPER:", new Object[]{paperId},
+                BasePaperCacheBean.class, "EC-CORE-QUESTION",
+                "cn.com.qmth.examcloud.core.questions.service.cache.BasePaperCache");
+    }
+
+    /**
+     * 获取试题(题库)
+     *
+     * @param examId
+     * @param courseCode
+     * @param groupCode
+     * @param questionId
+     * @return
+     */
+    public static QuestionCacheBean getQuestion(Long examId, String courseCode, String groupCode, String questionId) {
+        return ObjectRedisCacheProcessor.get("Q_QUESTION:", new Object[]{examId, courseCode, groupCode, questionId},
+                QuestionCacheBean.class, "EC-CORE-QUESTION",
+                "cn.com.qmth.examcloud.core.questions.service.cache.QuestionCache");
+    }
 
 	/**
 	 * 查询课程

+ 13 - 56
src/main/java/cn/com/qmth/examcloud/support/cache/bean/BasePaperCacheBean.java

@@ -4,67 +4,24 @@ import cn.com.qmth.examcloud.question.commons.core.paper.DefaultPaper;
 import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
 
 /**
- * @Description 原始试卷缓存实体
+ * @Description 试卷结构缓存实体
  * @Author lideyin
  * @Date 2019/7/30 14:36
- * @Version 1.0
  */
 public class BasePaperCacheBean extends RandomCacheBean {
+    private static final long serialVersionUID = 6309635978462557320L;
 
-	private static final long serialVersionUID = 6309635978462557320L;
-	/**
-	 * 小题乱序
-	 * true:乱序
-	 * false:不乱序
-	 */
-	private Boolean sortQuestionOrder;
+    /**
+     * 试卷结构
+     */
+    private DefaultPaper defaultPaper;
 
-	/**
-	 * 选项乱序
-	 * ture:乱序
-	 * false:不乱序
-	 */
-	private Boolean sortOptionOrder;
+    public DefaultPaper getDefaultPaper() {
+        return defaultPaper;
+    }
 
-	/**
-	 * 原试卷id
-	 */
-	private String paperId;
+    public void setDefaultPaper(DefaultPaper defaultPaper) {
+        this.defaultPaper = defaultPaper;
+    }
 
-	/**
-	 * 试卷结构
-	 */
-	private DefaultPaper defaultPaper;
-
-	public Boolean getSortQuestionOrder() {
-		return sortQuestionOrder;
-	}
-
-	public void setSortQuestionOrder(Boolean sortQuestionOrder) {
-		this.sortQuestionOrder = sortQuestionOrder;
-	}
-
-	public Boolean getSortOptionOrder() {
-		return sortOptionOrder;
-	}
-
-	public void setSortOptionOrder(Boolean sortOptionOrder) {
-		this.sortOptionOrder = sortOptionOrder;
-	}
-
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public DefaultPaper getDefaultPaper() {
-		return defaultPaper;
-	}
-
-	public void setDefaultPaper(DefaultPaper defaultPaper) {
-		this.defaultPaper = defaultPaper;
-	}
-}
+}

+ 70 - 0
src/main/java/cn/com/qmth/examcloud/support/cache/bean/PaperCacheBean.java

@@ -0,0 +1,70 @@
+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 PaperCacheBean extends RandomCacheBean {
+    private static final long serialVersionUID = 6309635978462557320L;
+
+    /**
+     * 小题乱序
+     * true:乱序
+     * false:不乱序
+     */
+    private Boolean sortQuestionOrder;
+
+    /**
+     * 选项乱序
+     * ture:乱序
+     * false:不乱序
+     */
+    private Boolean sortOptionOrder;
+
+    /**
+     * 原试卷id
+     */
+    private String paperId;
+
+    /**
+     * 试卷结构
+     */
+    private DefaultPaper defaultPaper;
+
+    public Boolean getSortQuestionOrder() {
+        return sortQuestionOrder;
+    }
+
+    public void setSortQuestionOrder(Boolean sortQuestionOrder) {
+        this.sortQuestionOrder = sortQuestionOrder;
+    }
+
+    public Boolean getSortOptionOrder() {
+        return sortOptionOrder;
+    }
+
+    public void setSortOptionOrder(Boolean sortOptionOrder) {
+        this.sortOptionOrder = sortOptionOrder;
+    }
+
+    public String getPaperId() {
+        return paperId;
+    }
+
+    public void setPaperId(String paperId) {
+        this.paperId = paperId;
+    }
+
+    public DefaultPaper getDefaultPaper() {
+        return defaultPaper;
+    }
+
+    public void setDefaultPaper(DefaultPaper defaultPaper) {
+        this.defaultPaper = defaultPaper;
+    }
+
+}

+ 27 - 0
src/main/java/cn/com/qmth/examcloud/support/cache/bean/QuestionCacheBean.java

@@ -0,0 +1,27 @@
+package cn.com.qmth.examcloud.support.cache.bean;
+
+import cn.com.qmth.examcloud.question.commons.core.question.DefaultQuestion;
+import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
+
+/**
+ * @Description 试题缓存实体
+ * @Author lideyin
+ * @Date 2019/7/30 14:36
+ */
+public class QuestionCacheBean extends RandomCacheBean {
+    private static final long serialVersionUID = 6309635978462557320L;
+
+    /**
+     * 试题
+     */
+    private DefaultQuestion defaultQuestion;
+
+    public DefaultQuestion getDefaultQuestion() {
+        return defaultQuestion;
+    }
+
+    public void setDefaultQuestion(DefaultQuestion defaultQuestion) {
+        this.defaultQuestion = defaultQuestion;
+    }
+
+}