wangwei 5 年之前
父节点
当前提交
f5972db1db

+ 1 - 33
src/main/java/cn/com/qmth/examcloud/support/cache/bean/ExamOrgPropertyCacheBean.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.support.cache.bean;
 
-import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
-
 /**
  * 机构考试属性
  *
@@ -9,26 +7,12 @@ import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
  * @date 2019年8月8日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class ExamOrgPropertyCacheBean extends RandomCacheBean {
+public class ExamOrgPropertyCacheBean extends ExamPropertyCacheBean {
 
 	private static final long serialVersionUID = -8521363493722068369L;
 
-	private Long examId;
-
 	private Long orgId;
 
-	private String key;
-
-	private String value;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
 	public Long getOrgId() {
 		return orgId;
 	}
@@ -37,20 +21,4 @@ public class ExamOrgPropertyCacheBean extends RandomCacheBean {
 		this.orgId = orgId;
 	}
 
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
 }

+ 1 - 157
src/main/java/cn/com/qmth/examcloud/support/cache/bean/ExamOrgSettingsCacheBean.java

@@ -1,9 +1,5 @@
 package cn.com.qmth.examcloud.support.cache.bean;
 
-import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
-
-import java.util.Date;
-
 /**
  * 机构考试配置
  *
@@ -11,160 +7,8 @@ import java.util.Date;
  * @date 2019年8月8日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class ExamOrgSettingsCacheBean extends RandomCacheBean {
+public class ExamOrgSettingsCacheBean extends ExamSettingsCacheBean {
 
 	private static final long serialVersionUID = -8007446755455123835L;
 
-	private Long id;
-
-	/**
-	 * 考试编码
-	 */
-	private String code;
-
-	/**
-	 * 顶级机构Id
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 考试批次开始时间
-	 */
-	private Date beginTime;
-
-	/**
-	 * 考试批次结束时间
-	 */
-	private Date endTime;
-
-	/**
-	 * 考试名称
-	 */
-	private String name;
-
-	/**
-	 * 考试类型
-	 */
-	private String examType;
-
-	/**
-	 * 考试时长
-	 */
-	private Integer duration;
-
-	/**
-	 * 是否可用
-	 */
-	private Boolean enable;
-
-	/**
-	 * 考试备注
-	 */
-	private String remark;
-
-	/**
-	 * 考试次数
-	 */
-	private Long examTimes;
-
-	/**
-	 * 是否禁止考试
-	 */
-	private Boolean examLimit;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Date getBeginTime() {
-		return beginTime;
-	}
-
-	public void setBeginTime(Date beginTime) {
-		this.beginTime = beginTime;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getExamType() {
-		return examType;
-	}
-
-	public void setExamType(String examType) {
-		this.examType = examType;
-	}
-
-	public Integer getDuration() {
-		return duration;
-	}
-
-	public void setDuration(Integer duration) {
-		this.duration = duration;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Long getExamTimes() {
-		return examTimes;
-	}
-
-	public void setExamTimes(Long examTimes) {
-		this.examTimes = examTimes;
-	}
-
-	public Boolean getExamLimit() {
-		return examLimit;
-	}
-
-	public void setExamLimit(Boolean examLimit) {
-		this.examLimit = examLimit;
-	}
 }

+ 1 - 33
src/main/java/cn/com/qmth/examcloud/support/cache/bean/ExamStudentPropertyCacheBean.java

@@ -1,7 +1,5 @@
 package cn.com.qmth.examcloud.support.cache.bean;
 
-import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
-
 /**
  * 机构考试属性
  *
@@ -9,26 +7,12 @@ import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
  * @date 2019年8月8日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class ExamStudentPropertyCacheBean extends RandomCacheBean {
+public class ExamStudentPropertyCacheBean extends ExamPropertyCacheBean {
 
 	private static final long serialVersionUID = -8521363493722068369L;
 
-	private Long examId;
-
 	private Long studentId;
 
-	private String key;
-
-	private String value;
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
 	public Long getStudentId() {
 		return studentId;
 	}
@@ -37,20 +21,4 @@ public class ExamStudentPropertyCacheBean extends RandomCacheBean {
 		this.studentId = studentId;
 	}
 
-	public String getKey() {
-		return key;
-	}
-
-	public void setKey(String key) {
-		this.key = key;
-	}
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
 }

+ 1 - 157
src/main/java/cn/com/qmth/examcloud/support/cache/bean/ExamStudentSettingsCacheBean.java

@@ -1,9 +1,5 @@
 package cn.com.qmth.examcloud.support.cache.bean;
 
-import cn.com.qmth.examcloud.web.cache.RandomCacheBean;
-
-import java.util.Date;
-
 /**
  * 机构考试配置
  *
@@ -11,160 +7,8 @@ import java.util.Date;
  * @date 2019年8月8日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class ExamStudentSettingsCacheBean extends RandomCacheBean {
+public class ExamStudentSettingsCacheBean extends ExamSettingsCacheBean {
 
 	private static final long serialVersionUID = -8007446755455123835L;
 
-	private Long id;
-
-	/**
-	 * 考试编码
-	 */
-	private String code;
-
-	/**
-	 * 顶级机构Id
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 考试批次开始时间
-	 */
-	private Date beginTime;
-
-	/**
-	 * 考试批次结束时间
-	 */
-	private Date endTime;
-
-	/**
-	 * 考试名称
-	 */
-	private String name;
-
-	/**
-	 * 考试类型
-	 */
-	private String examType;
-
-	/**
-	 * 考试时长
-	 */
-	private Integer duration;
-
-	/**
-	 * 是否可用
-	 */
-	private Boolean enable;
-
-	/**
-	 * 考试备注
-	 */
-	private String remark;
-
-	/**
-	 * 考试次数
-	 */
-	private Long examTimes;
-
-	/**
-	 * 是否禁止考试
-	 */
-	private Boolean examLimit;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Date getBeginTime() {
-		return beginTime;
-	}
-
-	public void setBeginTime(Date beginTime) {
-		this.beginTime = beginTime;
-	}
-
-	public Date getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(Date endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getExamType() {
-		return examType;
-	}
-
-	public void setExamType(String examType) {
-		this.examType = examType;
-	}
-
-	public Integer getDuration() {
-		return duration;
-	}
-
-	public void setDuration(Integer duration) {
-		this.duration = duration;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public Long getExamTimes() {
-		return examTimes;
-	}
-
-	public void setExamTimes(Long examTimes) {
-		this.examTimes = examTimes;
-	}
-
-	public Boolean getExamLimit() {
-		return examLimit;
-	}
-
-	public void setExamLimit(Boolean examLimit) {
-		this.examLimit = examLimit;
-	}
 }