...

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/Course.java

@@ -1,108 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
-
-/**
- * 
- * @Description: 课程
- * @author ting.yin
- * @date 2017年1月5日
- */
-public class Course implements Serializable{
-
-	private static final long serialVersionUID = -6261302618070108336L;
-	
-    private Long id;
-
-	private String code;
-
-    private String name;
-
-	private Long orgId;
-	
-	private CourseLevel level;
-
-	private String createTime;
-
-	private String updateTime;
-
-	private Boolean enable;
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	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 String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-    public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public CourseLevel getLevel() {
-		return level;
-	}
-
-	public void setLevel(CourseLevel level) {
-		this.level = level;
-	}
-
-	public Course() {
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/CourseSpeciatly.java

@@ -1,74 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-public class CourseSpeciatly implements Serializable{
-
-	private static final long serialVersionUID = -250814769612993025L;
-	
-	private Long id;
-	
-	private Long courseId;
-	
-	private Long specialtyId;
-	
-	private Long creator;
-	
-	private Date createTime;
-
-	private Date updateTime;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getCourseId() {
-		return courseId;
-	}
-
-	public void setCourseId(Long courseId) {
-		this.courseId = courseId;
-	}
-
-	public Long getSpecialtyId() {
-		return specialtyId;
-	}
-
-	public void setSpecialtyId(Long specialtyId) {
-		this.specialtyId = specialtyId;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public Long getCreator() {
-		return creator;
-	}
-
-	public void setCreator(Long creator) {
-		this.creator = creator;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/CourseSync.java

@@ -1,92 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-
-/**
- * Created by songyue on 17/8/3.
- */
-public class CourseSync implements Serializable {
-
-	private static final long serialVersionUID = 8986880538637117108L;
-
-	private Long id;
-
-	private String code;
-
-	private String name;
-
-	private Long orgId;
-
-	private String level;
-
-	private String createTime;
-
-	private String updateTime;
-
-	private Boolean enable;
-
-	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 String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getLevel() {
-		return level;
-	}
-
-	public void setLevel(String level) {
-		this.level = level;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/ExamCourseDto.java

@@ -1,60 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-
-/**
- * @author  	chenken
- * @date    	2017年7月20日 上午9:49:03
- * @company 	QMTH
- * @description ExamCourseDto.java
- */
-public class ExamCourseDto {
-	private Long examId;
-    private String examName;
-    private ExamType examType;
-    private String courseName;
-    private String courseCode;
-	private Long orgId;
-    
-    public ExamCourseDto(){}
-    
-	public Long getExamId() {
-		return examId;
-	}
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-	public String getExamName() {
-		return examName;
-	}
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-	public ExamType getExamType() {
-		return examType;
-	}
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-	public String getCourseName() {
-		return courseName;
-	}
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-	public String getCourseCode() {
-		return courseCode;
-	}
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/Org.java

@@ -1,174 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-
-public class Org implements Serializable{
-
-    private static final long serialVersionUID = -592353272256492483L;
-
-    private Long id;
-    /**
-     * 顶级机构id，无上级时为0；eg.学校即是顶级
-     */
-    private Long rootId;
-    /**
-     * 父级机构id，无上级时为0；eg.学习中心的父级为学校
-     */
-    private Long parentId;
-
-    private Integer level;
-    
-    private String name;
-    
-    /**
-     * 学习中心代码
-     */
-    private String code;
-
-    private String logo;
-
-    private String address;
-
-    /**
-     * 可使用的应用模块
-     */
-    private String apps;
-
-    private Boolean enable;
-    
-    /**
-     * 联系电话
-     */
-    private String telphone;
-    /**
-     * 联系人
-     */
-    private String contacts;
-
-    private String createTime;
-
-    private String updateTime;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getRootId() {
-        return rootId;
-    }
-
-    public void setRootId(Long rootId) {
-        this.rootId = rootId;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getApps() {
-        return apps;
-    }
-
-    public void setApps(String apps) {
-        this.apps = apps;
-    }
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-    public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getTelphone() {
-		return telphone;
-	}
-
-	public void setTelphone(String telphone) {
-		this.telphone = telphone;
-	}
-
-	public String getContacts() {
-		return contacts;
-	}
-
-	public void setContacts(String contacts) {
-		this.contacts = contacts;
-	}
-
-	public Org() {
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/OrgSync.java

@@ -1,174 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-
-public class OrgSync implements Serializable{
-
-    private static final long serialVersionUID = -592353272256492483L;
-
-    private Long id;
-    /**
-     * 顶级机构id，无上级时为0；eg.学校即是顶级
-     */
-    private Long rootId;
-    /**
-     * 父级机构id，无上级时为0；eg.学习中心的父级为学校
-     */
-    private Long parentId;
-
-    private Integer level;
-
-    private String name;
-
-    /**
-     * 学习中心代码
-     */
-    private String code;
-
-    private String logo;
-
-    private String address;
-
-    /**
-     * 可使用的应用模块
-     */
-    private String apps;
-
-    private Boolean enable;
-
-    /**
-     * 联系电话
-     */
-    private String telphone;
-    /**
-     * 联系人
-     */
-    private String contacts;
-
-    private String createTime;
-
-    private String updateTime;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getRootId() {
-        return rootId;
-    }
-
-    public void setRootId(Long rootId) {
-        this.rootId = rootId;
-    }
-
-    public Long getParentId() {
-        return parentId;
-    }
-
-    public void setParentId(Long parentId) {
-        this.parentId = parentId;
-    }
-
-    public Integer getLevel() {
-        return level;
-    }
-
-    public void setLevel(Integer level) {
-        this.level = level;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLogo() {
-        return logo;
-    }
-
-    public void setLogo(String logo) {
-        this.logo = logo;
-    }
-
-    public String getAddress() {
-        return address;
-    }
-
-    public void setAddress(String address) {
-        this.address = address;
-    }
-
-    public String getApps() {
-        return apps;
-    }
-
-    public void setApps(String apps) {
-        this.apps = apps;
-    }
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-    public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public String getTelphone() {
-		return telphone;
-	}
-
-	public void setTelphone(String telphone) {
-		this.telphone = telphone;
-	}
-
-	public String getContacts() {
-		return contacts;
-	}
-
-	public void setContacts(String contacts) {
-		this.contacts = contacts;
-	}
-
-	public OrgSync() {
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/Specialty.java

@@ -1,84 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-public class Specialty implements Serializable{
-
-	private static final long serialVersionUID = 239263456816448160L;
-	
-	private Long id;
-	
-	private String code;
-
-	private String name;
-	
-	private Long orgId;
-	
-	private Date createTime;
-	
-	private Date updateTime;
-	
-	private Boolean enable;
-
-	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 String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Date getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(Date updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/SpecialtySync.java

@@ -1,64 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-import java.util.Date;
-
-
-public class SpecialtySync implements Serializable{
-
-	private static final long serialVersionUID = 239263456816448160L;
-	
-	private Long id;
-	
-	private String code;
-
-	private String name;
-	
-	private Long orgId;
-
-	private Boolean enable;
-
-	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 String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/Student.java

@@ -1,139 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-
-public class Student implements Serializable {
-
-	private static final long serialVersionUID = 757531976286006550L;
-
-	private Long id;
-	
-	private User user;
-
-	private String name;
-
-	private String studentCode;
-
-	private String identityNumber;
-	
-	private String phoneNumber;
-
-	private String photoPath;
-
-	private String remark;
-
-	private String createTime;
-
-	private String updateTime;
-
-	private Long orgId;
-
-	private Long rootOrgId;
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public User getUser() {
-		return user;
-	}
-
-	public void setUser(User user) {
-		this.user = user;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getPhotoPath() {
-		return photoPath;
-	}
-
-	public void setPhotoPath(String photoPath) {
-		this.photoPath = photoPath;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-
-	public Student() {
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/StudentFaceInfo.java

@@ -1,126 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-import java.util.Date;
-
-public class StudentFaceInfo implements Serializable {
-
-	private static final long serialVersionUID = -4192537584889662390L;
-
-	private Long id;
-	
-	private Student student;
-
-	private String faceToken;
-
-	private String faceSetToken;
-	
-	private String photoMD5;
-	/**
-	 * 创建时间
-	 */
-	private String createTime;
-	/**
-	 * 创建人
-	 */
-	private String createUser;
-	/**
-	 * 更新时间
-	 */
-	private String updateTime;
-	/**
-	 * 更新人
-	 */
-	private String updateUser;
-	/**
-	 * 创建方式
-	 * 接口-单个
-	 * 接口-ZIP批量
-	 * 照片上传工具
-	 */
-	private String createType;
-	
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Student getStudent() {
-		return student;
-	}
-
-	public void setStudent(Student student) {
-		this.student = student;
-	}
-
-	public String getFaceToken() {
-		return faceToken;
-	}
-
-	public void setFaceToken(String faceToken) {
-		this.faceToken = faceToken;
-	}
-
-	public String getFaceSetToken() {
-		return faceSetToken;
-	}
-
-	public void setFaceSetToken(String faceSetToken) {
-		this.faceSetToken = faceSetToken;
-	}
-
-	public String getPhotoMD5() {
-		return photoMD5;
-	}
-
-	public void setPhotoMD5(String photoMD5) {
-		this.photoMD5 = photoMD5;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public StudentFaceInfo() {}
-
-	public String getCreateUser() {
-		return createUser;
-	}
-
-	public void setCreateUser(String createUser) {
-		this.createUser = createUser;
-	}
-
-	public String getUpdateUser() {
-		return updateUser;
-	}
-
-	public void setUpdateUser(String updateUser) {
-		this.updateUser = updateUser;
-	}
-
-	public String getCreateType() {
-		return createType;
-	}
-
-	public void setCreateType(String createType) {
-		this.createType = createType;
-	}
-	
-	
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/StudentSync.java

@@ -1,71 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-
-public class StudentSync implements Serializable {
-
-	private static final long serialVersionUID = -8870159040911053529L;
-
-	private Long id;
-
-	private String name;
-
-	private String studentCode;
-
-	private String identityNumber;
-
-	private Long orgId;
-
-	private Long rootOrgId;
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public StudentSync() {
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/User.java

@@ -1,171 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core;
-
-import java.io.Serializable;
-
-import cn.com.qmth.examcloud.common.dto.core.enums.Gender;
-import cn.com.qmth.examcloud.common.dto.core.enums.UserScope;
-import cn.com.qmth.examcloud.common.dto.core.enums.UserType;
-
-public class User implements Serializable{
-
-    private static final long serialVersionUID = 9190180279768027647L;
-
-    private Long id;
-
-    private Long rootOrgId;
-
-    private Long orgId;
-
-    private String name;
-
-    private String loginName;
-
-    private String password;
-
-    private String mobile;
-
-    private Gender gender;
-
-    private UserScope scope;
-
-    private String avatar;
-
-    private UserType type;
-
-    private boolean enable;
-
-    private String createTime;
-
-    private String updateTime;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getRootOrgId() {
-        return rootOrgId;
-    }
-
-    public void setRootOrgId(Long rootOrgId) {
-        this.rootOrgId = rootOrgId;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getLoginName() {
-        return loginName;
-    }
-
-    public void setLoginName(String loginName) {
-        this.loginName = loginName;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getMobile() {
-        return mobile;
-    }
-
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
-
-    public Gender getGender() {
-        return gender;
-    }
-
-    public void setGender(Gender gender) {
-        this.gender = gender;
-    }
-
-    public UserScope getScope() {
-        return scope;
-    }
-
-    public void setScope(UserScope scope) {
-        this.scope = scope;
-    }
-
-    public String getAvatar() {
-        return avatar;
-    }
-
-    public void setAvatar(String avatar) {
-        this.avatar = avatar;
-    }
-
-    public UserType getType() {
-        return type;
-    }
-
-    public void setType(UserType type) {
-        this.type = type;
-    }
-
-    public boolean isEnable() {
-        return enable;
-    }
-
-    public void setEnable(boolean enable) {
-        this.enable = enable;
-    }
-
-    public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public User() {
-    }
-    
-    public User(String name,UserScope scope,Long rootOrgId,Long orgId,UserType type) {
-    	this.name = name;
-    	this.scope = scope;
-    	this.rootOrgId = rootOrgId;
-    	this.orgId = orgId;
-    	this.type = type;
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/enums/Gender.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core.enums;
-
-/**
- * Created by songyue on 17/2/22.
- */
-public enum Gender {
-    MAN,WOMAN
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/enums/UserScope.java

@@ -1,8 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core.enums;
-
-/**
- * Created by songyue on 17/2/22.
- */
-public enum UserScope {
-    ALL,ORG
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/enums/UserType.java

@@ -1,59 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.core.enums;
-
-/**
- * 用户类型
- *
- * @author WANGWEI
- * @date 2018年5月25日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public enum UserType {
-
-	/**
-	 * 学生
-	 */
-	STUDENT("S", "学生"),
-
-	/**
-	 * 常规用户
-	 */
-	COMMON("C", "常规用户");
-
-	// ===========================================================================
-
-	/**
-	 * 码
-	 */
-	private String code;
-
-	/**
-	 * 描述
-	 */
-	private String desc;
-
-	/**
-	 * 构造函数
-	 *
-	 * @param code
-	 * @param desc
-	 */
-	private UserType(String code, String desc) {
-		this.code = code;
-		this.desc = desc;
-	}
-
-	/**
-	 * @return the code
-	 */
-	public String getCode() {
-		return code;
-	}
-
-	/**
-	 * @return the desc
-	 */
-	public String getDesc() {
-		return desc;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/Exam.java

@@ -1,430 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.em;
-
-import java.io.Serializable;
-
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
-import cn.com.qmth.examcloud.common.dto.em.enums.PracticeType;
-
-public class Exam implements Serializable {
-
-	private static final long serialVersionUID = 4009839764353162256L;
-
-	private long id;
-
-	/**
-	 * 顶级机构Id
-	 */
-	private Long rootOrgId;
-
-	private String beginTime;
-
-	private String endTime;
-
-	private String name;
-
-	private ExamType examType;
-
-	private Boolean isEntranceExam;
-
-	/**
-	 * 考试时长
-	 */
-	private Integer duration;
-
-	/**
-	 * 冻结时间
-	 */
-	private Integer freezeTime;
-
-	private String status;
-
-	private String remark;
-
-	private String createTime;
-
-	/**
-	 * 考试次数
-	 */
-	private Long examTimes;
-
-	/**
-	 * 断点续考时间(秒)
-	 */
-	private Long examReconnectTime;
-
-	/**
-	 * 考前说明
-	 */
-	private String beforeExamRemark;
-
-	/**
-	 * 考后说明
-	 */
-	private String afterExamRemark;
-
-	/**
-	 * 是否显示客观题分数
-	 */
-	private String isObjScoreView;
-
-	/**
-	 * 练习模式
-	 */
-	private PracticeType practiceType;
-
-	/**
-	 * 单选题补充说明
-	 */
-	private String singleAnswerRemark;
-
-	/**
-	 * 多选题补充说明
-	 */
-	private String mutipleAnswerRemark;
-
-	/**
-	 * 判断题补充说明
-	 */
-	private String boolAnswerRemark;
-
-	/**
-	 * 填空题补充说明
-	 */
-	private String fillBlankRemark;
-
-	/**
-	 * 问答题补充说明
-	 */
-	private String textAnswerRemark;
-
-	/**
-	 * 套题补充说明
-	 */
-	private String nestedAnswerRemark;
-
-	/**
-	 * 是否启用人脸识别
-	 */
-	private String isFaceEnable;
-
-	/**
-	 * 进入考试是否验证人脸识别(强制、非强制)
-	 */
-	private String isFaceCheck;
-
-	/**
-	 * 抓拍间隔
-	 */
-	private Double snapshotInterval;
-
-	/**
-	 * 预警阈值
-	 */
-	private Double warnThreshold;
-
-	/**
-	 * 阅卷方式
-	 */
-	private MarkingType markingType;
-
-	private Boolean enable;
-
-	/**
-	 * 是否开启人脸活体检测
-	 */
-	private Boolean isFaceVerify;
-
-	/**
-	 * 活体检测开始分钟数
-	 */
-	private Integer faceVerifyStartMinute;
-
-	/**
-	 * 活体检测结束分钟数
-	 */
-	private Integer faceVerifyEndMinute;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public static long getSerialVersionUID() {
-		return serialVersionUID;
-	}
-
-	public ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
-	public Integer getDuration() {
-		return duration;
-	}
-
-	public void setDuration(Integer duration) {
-		this.duration = duration;
-	}
-
-	public Integer getFreezeTime() {
-		return freezeTime;
-	}
-
-	public void setFreezeTime(Integer freezeTime) {
-		this.freezeTime = freezeTime;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getBeginTime() {
-		return beginTime;
-	}
-
-	public void setBeginTime(String beginTime) {
-		this.beginTime = beginTime;
-	}
-
-	public String getEndTime() {
-		return endTime;
-	}
-
-	public void setEndTime(String endTime) {
-		this.endTime = endTime;
-	}
-
-	public String getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(String createTime) {
-		this.createTime = createTime;
-	}
-
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getExamTimes() {
-		return examTimes;
-	}
-
-	public void setExamTimes(Long examTimes) {
-		this.examTimes = examTimes;
-	}
-
-	public Long getExamReconnectTime() {
-		return examReconnectTime;
-	}
-
-	public void setExamReconnectTime(Long examReconnectTime) {
-		this.examReconnectTime = examReconnectTime;
-	}
-
-	public String getBeforeExamRemark() {
-		return beforeExamRemark;
-	}
-
-	public void setBeforeExamRemark(String beforeExamRemark) {
-		this.beforeExamRemark = beforeExamRemark;
-	}
-
-	public String getAfterExamRemark() {
-		return afterExamRemark;
-	}
-
-	public void setAfterExamRemark(String afterExamRemark) {
-		this.afterExamRemark = afterExamRemark;
-	}
-
-	public PracticeType getPracticeType() {
-		return practiceType;
-	}
-
-	public void setPracticeType(PracticeType practiceType) {
-		this.practiceType = practiceType;
-	}
-
-	public String getSingleAnswerRemark() {
-		return singleAnswerRemark;
-	}
-
-	public void setSingleAnswerRemark(String singleAnswerRemark) {
-		this.singleAnswerRemark = singleAnswerRemark;
-	}
-
-	public String getMutipleAnswerRemark() {
-		return mutipleAnswerRemark;
-	}
-
-	public void setMutipleAnswerRemark(String mutipleAnswerRemark) {
-		this.mutipleAnswerRemark = mutipleAnswerRemark;
-	}
-
-	public String getBoolAnswerRemark() {
-		return boolAnswerRemark;
-	}
-
-	public void setBoolAnswerRemark(String boolAnswerRemark) {
-		this.boolAnswerRemark = boolAnswerRemark;
-	}
-
-	public String getFillBlankRemark() {
-		return fillBlankRemark;
-	}
-
-	public void setFillBlankRemark(String fillBlankRemark) {
-		this.fillBlankRemark = fillBlankRemark;
-	}
-
-	public String getTextAnswerRemark() {
-		return textAnswerRemark;
-	}
-
-	public void setTextAnswerRemark(String textAnswerRemark) {
-		this.textAnswerRemark = textAnswerRemark;
-	}
-
-	public String getNestedAnswerRemark() {
-		return nestedAnswerRemark;
-	}
-
-	public void setNestedAnswerRemark(String nestedAnswerRemark) {
-		this.nestedAnswerRemark = nestedAnswerRemark;
-	}
-
-	public String getIsFaceEnable() {
-		return isFaceEnable;
-	}
-
-	public void setIsFaceEnable(String isFaceEnable) {
-		this.isFaceEnable = isFaceEnable;
-	}
-
-	public String getIsFaceCheck() {
-		return isFaceCheck;
-	}
-
-	public void setIsFaceCheck(String isFaceCheck) {
-		this.isFaceCheck = isFaceCheck;
-	}
-
-	public Double getSnapshotInterval() {
-		return snapshotInterval;
-	}
-
-	public void setSnapshotInterval(Double snapshotInterval) {
-		this.snapshotInterval = snapshotInterval;
-	}
-
-	public Double getWarnThreshold() {
-		return warnThreshold;
-	}
-
-	public void setWarnThreshold(Double warnThreshold) {
-		this.warnThreshold = warnThreshold;
-	}
-
-	public MarkingType getMarkingType() {
-		return markingType;
-	}
-
-	public void setMarkingType(MarkingType markingType) {
-		this.markingType = markingType;
-	}
-
-	public String getIsObjScoreView() {
-		return isObjScoreView;
-	}
-
-	public void setIsObjScoreView(String isObjScoreView) {
-		this.isObjScoreView = isObjScoreView;
-	}
-
-	public Boolean getEnable() {
-		return enable;
-	}
-
-	public void setEnable(Boolean enable) {
-		this.enable = enable;
-	}
-
-	public Boolean getEntranceExam() {
-		return isEntranceExam;
-	}
-
-	public void setEntranceExam(Boolean entranceExam) {
-		isEntranceExam = entranceExam;
-	}
-
-	public Boolean getIsEntranceExam() {
-		return isEntranceExam;
-	}
-
-	public void setIsEntranceExam(Boolean isEntranceExam) {
-		this.isEntranceExam = isEntranceExam;
-	}
-
-	public Boolean getIsFaceVerify() {
-		return isFaceVerify;
-	}
-
-	public void setIsFaceVerify(Boolean isFaceVerify) {
-		this.isFaceVerify = isFaceVerify;
-	}
-
-	public Integer getFaceVerifyStartMinute() {
-		return faceVerifyStartMinute;
-	}
-
-	public void setFaceVerifyStartMinute(Integer faceVerifyStartMinute) {
-		this.faceVerifyStartMinute = faceVerifyStartMinute;
-	}
-
-	public Integer getFaceVerifyEndMinute() {
-		return faceVerifyEndMinute;
-	}
-
-	public void setFaceVerifyEndMinute(Integer faceVerifyEndMinute) {
-		this.faceVerifyEndMinute = faceVerifyEndMinute;
-	}
-
-	public Exam() {
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/ExamRecord.java

@@ -1,529 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.em;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import cn.com.qmth.examcloud.common.dto.em.Exam;
-import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.common.dto.em.enums.GenerateStudentPaperStatus;
-import cn.com.qmth.examcloud.common.dto.em.enums.IsSuccess;
-import cn.com.qmth.examcloud.common.dto.question.PaperDto;
-
-/**
- * 考试记录
- *
- * @author xudengqi
- *         2016年8月16日
- */
-public class ExamRecord implements Serializable {
-
-    private static final long serialVersionUID = 1L;
-    
-    private Long id;
-    /**
-     * 学生报考信息
-     */
-    private Long examStudentId;
-    /**
-     * 专业层次
-     */
-    private String specialtyLevel;
-    /**
-     * 专业code
-     */
-    private String specialtyCode;
-    /**
-     * 专业名称
-     */
-    private String specialtyName;
-    /**
-     * 考生学号
-     */
-    private String studentCode;
-    /**
-     * 身份证号
-     */
-    private String identityNumber;
-    /**
-     * 考生姓名
-     */
-    private String studentName;
-    /**
-     * 课程code
-     */
-    private String courseCode;
-    /**
-     * 课程层次
-     */
-    private String courseLevel;
-    /**
-     * 学习中心ID
-     */
-    private Long campusId;
-
-    /**
-     * 学校信息
-     */
-    private Long orgId;
-
-    /**
-     * 关联批次
-     */
-    private Long batchId;
-
-    /**
-     * 考生用户ID
-     */
-    private Long stuUserId;
-
-    /**
-     * 考试状态
-     */
-    private ExamRecordStatus status;
-
-    private GenerateStudentPaperStatus genStuPaper;
-    /**
-     * 开始答卷时间
-     */
-    private Date startTime;
-    /**
-     * 交卷时间
-     */
-    private Date endTime;
-    /**
-     * 系统清理时间
-     */
-    private Date cleanTime;
-
-    /**
-     * 监督操作  1违纪   2重考  3正常
-     */
-    private int invigilatorOperation;
-
-    /**
-     * 重考类型ID
-     */
-    private Long retakeTypeId;
-    /**
-     * 重考详情
-     */
-    private String retakeDetail;
-
-    /**
-     * 监考是否已审核
-     */
-    private Boolean isAudit;
-    /**
-     * 抓拍总次数
-     */
-    private Integer totalCount;
-    /**
-     * 成功次数
-     */
-    private Integer succCount;
-    /**
-     * 失败次数
-     */
-    private Integer falseCount;
-    /**
-     * 陌生人次数
-     */
-    private Integer strangerCount;
-    /**
-     * 成功率
-     */
-    private Double succPercent;
-    /**
-     * 是否预警数据
-     */
-    private Boolean isWarn;
-    /**
-     * 是否断点续考
-     */
-    private Boolean isContinued;
-    /**
-     * 续考次数
-     */
-    private Integer continuedCount;
-    /**
-     * 考试次数（第几次）
-     */
-    private Integer examOrder;
-    /**
-     * 试卷编号
-     */
-    private String paperNumber;
-    /**
-     * 考试类型
-     */
-    private String examType;
-    /**
-     * 考生考试使用的考试时长
-     */
-    private long usedExamTime;
-
-    private String paperType;
-
-    private String infoCollector;
-    
-    /**
-	 * 是否为重考
-	 */
-	private Boolean isReexamine;
-	/**
-	 * 考试人脸检测启动分钟数
-	 */
-	private Integer faceVerifyMinute;
-	/**
-	 * 人脸检测结果
-	 */
-	private IsSuccess faceVerifyResult;
-	/**
-	 * 考生试卷id
-	 */
-    private String paperId;
-    
-    private Double landmarkVal;
-    
-    public ExamRecord() {
-        super();
-    }
-    
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-    public Long getExamStudentId() {
-        return examStudentId;
-    }
-
-    public void setExamStudentId(Long examStudentId) {
-        this.examStudentId = examStudentId;
-    }
-
-    public Long getBatchId() {
-        return batchId;
-    }
-
-    public void setBatchId(Long batchId) {
-        this.batchId = batchId;
-    }
-
-    public Long getStuUserId() {
-        return stuUserId;
-    }
-
-    public void setStuUserId(Long stuUserId) {
-        this.stuUserId = stuUserId;
-    }
-
-    public ExamRecordStatus getStatus() {
-        return status;
-    }
-
-    public void setStatus(ExamRecordStatus status) {
-        this.status = status;
-    }
-
-    public Date getStartTime() {
-        return startTime;
-    }
-
-    public void setStartTime(Date startTime) {
-        this.startTime = startTime;
-    }
-
-    public Date getEndTime() {
-        return endTime;
-    }
-
-    public void setEndTime(Date endTime) {
-        this.endTime = endTime;
-    }
-
-    public int getInvigilatorOperation() {
-        return invigilatorOperation;
-    }
-
-    public void setInvigilatorOperation(int invigilatorOperation) {
-        this.invigilatorOperation = invigilatorOperation;
-    }
-
-    public Long getRetakeTypeId() {
-        return retakeTypeId;
-    }
-
-    public void setRetakeTypeId(Long retakeTypeId) {
-        this.retakeTypeId = retakeTypeId;
-    }
-
-    public String getRetakeDetail() {
-        return retakeDetail;
-    }
-
-    public void setRetakeDetail(String retakeDetail) {
-        this.retakeDetail = retakeDetail;
-    }
-
-    public Boolean getIsAudit() {
-        return isAudit;
-    }
-
-    public void setIsAudit(Boolean isAudit) {
-        this.isAudit = isAudit;
-    }
-
-    public Integer getTotalCount() {
-        return totalCount;
-    }
-
-    public void setTotalCount(Integer totalCount) {
-        this.totalCount = totalCount;
-    }
-
-    public Integer getSuccCount() {
-        return succCount;
-    }
-
-    public void setSuccCount(Integer succCount) {
-        this.succCount = succCount;
-    }
-
-    public Integer getFalseCount() {
-        return falseCount;
-    }
-
-    public void setFalseCount(Integer falseCount) {
-        this.falseCount = falseCount;
-    }
-
-    public Integer getStrangerCount() {
-        return strangerCount;
-    }
-
-    public void setStrangerCount(Integer strangerCount) {
-        this.strangerCount = strangerCount;
-    }
-
-    public Double getSuccPercent() {
-        return succPercent;
-    }
-
-    public void setSuccPercent(Double succPercent) {
-        this.succPercent = succPercent;
-    }
-
-    public Boolean getIsWarn() {
-        return isWarn;
-    }
-
-    public void setIsWarn(Boolean isWarn) {
-        this.isWarn = isWarn;
-    }
-
-    public Boolean getIsContinued() {
-        return isContinued;
-    }
-
-    public void setIsContinued(Boolean isContinued) {
-        this.isContinued = isContinued;
-    }
-
-    public Integer getContinuedCount() {
-        return continuedCount;
-    }
-
-    public void setContinuedCount(Integer continuedCount) {
-        this.continuedCount = continuedCount;
-    }
-
-    public Integer getExamOrder() {
-        return examOrder;
-    }
-
-    public void setExamOrder(Integer examOrder) {
-        this.examOrder = examOrder;
-    }
-
-    public String getPaperNumber() {
-        return paperNumber;
-    }
-
-    public void setPaperNumber(String paperNumber) {
-        this.paperNumber = paperNumber;
-    }
-
-    public String getExamType() {
-        return examType;
-    }
-
-    public void setExamType(String examType) {
-        this.examType = examType;
-    }
-
-    public long getUsedExamTime() {
-        return usedExamTime;
-    }
-
-    public void setUsedExamTime(long usedExamTime) {
-        this.usedExamTime = usedExamTime;
-    }
-
-    public Long getOrgId() {
-        return orgId;
-    }
-
-    public void setOrgId(Long orgId) {
-        this.orgId = orgId;
-    }
-
-    public String getSpecialtyLevel() {
-        return specialtyLevel;
-    }
-
-    public void setSpecialtyLevel(String specialtyLevel) {
-        this.specialtyLevel = specialtyLevel;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public Long getCampusId() {
-        return campusId;
-    }
-
-    public void setCampusId(Long campusId) {
-        this.campusId = campusId;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-    public String getIdentityNumber() {
-        return identityNumber;
-    }
-
-    public void setIdentityNumber(String identityNumber) {
-        this.identityNumber = identityNumber;
-    }
-
-    public Date getCleanTime() {
-        return cleanTime;
-    }
-
-    public void setCleanTime(Date cleanTime) {
-        this.cleanTime = cleanTime;
-    }
-
-    public GenerateStudentPaperStatus getGenStuPaper() {
-        return genStuPaper;
-    }
-
-    public void setGenStuPaper(GenerateStudentPaperStatus genStuPaper) {
-        this.genStuPaper = genStuPaper;
-    }
-
-    public String getPaperType() {
-        return paperType;
-    }
-
-    public void setPaperType(String paperType) {
-        this.paperType = paperType;
-    }
-
-    public String getInfoCollector() {
-        return infoCollector;
-    }
-
-    public void setInfoCollector(String infoCollector) {
-        this.infoCollector = infoCollector;
-    }
-
-	public String getSpecialtyCode() {
-		return specialtyCode;
-	}
-
-	public void setSpecialtyCode(String specialtyCode) {
-		this.specialtyCode = specialtyCode;
-	}
-
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
-
-	public Boolean getIsReexamine() {
-		return isReexamine;
-	}
-
-	public void setIsReexamine(Boolean isReexamine) {
-		this.isReexamine = isReexamine;
-	}
-
-	public Integer getFaceVerifyMinute() {
-		return faceVerifyMinute;
-	}
-
-	public void setFaceVerifyMinute(Integer faceVerifyMinute) {
-		this.faceVerifyMinute = faceVerifyMinute;
-	}
-	
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public IsSuccess getFaceVerifyResult() {
-		return faceVerifyResult;
-	}
-
-	public void setFaceVerifyResult(IsSuccess faceVerifyResult) {
-		this.faceVerifyResult = faceVerifyResult;
-	}
-
-	public Double getLandmarkVal() {
-		return landmarkVal;
-	}
-
-	public void setLandmarkVal(Double landmarkVal) {
-		this.landmarkVal = landmarkVal;
-	}
-	
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/ExamScore.java

@@ -1,105 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.em;
-
-import java.io.Serializable;
-
-
-/**
- * 考试成绩表
- *
- * @author xudengqi
- *         2016年9月2日
- */
-public class ExamScore implements Serializable {
-
-    private static final long serialVersionUID = 5980724505064662051L;
-
-    private Long id;
-    /**
-     * 考试记录
-     */
-    private ExamRecord examRecord;
-
-    /**
-     * 总分
-     */
-    private Double totalScore;
-
-    /**
-     * 客观题得分
-     */
-    private Double objectiveScore;
-    
-    /**
-     * 客观题答对的比率
-     * (客观题答对的题数/总题数)*100  取2位小数
-     */
-    private Double objectiveAccuracy;
-
-    /**
-     * 主观题得分
-     */
-    private Double subjectiveScore;
-
-    /**
-     * 答题正确率
-     */
-    private Double succPercent;
-
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
-
-    public ExamRecord getExamRecord() {
-        return examRecord;
-    }
-
-    public void setExamRecord(ExamRecord examRecord) {
-        this.examRecord = examRecord;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public Double getSuccPercent() {
-        return succPercent;
-    }
-
-    public void setSuccPercent(Double succPercent) {
-        this.succPercent = succPercent;
-    }
-
-    public Double getObjectiveScore() {
-        return objectiveScore;
-    }
-
-    public void setObjectiveScore(Double objectiveScore) {
-        this.objectiveScore = objectiveScore;
-    }
-
-    public Double getSubjectiveScore() {
-        return subjectiveScore;
-    }
-
-    public void setSubjectiveScore(Double subjectiveScore) {
-        this.subjectiveScore = subjectiveScore;
-    }
-
-    public Double getObjectiveAccuracy() {
-        return objectiveAccuracy;
-    }
-
-    public void setObjectiveAccuracy(Double objectiveAccuracy) {
-        this.objectiveAccuracy = objectiveAccuracy;
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/ExamSync.java

@@ -1,517 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.em;
-
-import java.io.Serializable;
-import java.util.Date;
-
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
-import cn.com.qmth.examcloud.common.dto.em.enums.PracticeType;
-
-public class ExamSync implements Serializable {
-
-    private static final long serialVersionUID = 4009839764353162256L;
-
-	private Long id;
-
-	/**
-	 * 机构Id
-	 */
-	private Long orgId;
-
-	/**
-	 * 顶级机构Id
-	 */
-	private Long rootOrgId;
-
-	/**
-	 * 考试批次开始时间
-     */
-	private Date beginTime;
-
-	/**
-	 * 考试批次结束时间
-     */
-	private Date endTime;
-
-	/**
-	 * 考试名称
-     */
-	private String name;
-
-	/**
-	 * 考试类型
-     */
-	private ExamType examType;
-
-	/**
-	 * 是否入学考试
-     */
-	private Boolean isEntranceExam;
-
-	/**
-	 * 考试时长
-	 */
-	private Integer duration;
-	/**
-	 * 冻结时间
-	 */
-	private Integer freezeTime;
-
-	/**
-	 * 考试状态
-     */
-	private String status;
-
-
-	private Boolean enable;
-
-	/**
-	 * 考试备注
-     */
-	private String remark;
-
-	/**
-	 * 创建时间
-     */
-	private Date createTime;
-
-	/**
-	 * 考试次数
-     */
-	private Long examTimes;
-
-	/**
-	 * 断点续考时间(秒)
-     */
-	private Long examReconnectTime;
-
-	/**
-	 * 考前说明
-     */
-	private String beforeExamRemark;
-
-	/**
-	 * 考后说明
-     */
-	private String afterExamRemark;
-
-	/**
-	 * 是否显示成绩
-     */
-	private String isObjScoreView;
-
-	/**
-	 * 练习模式
-     */
-	private PracticeType practiceType;
-
-	/**
-	 * 单选题补充说明是否可填
-	 */
-	private Boolean singleEdit;
-
-	/**
-	 * 多选题补充说明是否可填
-	 */
-	private Boolean mutipleEdit;
-
-	/**
-	 * 判断题补充说明是否可填
-	 */
-	private Boolean boolEdit;
-
-	/**
-	 * 填空题补充说明是否可填
-	 */
-	private Boolean fillBlankEdit;
-
-	/**
-	 * 单选题补充说明
-     */
-	private String singleAnswerRemark;
-
-	/**
-	 * 多选题补充说明
-     */
-	private String mutipleAnswerRemark;
-
-	/**
-	 * 判断题补充说明
-     */
-	private String boolAnswerRemark;
-
-	/**
-	 * 填空题补充说明
-     */
-	private String fillBlankRemark;
-
-	/**
-	 * 问答题补充说明
-     */
-	private String textAnswerRemark;
-
-	/**
-	 * 套题补充说明
-	 */
-	private String nestedAnswerRemark;
-
-	/**
-	 * 是否启用人脸识别
-     */
-	private String isFaceEnable;
-
-	/**
-	 * 进入考试是否验证人脸识别(强制、非强制)
-     */
-	private String isFaceCheck;
-
-	/**
-	 * 抓拍间隔
-     */
-	private Double snapshotInterval;
-
-	/**
-	 * 预警阈值
-     */
-	private Double warnThreshold;
-
-	/**
-	 * 阅卷方式
-     */
-	private MarkingType markingType;
-
-	/**
-	 * 学生是否可以删除
-     */
-	private Boolean canStuDel;
-	
-	/**
-	 * 是否开启人脸活体检测
-	 */
-	private Boolean isFaceVerify;
-	/**
-	 * 活体检测开始分钟数
-	 */
-	private Integer faceVerifyStartMinute;
-	/**
-	 * 活体检测结束分钟数
-	 */
-	private Integer faceVerifyEndMinute;
-
-	public ExamSync() {
-    }
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	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 ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
-	public Boolean getIsEntranceExam() {
-		return isEntranceExam;
-	}
-
-	public void setIsEntranceExam(Boolean isEntranceExam) {
-		this.isEntranceExam = isEntranceExam;
-	}
-
-	public Integer getDuration() {
-		return duration;
-	}
-
-	public void setDuration(Integer duration) {
-		this.duration = duration;
-	}
-
-	public Integer getFreezeTime() {
-		return freezeTime;
-	}
-
-	public void setFreezeTime(Integer freezeTime) {
-		this.freezeTime = freezeTime;
-	}
-
-	public String getStatus() {
-		return status;
-	}
-
-	public void setStatus(String status) {
-		this.status = status;
-	}
-
-	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 Date getCreateTime() {
-		return createTime;
-	}
-
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Long getExamTimes() {
-		return examTimes;
-	}
-
-	public void setExamTimes(Long examTimes) {
-		this.examTimes = examTimes;
-	}
-
-	public Long getExamReconnectTime() {
-		return examReconnectTime;
-	}
-
-	public void setExamReconnectTime(Long examReconnectTime) {
-		this.examReconnectTime = examReconnectTime;
-	}
-
-	public String getBeforeExamRemark() {
-		return beforeExamRemark;
-	}
-
-	public void setBeforeExamRemark(String beforeExamRemark) {
-		this.beforeExamRemark = beforeExamRemark;
-	}
-
-	public String getAfterExamRemark() {
-		return afterExamRemark;
-	}
-
-	public void setAfterExamRemark(String afterExamRemark) {
-		this.afterExamRemark = afterExamRemark;
-	}
-
-	public String getIsObjScoreView() {
-		return isObjScoreView;
-	}
-
-	public void setIsObjScoreView(String isObjScoreView) {
-		this.isObjScoreView = isObjScoreView;
-	}
-
-	public PracticeType getPracticeType() {
-		return practiceType;
-	}
-
-	public void setPracticeType(PracticeType practiceType) {
-		this.practiceType = practiceType;
-	}
-
-	public Boolean getSingleEdit() {
-		return singleEdit;
-	}
-
-	public void setSingleEdit(Boolean singleEdit) {
-		this.singleEdit = singleEdit;
-	}
-
-	public Boolean getMutipleEdit() {
-		return mutipleEdit;
-	}
-
-	public void setMutipleEdit(Boolean mutipleEdit) {
-		this.mutipleEdit = mutipleEdit;
-	}
-
-	public Boolean getBoolEdit() {
-		return boolEdit;
-	}
-
-	public void setBoolEdit(Boolean boolEdit) {
-		this.boolEdit = boolEdit;
-	}
-
-	public Boolean getFillBlankEdit() {
-		return fillBlankEdit;
-	}
-
-	public void setFillBlankEdit(Boolean fillBlankEdit) {
-		this.fillBlankEdit = fillBlankEdit;
-	}
-
-	public String getSingleAnswerRemark() {
-		return singleAnswerRemark;
-	}
-
-	public void setSingleAnswerRemark(String singleAnswerRemark) {
-		this.singleAnswerRemark = singleAnswerRemark;
-	}
-
-	public String getMutipleAnswerRemark() {
-		return mutipleAnswerRemark;
-	}
-
-	public void setMutipleAnswerRemark(String mutipleAnswerRemark) {
-		this.mutipleAnswerRemark = mutipleAnswerRemark;
-	}
-
-	public String getBoolAnswerRemark() {
-		return boolAnswerRemark;
-	}
-
-	public void setBoolAnswerRemark(String boolAnswerRemark) {
-		this.boolAnswerRemark = boolAnswerRemark;
-	}
-
-	public String getFillBlankRemark() {
-		return fillBlankRemark;
-	}
-
-	public void setFillBlankRemark(String fillBlankRemark) {
-		this.fillBlankRemark = fillBlankRemark;
-	}
-
-	public String getTextAnswerRemark() {
-		return textAnswerRemark;
-	}
-
-	public void setTextAnswerRemark(String textAnswerRemark) {
-		this.textAnswerRemark = textAnswerRemark;
-	}
-
-	public String getNestedAnswerRemark() {
-		return nestedAnswerRemark;
-	}
-
-	public void setNestedAnswerRemark(String nestedAnswerRemark) {
-		this.nestedAnswerRemark = nestedAnswerRemark;
-	}
-
-	public String getIsFaceEnable() {
-		return isFaceEnable;
-	}
-
-	public void setIsFaceEnable(String isFaceEnable) {
-		this.isFaceEnable = isFaceEnable;
-	}
-
-	public String getIsFaceCheck() {
-		return isFaceCheck;
-	}
-
-	public void setIsFaceCheck(String isFaceCheck) {
-		this.isFaceCheck = isFaceCheck;
-	}
-
-	public Double getSnapshotInterval() {
-		return snapshotInterval;
-	}
-
-	public void setSnapshotInterval(Double snapshotInterval) {
-		this.snapshotInterval = snapshotInterval;
-	}
-
-	public Double getWarnThreshold() {
-		return warnThreshold;
-	}
-
-	public void setWarnThreshold(Double warnThreshold) {
-		this.warnThreshold = warnThreshold;
-	}
-
-	public MarkingType getMarkingType() {
-		return markingType;
-	}
-
-	public void setMarkingType(MarkingType markingType) {
-		this.markingType = markingType;
-	}
-
-	public Boolean getCanStuDel() {
-		return canStuDel;
-	}
-
-	public void setCanStuDel(Boolean canStuDel) {
-		this.canStuDel = canStuDel;
-	}
-
-	public Boolean getIsFaceVerify() {
-		return isFaceVerify;
-	}
-
-	public void setIsFaceVerify(Boolean isFaceVerify) {
-		this.isFaceVerify = isFaceVerify;
-	}
-
-	public Integer getFaceVerifyStartMinute() {
-		return faceVerifyStartMinute;
-	}
-
-	public void setFaceVerifyStartMinute(Integer faceVerifyStartMinute) {
-		this.faceVerifyStartMinute = faceVerifyStartMinute;
-	}
-
-	public Integer getFaceVerifyEndMinute() {
-		return faceVerifyEndMinute;
-	}
-
-	public void setFaceVerifyEndMinute(Integer faceVerifyEndMinute) {
-		this.faceVerifyEndMinute = faceVerifyEndMinute;
-	}
-	
-	
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/marking/ExamCourseDTO.java

@@ -1,81 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.em.marking;
-
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-
-/**
- * Created by yuanpan on 2017/4/12.
- */
-public class ExamCourseDTO {
-
-    private Long examId;
-    private String examName;
-    private ExamType examType;
-    private String courseName;
-    private String courseCode;
-    /**
-     * 答卷数量
-     */
-    private long studentPaperCount;
-    
-    /**
-     * 分配的评卷员数量
-     */
-    private long markerCount;
-
-    public Long getExamId() {
-        return examId;
-    }
-
-    public void setExamId(Long examId) {
-        this.examId = examId;
-    }
-
-    public String getExamName() {
-        return examName;
-    }
-
-    public void setExamName(String examName) {
-        this.examName = examName;
-    }
-
-    public ExamType getExamType() {
-        return examType;
-    }
-
-    public void setExamType(ExamType examType) {
-        this.examType = examType;
-    }
-
-    public String getCourseName() {
-        return courseName;
-    }
-
-    public void setCourseName(String courseName) {
-        this.courseName = courseName;
-    }
-
-    public String getCourseCode() {
-        return courseCode;
-    }
-
-    public void setCourseCode(String courseCode) {
-        this.courseCode = courseCode;
-    }
-
-	public Long getStudentPaperCount() {
-		return studentPaperCount;
-	}
-
-	public void setStudentPaperCount(long studentPaperCount) {
-		this.studentPaperCount = studentPaperCount;
-	}
-
-	public Long getMarkerCount() {
-		return markerCount;
-	}
-
-	public void setMarkerCount(long markerCount) {
-		this.markerCount = markerCount;
-	}
-    
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/examwork/CommonExamStudent.java

@@ -1,125 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.examwork;
-
-import java.io.Serializable;
-
-/**
- * @author  	chenken
- * @date    	2018年1月15日 下午3:07:48
- * @company 	QMTH
- * @description ExamStudent.java
- */
-public class CommonExamStudent implements Serializable{
-	
-	private static final long serialVersionUID = -6784281319982374388L;
-	
-	private Long id;
-	/**
-	 * 考试批次ID
-	 */
-	private Long examId;
-	/**
-	 * 学习中心id
-	 */
-    private Long orgId;
-    /**
-	 * 课程code
-	 */
-	private String courseCode;
-	/**
-	 * 课程等级
-	 */
-	private String courseLevel;
-	/**
-	 * 考生姓名
-	 */
-	private String name;
-	/**
-	 * 学号
-	 */
-	private String studentCode;
-	/**
-	 * 身份证号
-	 */
-	private String identityNumber;
-	/**
-	 * 是否为重考
-	 */
-	private Boolean isReexamine;
-	/**
-	 * 重考原因类型
-	 */
-	private String reexamineType;
-	/**
-	 * 重考原因详情
-	 */
-	private String reexamineDetail;
-	
-	public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	public Long getExamId() {
-		return examId;
-	}
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-	public Long getOrgId() {
-		return orgId;
-	}
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-	public String getCourseCode() {
-		return courseCode;
-	}
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
-	public String getName() {
-		return name;
-	}
-	public void setName(String name) {
-		this.name = name;
-	}
-	public String getStudentCode() {
-		return studentCode;
-	}
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-	public Boolean getIsReexamine() {
-		return isReexamine;
-	}
-	public void setIsReexamine(Boolean isReexamine) {
-		this.isReexamine = isReexamine;
-	}
-	public String getReexamineType() {
-		return reexamineType;
-	}
-	public void setReexamineType(String reexamineType) {
-		this.reexamineType = reexamineType;
-	}
-	public String getReexamineDetail() {
-		return reexamineDetail;
-	}
-	public void setReexamineDetail(String reexamineDetail) {
-		this.reexamineDetail = reexamineDetail;
-	}
-	
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/IdEntity.java

@@ -1,14 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-public abstract class IdEntity {
-
-	private long id;
-
-	public long getId() {
-		return id;
-	}
-
-	public void setId(long id) {
-		this.id = id;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkCourseDTO.java

@@ -1,101 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-public class MarkCourseDTO {
-
-	private Long workId;
-
-	private String name;
-
-	private String code;
-
-	private Long totalCount;
-
-	private Long markedCount;
-
-	private Long leftCount;
-	
-	private Long rejectCount;
-
-	private double progress;
-	
-    /**
-     * 分配的评卷员数量
-     */
-    private long markerCount;
-	
-	public MarkCourseDTO() {
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public Long getWorkId() {
-		return workId;
-	}
-
-	public void setWorkId(Long workId) {
-		this.workId = workId;
-	}
-
-	public String getCode() {
-		return code;
-	}
-
-	public void setCode(String code) {
-		this.code = code;
-	}
-
-	public Long getTotalCount() {
-		return totalCount;
-	}
-
-	public void setTotalCount(Long totalCount) {
-		this.totalCount = totalCount;
-	}
-
-	public Long getMarkedCount() {
-		return markedCount;
-	}
-
-	public void setMarkedCount(Long markedCount) {
-		this.markedCount = markedCount;
-	}
-
-	public Long getLeftCount() {
-		return leftCount;
-	}
-
-	public void setLeftCount(Long leftCount) {
-		this.leftCount = leftCount;
-	}
-
-	public double getProgress() {
-		return progress;
-	}
-
-	public void setProgress(double progress) {
-		this.progress = progress;
-	}
-
-	public Long getRejectCount() {
-		return rejectCount;
-	}
-
-	public void setRejectCount(Long rejectCount) {
-		this.rejectCount = rejectCount;
-	}
-
-	public long getMarkerCount() {
-		return markerCount;
-	}
-
-	public void setMarkerCount(long markerCount) {
-		this.markerCount = markerCount;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkItem.java

@@ -1,186 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-
-
-/**
- * 评卷项
- */
-public class MarkItem extends IdEntity {
-
-    enum ScoringType{
-        /**
-         * 根据给分间隔
-         */
-        INTERVAL,
-        /**
-         * 人工指定给分列表
-         */
-        MANUAL
-    }
-
-    private String paperId;
-
-    private Long workId;
-
-    private Long markRangeId;
-
-    /**
-     * 大题号
-     */
-    private int mainNumber;
-
-    /**
-     * 小题号
-     */
-    private int subNumber;
-    
-    /**
-     * 全卷范围内排序
-     */
-    private int orders;
-
-    /**
-     * 分值
-     */
-    private double maxScore;
-
-    /**
-     * 给分方式
-     */
-    private ScoringType scoringType;
-
-    /**
-     * 给分间隔
-     */
-    private Double scoreInterval;
-
-    /**
-     * 给分列表
-     */
-    private String socreList;
-
-    public MarkItem(){}
-
-    public MarkItem(String paperId, int mainNumber,int subNumber,double maxScore, Double scoreInterval,int orders) {
-        this.paperId = paperId;
-        this.mainNumber = mainNumber;
-        this.subNumber = subNumber;
-        this.maxScore = maxScore;
-        this.scoreInterval = scoreInterval == null ? 1 : scoreInterval;
-        this.scoringType = ScoringType.INTERVAL;
-        this.orders = orders;
-    }
-
-    public MarkItem(String paperId, int mainNumber,int subNumber,double maxScore,String socreList) {
-        this.paperId = paperId;
-        this.mainNumber = mainNumber;
-        this.subNumber = subNumber;
-        this.maxScore = maxScore;
-        this.socreList = socreList == null ? String.valueOf(this.maxScore) : socreList;
-        this.scoringType = ScoringType.MANUAL;
-    }
-
-    public Long getWorkId() {
-        return workId;
-    }
-
-    public void setWorkId(Long workId) {
-        this.workId = workId;
-    }
-
-    public int getMainNumber() {
-        return mainNumber;
-    }
-
-    public void setMainNumber(int mainNumber) {
-        this.mainNumber = mainNumber;
-    }
-
-    public int getSubNumber() {
-        return subNumber;
-    }
-
-    public void setSubNumber(int subNumber) {
-        this.subNumber = subNumber;
-    }
-
-    public double getMaxScore() {
-        return maxScore;
-    }
-
-    public void setMaxScore(double maxScore) {
-        this.maxScore = maxScore;
-    }
-
-    public ScoringType getScoringType() {
-        return scoringType;
-    }
-
-    public void setScoringType(ScoringType scoringType) {
-        this.scoringType = scoringType;
-    }
-
-    public Double getScoreInterval() {
-        return scoreInterval;
-    }
-
-    public void setScoreInterval(Double scoreInterval) {
-        this.scoreInterval = scoreInterval;
-    }
-
-    public String getSocreList() {
-        return socreList;
-    }
-
-    public void setSocreList(String socreList) {
-        this.socreList = socreList;
-    }
-
-    public String getPaperId() {
-        return paperId;
-    }
-
-    public void setPaperId(String paperId) {
-        this.paperId = paperId;
-    }
-
-    public Long getMarkRangeId() {
-        return markRangeId;
-    }
-
-    public void setMarkRangeId(Long markRangeId) {
-        this.markRangeId = markRangeId;
-    }
-
-    public int getOrders() {
-		return orders;
-	}
-
-	public void setOrders(int orders) {
-		this.orders = orders;
-	}
-
-	@Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        MarkItem markItem = (MarkItem) o;
-
-        if (getMainNumber() != markItem.getMainNumber()) return false;
-        if (getSubNumber() != markItem.getSubNumber()) return false;
-        if (getPaperId() != null ? !getPaperId().equals(markItem.getPaperId()) : markItem.getPaperId() != null)
-            return false;
-        return getWorkId() != null ? getWorkId().equals(markItem.getWorkId()) : markItem.getWorkId() == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getPaperId() != null ? getPaperId().hashCode() : 0;
-        result = 31 * result + (getWorkId() != null ? getWorkId().hashCode() : 0);
-        result = 31 * result + getMainNumber();
-        result = 31 * result + getSubNumber();
-        return result;
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkMode.java

@@ -1,5 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-public enum MarkMode {
-    SINGLE,MULTI
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkRange.java

@@ -1,83 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * 评卷范围
- */
-public class MarkRange extends IdEntity {
-
-	private String name;
-
-	private String paperId;
-
-	private Long workId;
-
-	private MarkMode markMode;
-
-	public Long getWorkId() {
-		return workId;
-	}
-
-	public void setWorkId(Long workId) {
-		this.workId = workId;
-	}
-
-	private Set<MarkItem> markItems = new HashSet<MarkItem>();
-
-	private Set<MarkTaskDTO> markTasks = new HashSet<MarkTaskDTO>();
-
-	public MarkRange() {
-	}
-
-	public MarkRange(String name, String paperId, Long workId,
-			Set<MarkItem> markItems, MarkMode markMode) {
-		this.name = name;
-		this.paperId = paperId;
-		this.workId = workId;
-		this.markItems = markItems;
-		this.markMode = markMode;
-	}
-
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public MarkMode getMarkMode() {
-		return markMode;
-	}
-
-	public void setMarkMode(MarkMode markMode) {
-		this.markMode = markMode;
-	}
-
-	public Set<MarkItem> getMarkItems() {
-		return markItems;
-	}
-
-	public void setMarkItems(Set<MarkItem> markItems) {
-		this.markItems = markItems;
-	}
-
-	public Set<MarkTaskDTO> getMarkTasks() {
-		return markTasks;
-	}
-
-	public void setMarkTasks(Set<MarkTaskDTO> markTasks) {
-		this.markTasks = markTasks;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkResultDTO.java

@@ -1,272 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-import java.util.Date;
-import java.util.Set;
-
-public class MarkResultDTO extends IdEntity {
-
-	private Long userId;
-
-	private Long markRangeId;
-
-	private Long studentPaperId;
-
-	private String markedOn;
-
-	private Set<ResultItem> resultItems;
-	
-    private Double score;
-    
-    private String studentId;
-
-	private String tag;
-	
-    private String studentName;
-    
-    private String studentCode;
-    
-    private String courseCode;
-    
-    private String orgCode;
-    
-    private String paperType;
-    
-    private String paperId;
-    
-    private String courseName;
-    
-    private String orgName;
-    
-    private String userName;
-    
-	private Double objectiveScore;
-	
-	private Double totalScore;
-	
-    private StudentPaper studentPaper;
-    
-    private Long workId;
-
-	private String specialtyName;
-
-	private String specialtyCode;
-	
-	/**
-	 * 学生答卷的主观题HTML
-	 */
-	private String studentSubjectiveHtml;
-
-	private String markRemark;
-	
-	public MarkResultDTO() {
-	}
-
-	public MarkResultDTO(StudentPaper studentPaper, MarkTaskDTO markTask,
-			Set<ResultItem> resultItems) {
-		this.studentPaper = studentPaper;
-		this.userId = markTask.getUserId();
-		this.markRangeId = markTask.getMarkRangeId();
-		this.resultItems = resultItems;
-		this.markedOn = String.valueOf(new Date().getTime());
-	}
-
-	public String getMarkedOn() {
-		return markedOn;
-	}
-
-	public void setMarkedOn(String markedOn) {
-		this.markedOn = markedOn;
-	}
-
-	public Set<ResultItem> getResultItems() {
-		return resultItems;
-	}
-
-	public void setResultItems(Set<ResultItem> resultItems) {
-		this.resultItems = resultItems;
-	}
-
-	public StudentPaper getStudentPaper() {
-		return studentPaper;
-	}
-
-	public void setStudentPaper(StudentPaper studentPaper) {
-		this.studentPaper = studentPaper;
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public Long getMarkRangeId() {
-		return markRangeId;
-	}
-
-	public void setMarkRangeId(Long markRangeId) {
-		this.markRangeId = markRangeId;
-	}
-
-	public Double getScore() {
-		return score;
-	}
-
-	public void setScore(Double score) {
-		this.score = score;
-	}
-
-	public String getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(String studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getTag() {
-		return tag;
-	}
-
-	public void setTag(String tag) {
-		this.tag = tag;
-	}
-
-	public Long getStudentPaperId() {
-		return studentPaperId;
-	}
-
-	public void setStudentPaperId(Long studentPaperId) {
-		this.studentPaperId = studentPaperId;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public String getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
-
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public Double getObjectiveScore() {
-		return objectiveScore;
-	}
-
-	public void setObjectiveScore(Double objectiveScore) {
-		this.objectiveScore = objectiveScore;
-	}
-
-	public Double getTotalScore() {
-		return totalScore;
-	}
-
-	public void setTotalScore(Double totalScore) {
-		this.totalScore = totalScore;
-	}
-
-	public Long getWorkId() {
-		return workId;
-	}
-
-	public void setWorkId(Long workId) {
-		this.workId = workId;
-	}
-
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-
-	public String getSpecialtyCode() {
-		return specialtyCode;
-	}
-
-	public void setSpecialtyCode(String specialtyCode) {
-		this.specialtyCode = specialtyCode;
-	}
-
-	public String getStudentSubjectiveHtml() {
-		return studentSubjectiveHtml;
-	}
-
-	public void setStudentSubjectiveHtml(String studentSubjectiveHtml) {
-		this.studentSubjectiveHtml = studentSubjectiveHtml;
-	}
-
-	public String getMarkRemark() {
-		return markRemark;
-	}
-
-	public void setMarkRemark(String markRemark) {
-		this.markRemark = markRemark;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkTaskDTO.java

@@ -1,236 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-
-
-
-/**
- * 评卷任务
- */
-public class MarkTaskDTO extends IdEntity {
-
-    private Long userId;
-    private String userName;
-    private String userLoginName;
-    private Long workId;
-    private Long examId;
-    private Long markRangeId;
-    private String markRangeName;
-    private String paperId;
-    private String paperName;
-    private String paperType;
-    private String courseName;
-    private String courseCode;
-    /**
-     * 限制数量
-     */
-    private Long limitCount;
-    
-	private Long markedCount;
-	private Long leftCount;
-	private Long totalCount;
-	
-	private Long[] userIds;
-	
-	private Double maxScore;
-	private Double minScore;
-	private Double avgScore;
-	private Double stdDev;
-
-    public MarkTaskDTO() {
-    }
-    
-    public MarkTaskDTO(Long userId,Long workId,Long markRangeId) {
-    	this.markRangeId = markRangeId;
-    	this.userId = userId;
-    	this.workId = workId;
-    }
-
-    public Long getUserId() {
-        return userId;
-    }
-
-    public void setUserId(Long userId) {
-        this.userId = userId;
-    }
-
-    public Long getMarkRangeId() {
-        return markRangeId;
-    }
-
-    public void setMarkRangeId(Long markRangeId) {
-        this.markRangeId = markRangeId;
-    }
-
-    public Long getLimitCount() {
-        return limitCount;
-    }
-
-    public void setLimitCount(Long limitCount) {
-        this.limitCount = limitCount;
-    }
-
-    public Long getWorkId() {
-        return workId;
-    }
-
-    public void setWorkId(Long workId) {
-        this.workId = workId;
-    }
-
-    @Override
-    public boolean equals(Object o) {
-        if (this == o) return true;
-        if (o == null || getClass() != o.getClass()) return false;
-
-        MarkTaskDTO markTask = (MarkTaskDTO) o;
-
-        if (getUserId() != null ? !getUserId().equals(markTask.getUserId()) : markTask.getUserId() != null)
-            return false;
-        return getMarkRangeId() != null ? getMarkRangeId().equals(markTask.getMarkRangeId()) : markTask.getMarkRangeId() == null;
-
-    }
-
-    @Override
-    public int hashCode() {
-        int result = getUserId() != null ? getUserId().hashCode() : 0;
-        result = 31 * result + (getMarkRangeId() != null ? getMarkRangeId().hashCode() : 0);
-        return result;
-    }
-
-	public Long getMarkedCount() {
-		return markedCount;
-	}
-
-	public void setMarkedCount(Long markedCount) {
-		this.markedCount = markedCount;
-	}
-
-	public Long getLeftCount() {
-		return leftCount;
-	}
-
-	public void setLeftCount(Long leftCount) {
-		this.leftCount = leftCount;
-	}
-
-	public Long getTotalCount() {
-		return totalCount;
-	}
-
-	public void setTotalCount(Long totalCount) {
-		this.totalCount = totalCount;
-	}
-
-	public String getMarkRangeName() {
-		return markRangeName;
-	}
-
-	public void setMarkRangeName(String markRangeName) {
-		this.markRangeName = markRangeName;
-	}
-
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public String getPaperName() {
-		return paperName;
-	}
-
-	public void setPaperName(String paperName) {
-		this.paperName = paperName;
-	}
-
-	public Long[] getUserIds() {
-		return userIds;
-	}
-
-	public void setUserIds(Long[] userIds) {
-		this.userIds = userIds;
-	}
-
-	public String getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getUserLoginName() {
-		return userLoginName;
-	}
-
-	public void setUserLoginName(String userLoginName) {
-		this.userLoginName = userLoginName;
-	}
-
-	public Double getMaxScore() {
-		return maxScore;
-	}
-
-	public void setMaxScore(Double maxScore) {
-		this.maxScore = maxScore;
-	}
-
-	public Double getMinScore() {
-		return minScore;
-	}
-
-	public void setMinScore(Double minScore) {
-		this.minScore = minScore;
-	}
-
-	public Double getAvgScore() {
-		return avgScore;
-	}
-
-	public void setAvgScore(Double avgScore) {
-		this.avgScore = avgScore;
-	}
-
-	public Double getStdDev() {
-		return stdDev;
-	}
-
-	public void setStdDev(Double stdDev) {
-		this.stdDev = stdDev;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkWorkDTO.java

@@ -1,176 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-import java.util.List;
-
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-
-/**
- * 
- * @Description: TODO
- * @author ting.yin
- * @date 2017年1月14日
- */
-public class MarkWorkDTO extends IdEntity {
-
-	private String name;
-
-	private String createdOn;
-
-	private String examId;
-
-	private String examName;
-	
-    private ExamType examType;
-
-	private List<MarkTaskDTO> markTasks;
-
-	private String remark;
-	
-    private Long totalStudentPaper;
-    
-    private Long markedStudentPaper;
-    
-    private Long totalCourse;
-    
-    private Long markedCourse;
-    
-    private Long totalMarkItem;
-	
-    private double progress;
-    /**
-     * 状态 0:创建中 1:创建成功 2:创建失败
-     */
-    private int status;
-    
-	private Long rootOrgId;
-	
-	public MarkWorkDTO() {
-	}
-
-	public MarkWorkDTO(String name, String examId,Long rootOrgId) {
-		this.name = name;
-		this.examId = examId;
-		this.rootOrgId = rootOrgId;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getCreatedOn() {
-		return createdOn;
-	}
-
-	public void setCreatedOn(String createdOn) {
-		this.createdOn = createdOn;
-	}
-
-	public String getExamId() {
-		return examId;
-	}
-
-	public void setExamId(String examId) {
-		this.examId = examId;
-	}
-
-	public List<MarkTaskDTO> getMarkTasks() {
-		return markTasks;
-	}
-
-	public void setMarkTasks(List<MarkTaskDTO> markTasks) {
-		this.markTasks = markTasks;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public double getProgress() {
-		return progress;
-	}
-
-	public void setProgress(double progress) {
-		this.progress = progress;
-	}
-
-	public int getStatus() {
-		return status;
-	}
-
-	public void setStatus(int status) {
-		this.status = status;
-	}
-
-	public Long getTotalStudentPaper() {
-		return totalStudentPaper;
-	}
-
-	public void setTotalStudentPaper(Long totalStudentPaper) {
-		this.totalStudentPaper = totalStudentPaper;
-	}
-
-	public Long getTotalMarkItem() {
-		return totalMarkItem;
-	}
-
-	public void setTotalMarkItem(Long totalMarkItem) {
-		this.totalMarkItem = totalMarkItem;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getMarkedStudentPaper() {
-		return markedStudentPaper;
-	}
-
-	public void setMarkedStudentPaper(Long markedStudentPaper) {
-		this.markedStudentPaper = markedStudentPaper;
-	}
-
-	public Long getTotalCourse() {
-		return totalCourse;
-	}
-
-	public void setTotalCourse(Long totalCourse) {
-		this.totalCourse = totalCourse;
-	}
-
-	public Long getMarkedCourse() {
-		return markedCourse;
-	}
-
-	public void setMarkedCourse(Long markedCourse) {
-		this.markedCourse = markedCourse;
-	}
-
-	public ExamType getExamType() {
-		return examType;
-	}
-
-	public void setExamType(ExamType examType) {
-		this.examType = examType;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/MarkerDTO.java

@@ -1,108 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-public class MarkerDTO {
-
-	private Long userId;
-    private String userName;
-    private String userLoginName;
-	private Long workId;
-	private Long markedCount;
-	private Long courseCount;
-	private Long finishedCount;
-	private double maxScore;
-	private double minScore;
-	private double avgScore;
-	private double stdDev;
-
-	public MarkerDTO() {
-	}
-
-	public Long getUserId() {
-		return userId;
-	}
-
-	public void setUserId(Long userId) {
-		this.userId = userId;
-	}
-
-	public Long getMarkedCount() {
-		return markedCount;
-	}
-
-	public void setMarkedCount(Long markedCount) {
-		this.markedCount = markedCount;
-	}
-
-	public Long getCourseCount() {
-		return courseCount;
-	}
-
-	public void setCourseCount(Long courseCount) {
-		this.courseCount = courseCount;
-	}
-
-	public Long getFinishedCount() {
-		return finishedCount;
-	}
-
-	public void setFinishedCount(Long finishedCount) {
-		this.finishedCount = finishedCount;
-	}
-
-	public double getMaxScore() {
-		return maxScore;
-	}
-
-	public void setMaxScore(double maxScore) {
-		this.maxScore = maxScore;
-	}
-
-	public double getMinScore() {
-		return minScore;
-	}
-
-	public void setMinScore(double minScore) {
-		this.minScore = minScore;
-	}
-
-	public double getAvgScore() {
-		return avgScore;
-	}
-
-	public void setAvgScore(double avgScore) {
-		this.avgScore = avgScore;
-	}
-
-	public double getStdDev() {
-		return stdDev;
-	}
-
-	public void setStdDev(double stdDev) {
-		this.stdDev = stdDev;
-	}
-
-	public Long getWorkId() {
-		return workId;
-	}
-
-	public void setWorkId(Long workId) {
-		this.workId = workId;
-	}
-
-	public String getUserName() {
-		return userName;
-	}
-
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public String getUserLoginName() {
-		return userLoginName;
-	}
-
-	public void setUserLoginName(String userLoginName) {
-		this.userLoginName = userLoginName;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/ResultItem.java

@@ -1,50 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-
-public class ResultItem extends IdEntity {
-
-	private MarkItem markItem;
-
-	/**
-	 * 评分
-	 */
-	private Double score;
-
-	/**
-	 * 评卷项id
-	 */
-	private Long markResultId;
-
-	public ResultItem() {
-	}
-
-	public ResultItem(Double score, MarkItem markItem) {
-		this.score = score;
-		this.markItem = markItem;
-	}
-
-	public Long getMarkResultId() {
-		return markResultId;
-	}
-
-	public void setMarkResultId(Long markResultId) {
-		this.markResultId = markResultId;
-	}
-
-	public Double getScore() {
-		return score;
-	}
-
-	public void setScore(Double score) {
-		this.score = score;
-	}
-
-	public MarkItem getMarkItem() {
-		return markItem;
-	}
-
-	public void setMarkItem(MarkItem markItem) {
-		this.markItem = markItem;
-	}
-	
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/marking/StudentPaper.java

@@ -1,138 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.marking;
-
-
-/**
- * Created by zhengmin on 2016/12/23.
- */
-public class StudentPaper extends IdEntity {
-
-	private String paperId;
-
-	private String studentId;
-
-	private Long workId;
-
-    private String studentCode;
-    
-    private String studentName;
-    
-    private String courseCode;
-    
-    private String courseName;
-    
-    private String orgCode;
-    
-    private String identityNumber;
-    
-	private String specialtyName;
-
-	private String specialtyCode;
-
-	public StudentPaper() {
-	}
-
-	public StudentPaper(Long workId, String paperId, String studentId, 
-    		String studentCode,String studentName,String courseCode,String courseName,
-    		String orgCode,String identityNumber, String specialtyName, String specialtyCode) {
-		this.paperId = paperId;
-		this.studentId = studentId;
-		this.workId = workId;
-        this.studentCode = studentCode;
-        this.studentName = studentName;
-        this.courseCode = courseCode;
-        this.courseName = courseName;
-        this.orgCode = orgCode;
-        this.identityNumber = identityNumber;
-        this.specialtyCode = specialtyCode;
-        this.specialtyName = specialtyName;
-	}
-
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public Long getWorkId() {
-		return workId;
-	}
-
-	public void setWorkId(Long workId) {
-		this.workId = workId;
-	}
-
-	public String getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(String studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-
-	public String getSpecialtyCode() {
-		return specialtyCode;
-	}
-
-	public void setSpecialtyCode(String specialtyCode) {
-		this.specialtyCode = specialtyCode;
-	}
-	
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/ExamPhotoVerifyData.java

@@ -1,63 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-
-import java.util.List;
-
-/**
- * @author  	chenken
- * @date    	2018年5月7日 下午1:53:15
- * @company 	QMTH
- * @description ExamVerifyData.java
- */
-public class ExamPhotoVerifyData {
-
-	/**
-	 * 分数ID
-	 */
-	private Long scoreId;
-	/**
-	 * 总的人脸检测成功率(%)
-	 */
-	private double successRate;
-	/**
-	 * 陌生人脸出现总次数
-	 */
-	private int strangerCount;
-	/**
-	 * 照片URL集合
-	 */
-	private List<String> photoUrls;
-
-	public Long getScoreId() {
-		return scoreId;
-	}
-
-	public void setScoreId(Long scoreId) {
-		this.scoreId = scoreId;
-	}
-
-	public double getSuccessRate() {
-		return successRate;
-	}
-
-	public void setSuccessRate(double successRate) {
-		this.successRate = successRate;
-	}
-
-	public int getStrangerCount() {
-		return strangerCount;
-	}
-
-	public void setStrangerCount(int strangerCount) {
-		this.strangerCount = strangerCount;
-	}
-
-	public List<String> getPhotoUrls() {
-		return photoUrls;
-	}
-
-	public void setPhotoUrls(List<String> photoUrls) {
-		this.photoUrls = photoUrls;
-	}
-	
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/ExamRecordDto.java

@@ -1,96 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-/**
- * @author  	chenken
- * @date    	2018年5月17日 下午3:06:34
- * @company 	QMTH
- * @description ExamRecordDto.java
- */
-public class ExamRecordDto {
-	
-	private Long id;
-	
-	private Long orgId;
-	
-	private Long scoreId;
-	
-	private boolean isWarn;
-	
-	private boolean isAudit;
-	
-	private int invigilatorOperation;
-	
-	private String examRecordStatus;
-	
-	/**
-	 * 推送分数的动作点
-	 */
-	private PushScoreActionEnum pushScoreActionEnum;
-	
-	public ExamRecordDto(){}
-	
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public boolean isWarn() {
-		return isWarn;
-	}
-
-	public void setWarn(boolean isWarn) {
-		this.isWarn = isWarn;
-	}
-
-	public boolean isAudit() {
-		return isAudit;
-	}
-
-	public void setAudit(boolean isAudit) {
-		this.isAudit = isAudit;
-	}
-
-	public int getInvigilatorOperation() {
-		return invigilatorOperation;
-	}
-
-	public void setInvigilatorOperation(int invigilatorOperation) {
-		this.invigilatorOperation = invigilatorOperation;
-	}
-
-	public String getExamRecordStatus() {
-		return examRecordStatus;
-	}
-
-	public void setExamRecordStatus(String examRecordStatus) {
-		this.examRecordStatus = examRecordStatus;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public Long getScoreId() {
-		return scoreId;
-	}
-
-	public void setScoreId(Long scoreId) {
-		this.scoreId = scoreId;
-	}
-
-	public PushScoreActionEnum getPushScoreActionEnum() {
-		return pushScoreActionEnum;
-	}
-
-	public void setPushScoreActionEnum(PushScoreActionEnum pushScoreActionEnum) {
-		this.pushScoreActionEnum = pushScoreActionEnum;
-	}
-	
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/ExamStudentDomain.java

@@ -1,278 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-
-import java.io.Serializable;
-
-/**
- * 类注释
- *
- * @author WANGWEI
- * @date 2018年7月9日
- * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
- */
-public class ExamStudentDomain implements Serializable {
-
-	private static final long serialVersionUID = 757982847766860857L;
-
-	private Long id;
-
-	private Long studentId;
-
-	private String identityNumber;
-
-	private String studentName;
-
-	private String studentCode;
-
-	private Long examId;
-
-	private String examName;
-
-	private Long rootOrgId;
-
-	private Long orgId;
-
-	private String orgCode;
-
-	private String orgName;
-
-	private String examNumber;
-
-	private String courseCode;
-
-	private String courseName;
-
-	private String courseLevel;
-
-	private String paperType;
-
-	private String specialtyCode;
-
-	private String specialtyName;
-
-	/**
-	 * 考点
-	 */
-	private String examSite;
-
-	/**
-	 * 信息采集人
-	 */
-	private String infoCollector;
-
-	/**
-	 * 学生电话
-	 */
-	private String phone;
-
-	private String remark;
-
-	/**
-	 * 年级
-	 */
-	private String grade;
-
-	private Boolean finished;
-
-	private String updateTime;
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public Long getStudentId() {
-		return studentId;
-	}
-
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public String getExamName() {
-		return examName;
-	}
-
-	public void setExamName(String examName) {
-		this.examName = examName;
-	}
-
-	public Long getRootOrgId() {
-		return rootOrgId;
-	}
-
-	public void setRootOrgId(Long rootOrgId) {
-		this.rootOrgId = rootOrgId;
-	}
-
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-
-	public String getOrgCode() {
-		return orgCode;
-	}
-
-	public void setOrgCode(String orgCode) {
-		this.orgCode = orgCode;
-	}
-
-	public String getOrgName() {
-		return orgName;
-	}
-
-	public void setOrgName(String orgName) {
-		this.orgName = orgName;
-	}
-
-	public String getExamNumber() {
-		return examNumber;
-	}
-
-	public void setExamNumber(String examNumber) {
-		this.examNumber = examNumber;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCourseLevel() {
-		return courseLevel;
-	}
-
-	public void setCourseLevel(String courseLevel) {
-		this.courseLevel = courseLevel;
-	}
-
-	public String getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
-
-	public String getSpecialtyCode() {
-		return specialtyCode;
-	}
-
-	public void setSpecialtyCode(String specialtyCode) {
-		this.specialtyCode = specialtyCode;
-	}
-
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-
-	public String getExamSite() {
-		return examSite;
-	}
-
-	public void setExamSite(String examSite) {
-		this.examSite = examSite;
-	}
-
-	public String getInfoCollector() {
-		return infoCollector;
-	}
-
-	public void setInfoCollector(String infoCollector) {
-		this.infoCollector = infoCollector;
-	}
-
-	public String getPhone() {
-		return phone;
-	}
-
-	public void setPhone(String phone) {
-		this.phone = phone;
-	}
-
-	public String getRemark() {
-		return remark;
-	}
-
-	public void setRemark(String remark) {
-		this.remark = remark;
-	}
-
-	public String getGrade() {
-		return grade;
-	}
-
-	public void setGrade(String grade) {
-		this.grade = grade;
-	}
-
-	public Boolean getFinished() {
-		return finished;
-	}
-
-	public void setFinished(Boolean finished) {
-		this.finished = finished;
-	}
-
-	public String getUpdateTime() {
-		return updateTime;
-	}
-
-	public void setUpdateTime(String updateTime) {
-		this.updateTime = updateTime;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/Paper.java

@@ -1,169 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-
-/**
- * Created by yuanpan on 2017/1/16.
- */
-public class Paper {
-
-	private Long pk;
-
-	private String paperId;// bigint(20) DEFAULT NULL COMMENT '试卷ID',
-
-	private String paperName;// varchar(128) DEFAULT NULL COMMENT '试卷名称',
-
-	private String paperType;// varchar(128) DEFAULT NULL COMMENT '试卷名称',
-
-	private Long batchId;// bigint(20) DEFAULT NULL COMMENT '批次id',
-
-	private String paperHtml;// longtext COMMENT '试卷html',
-
-	private String answerHtml;// longtext COMMENT '标准答案html',
-
-	/**
-	 * 客观题总分
-	 */
-	private Double objectiveTotalScore;
-
-	/**
-	 * 主观题总分
-	 */
-	private Double subjectiveTotalScore;
-
-	/**
-     *
-     */
-	private Double paperScore;
-
-	/**
-	 * 课程名称
-	 */
-	private String courseName;
-
-	/**
-	 * 课程代码
-	 */
-	private String courseCode;
-
-	/**
-	 * 专业层次
-	 */
-	private String specialtyLevel;
-
-	/**
-	 * 专业名称
-	 */
-	private String specialtyName;
-
-	public Long getPk() {
-		return pk;
-	}
-
-	public void setPk(Long pk) {
-		this.pk = pk;
-	}
-
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public String getPaperName() {
-		return paperName;
-	}
-
-	public void setPaperName(String paperName) {
-		this.paperName = paperName;
-	}
-
-	public Long getBatchId() {
-		return batchId;
-	}
-
-	public void setBatchId(Long batchId) {
-		this.batchId = batchId;
-	}
-
-	public String getPaperHtml() {
-		return paperHtml;
-	}
-
-	public void setPaperHtml(String paperHtml) {
-		this.paperHtml = paperHtml;
-	}
-
-	public String getAnswerHtml() {
-		return answerHtml;
-	}
-
-	public void setAnswerHtml(String answerHtml) {
-		this.answerHtml = answerHtml;
-	}
-
-	public Double getObjectiveTotalScore() {
-		return objectiveTotalScore;
-	}
-
-	public void setObjectiveTotalScore(Double objectiveTotalScore) {
-		this.objectiveTotalScore = objectiveTotalScore;
-	}
-
-	public Double getSubjectiveTotalScore() {
-		return subjectiveTotalScore;
-	}
-
-	public void setSubjectiveTotalScore(Double subjectiveTotalScore) {
-		this.subjectiveTotalScore = subjectiveTotalScore;
-	}
-
-	public Double getPaperScore() {
-		return paperScore;
-	}
-
-	public void setPaperScore(Double paperScore) {
-		this.paperScore = paperScore;
-	}
-
-	public String getCourseName() {
-		return courseName;
-	}
-
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-
-	public String getSpecialtyLevel() {
-		return specialtyLevel;
-	}
-
-	public void setSpecialtyLevel(String specialtyLevel) {
-		this.specialtyLevel = specialtyLevel;
-	}
-
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-
-	public String getPaperType() {
-		return paperType;
-	}
-
-	public void setPaperType(String paperType) {
-		this.paperType = paperType;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/PaperQuestion.java

@@ -1,129 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-
-/**
- * Created by yuanpan on 2017/1/17.
- */
-public class PaperQuestion {
-
-	private Long pk;
-
-	private Paper paper;
-
-	private Long examQuestionId;
-
-	private String repositoryQuestionId;
-
-	private String body;
-
-	private String answer;
-
-	private Double socre;
-
-	private QuesStructType questionType;
-
-	private Integer orders;
-
-	private Integer mainNumber;
-
-	private Integer subNumber;
-
-	private String parentRepositoryQuestionId;
-
-	public Long getPk() {
-		return pk;
-	}
-
-	public void setPk(Long pk) {
-		this.pk = pk;
-	}
-
-	public Long getExamQuestionId() {
-		return examQuestionId;
-	}
-
-	public void setExamQuestionId(Long examQuestionId) {
-		this.examQuestionId = examQuestionId;
-	}
-
-	public String getRepositoryQuestionId() {
-		return repositoryQuestionId;
-	}
-
-	public void setRepositoryQuestionId(String repositoryQuestionId) {
-		this.repositoryQuestionId = repositoryQuestionId;
-	}
-
-	public String getBody() {
-		return body;
-	}
-
-	public void setBody(String body) {
-		this.body = body;
-	}
-
-	public String getAnswer() {
-		return answer;
-	}
-
-	public void setAnswer(String answer) {
-		this.answer = answer;
-	}
-
-	public Paper getPaper() {
-		return paper;
-	}
-
-	public void setPaper(Paper paper) {
-		this.paper = paper;
-	}
-
-	public Double getSocre() {
-		return socre;
-	}
-
-	public void setSocre(Double socre) {
-		this.socre = socre;
-	}
-
-	public QuesStructType getQuestionType() {
-		return questionType;
-	}
-
-	public void setQuestionType(QuesStructType questionType) {
-		this.questionType = questionType;
-	}
-
-	public Integer getOrders() {
-		return orders;
-	}
-
-	public void setOrders(Integer orders) {
-		this.orders = orders;
-	}
-
-	public Integer getMainNumber() {
-		return mainNumber;
-	}
-
-	public void setMainNumber(Integer mainNumber) {
-		this.mainNumber = mainNumber;
-	}
-
-	public Integer getSubNumber() {
-		return subNumber;
-	}
-
-	public void setSubNumber(Integer subNumber) {
-		this.subNumber = subNumber;
-	}
-
-	public String getParentRepositoryQuestionId() {
-		return parentRepositoryQuestionId;
-	}
-
-	public void setParentRepositoryQuestionId(String parentRepositoryQuestionId) {
-		this.parentRepositoryQuestionId = parentRepositoryQuestionId;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/PaperStructureDTO.java

@@ -1,103 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-
-/**
- * Created by yuanpan on 2017/1/18.
- */
-public class PaperStructureDTO {
-
-	private Long pk;// bigint(20) NOT NULL AUTO_INCREMENT COMMENT '主键',
-
-	private Long paperPk;// bigint(20) DEFAULT NULL COMMENT '试卷主键',
-
-	private Integer index;// int(11) DEFAULT NULL COMMENT '结构下标',
-
-	private String title;// varchar(180) DEFAULT NULL COMMENT '标题',
-
-	private Double totalScore;// double DEFAULT NULL COMMENT '总分',
-
-	private Integer count;// int(11) DEFAULT NULL COMMENT '题数',
-
-	private Double score;// double DEFAULT NULL COMMENT '每题分值',
-
-	private QuesStructType questionType;// varchar(90) DEFAULT NULL COMMENT
-										// '题目类型',
-
-	private List<PaperQuestion> paperQuestionList = new ArrayList<>();
-
-	public Long getPk() {
-		return pk;
-	}
-
-	public void setPk(Long pk) {
-		this.pk = pk;
-	}
-
-	public Long getPaperPk() {
-		return paperPk;
-	}
-
-	public void setPaperPk(Long paperPk) {
-		this.paperPk = paperPk;
-	}
-
-	public Integer getIndex() {
-		return index;
-	}
-
-	public void setIndex(Integer index) {
-		this.index = index;
-	}
-
-	public String getTitle() {
-		return title;
-	}
-
-	public void setTitle(String title) {
-		this.title = title;
-	}
-
-	public Double getTotalScore() {
-		return totalScore;
-	}
-
-	public void setTotalScore(Double totalScore) {
-		this.totalScore = totalScore;
-	}
-
-	public Integer getCount() {
-		return count;
-	}
-
-	public void setCount(Integer count) {
-		this.count = count;
-	}
-
-	public Double getScore() {
-		return score;
-	}
-
-	public void setScore(Double score) {
-		this.score = score;
-	}
-
-	public QuesStructType getQuestionType() {
-		return questionType;
-	}
-
-	public void setQuestionType(QuesStructType questionType) {
-		this.questionType = questionType;
-	}
-
-	public List<PaperQuestion> getPaperQuestionList() {
-		return paperQuestionList;
-	}
-
-	public void setPaperQuestionList(List<PaperQuestion> paperQuestionList) {
-		this.paperQuestionList = paperQuestionList;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/PushScoreActionEnum.java

@@ -1,44 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-/**
- * @author  	chenken
- * @date    	2018年5月21日 下午2:52:47
- * @company 	QMTH
- * @description 推送分数的点
- */
-public enum PushScoreActionEnum {
-	
-	END_EXAM(1,"考试结束"),
-	
-	CLEAN(2,"自动清理"),
-	
-	AUDIT_EXAM(3,"审核"),
-	
-	CAPTURE_STATUSTICS(4,"重新统计");
-	
-	private Integer id;
-	
-	private String desc;
-	
-	private PushScoreActionEnum(int id,String desc){
-		this.id = id;
-		this.desc = desc;
-	}
-
-	public Integer getId() {
-		return id;
-	}
-
-	public void setId(Integer id) {
-		this.id = id;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-	
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/SimpleStudentPaperDTO.java

@@ -1,109 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-
-import java.io.Serializable;
-
-/**
- * Created by yuanpan on 2017/7/24.
- */
-public class SimpleStudentPaperDTO implements Serializable {
-    private static final long serialVersionUID = 1L;
-    /**
-     * 学生答卷主键
-     */
-    private Long pk;
-
-    private Long paperPk;
-
-    private String studentCode;
-
-    private String studentName;
-
-    private Long campusId;
-    
-    private String identityNumber;
-    /**
-     * 专业层次
-     */
-    private String specialtyLevel;
-    /**
-     * 专业code
-     */
-    private String specialtyCode;
-    /**
-     * 专业名称
-     */
-    private String specialtyName;
-
-    public Long getPk() {
-        return pk;
-    }
-
-    public void setPk(Long pk) {
-        this.pk = pk;
-    }
-
-    public Long getPaperPk() {
-        return paperPk;
-    }
-
-    public void setPaperPk(Long paperPk) {
-        this.paperPk = paperPk;
-    }
-
-    public String getStudentCode() {
-        return studentCode;
-    }
-
-    public void setStudentCode(String studentCode) {
-        this.studentCode = studentCode;
-    }
-
-    public String getStudentName() {
-        return studentName;
-    }
-
-    public void setStudentName(String studentName) {
-        this.studentName = studentName;
-    }
-
-    public Long getCampusId() {
-        return campusId;
-    }
-
-    public void setCampusId(Long campusId) {
-        this.campusId = campusId;
-    }
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-	public String getSpecialtyLevel() {
-		return specialtyLevel;
-	}
-
-	public void setSpecialtyLevel(String specialtyLevel) {
-		this.specialtyLevel = specialtyLevel;
-	}
-
-	public String getSpecialtyCode() {
-		return specialtyCode;
-	}
-
-	public void setSpecialtyCode(String specialtyCode) {
-		this.specialtyCode = specialtyCode;
-	}
-
-	public String getSpecialtyName() {
-		return specialtyName;
-	}
-
-	public void setSpecialtyName(String specialtyName) {
-		this.specialtyName = specialtyName;
-	}
-	
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/oe/marking/StudentPaperOE.java

@@ -1,179 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.oe.marking;
-
-/**
- * Created by yuanpan on 2017/1/17.
- */
-public class StudentPaperOE {
-
-	/**
-	 * 评卷中的studentPaper的id
-	 */
-	private Long studentPaperId;
-
-	/**
-	 * 学生答卷主键
-	 */
-	private Long pk;
-
-	/**
-	 * 答卷所使用的试卷
-	 */
-	private Paper paper;
-
-	/**
-	 * 考试记录ID
-	 */
-	private Long examRecordId;
-
-	private Long batchId;
-
-	private Long stuUserId;
-	/**
-	 * 学生答卷的HTML
-	 */
-	private String studentPaperHtml;
-
-	/**
-	 * 学生答卷的主观题HTML
-	 */
-	private String studentSubjectiveHtml;
-
-	/**
-	 * 学生答卷的客观题得分
-	 */
-	private Double objectiveScore;
-
-	/**
-	 * 主观题得分
-	 */
-	private Double subjectiveScore;
-
-	private Long campusId;
-
-	private String studentName;
-
-	private String studentCode;
-
-    private String identityNumber;
-
-	public StudentPaperOE() {
-	}
-
-	public StudentPaperOE(Long pk, Double subjectiveScore) {
-		this.pk = pk;
-		this.subjectiveScore = subjectiveScore;
-	}
-
-	public Long getPk() {
-		return pk;
-	}
-
-	public void setPk(Long pk) {
-		this.pk = pk;
-	}
-
-	public Paper getPaper() {
-		return paper;
-	}
-
-	public void setPaper(Paper paper) {
-		this.paper = paper;
-	}
-
-	public String getStudentPaperHtml() {
-		return studentPaperHtml;
-	}
-
-	public void setStudentPaperHtml(String studentPaperHtml) {
-		this.studentPaperHtml = studentPaperHtml;
-	}
-
-	public String getStudentSubjectiveHtml() {
-		return studentSubjectiveHtml;
-	}
-
-	public void setStudentSubjectiveHtml(String studentSubjectiveHtml) {
-		this.studentSubjectiveHtml = studentSubjectiveHtml;
-	}
-
-	public Double getObjectiveScore() {
-		return objectiveScore;
-	}
-
-	public void setObjectiveScore(Double objectiveScore) {
-		this.objectiveScore = objectiveScore;
-	}
-
-	public Long getExamRecordId() {
-		return examRecordId;
-	}
-
-	public void setExamRecordId(Long examRecordId) {
-		this.examRecordId = examRecordId;
-	}
-
-	public Double getSubjectiveScore() {
-		return subjectiveScore;
-	}
-
-	public void setSubjectiveScore(Double subjectiveScore) {
-		this.subjectiveScore = subjectiveScore;
-	}
-
-	public Long getBatchId() {
-		return batchId;
-	}
-
-	public void setBatchId(Long batchId) {
-		this.batchId = batchId;
-	}
-
-	public Long getStuUserId() {
-		return stuUserId;
-	}
-
-	public void setStuUserId(Long stuUserId) {
-		this.stuUserId = stuUserId;
-	}
-
-	public Long getStudentPaperId() {
-		return studentPaperId;
-	}
-
-	public void setStudentPaperId(Long studentPaperId) {
-		this.studentPaperId = studentPaperId;
-	}
-
-	public Long getCampusId() {
-		return campusId;
-	}
-
-	public void setCampusId(Long campusId) {
-		this.campusId = campusId;
-	}
-
-	public String getStudentName() {
-		return studentName;
-	}
-
-	public void setStudentName(String studentName) {
-		this.studentName = studentName;
-	}
-
-	public String getStudentCode() {
-		return studentCode;
-	}
-
-	public void setStudentCode(String studentCode) {
-		this.studentCode = studentCode;
-	}
-
-	public String getIdentityNumber() {
-		return identityNumber;
-	}
-
-	public void setIdentityNumber(String identityNumber) {
-		this.identityNumber = identityNumber;
-	}
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/print/CoursePaperDto.java

@@ -1,143 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.print;
-
-import java.util.Date;
-/**
- * @author  	chenken
- * @date    	2018年3月6日 下午5:39:57
- * @company 	QMTH
- * @description 课程试卷关联表
- */
-public class CoursePaperDto {
-	
-	private Long id;
-	/**
-	 * 机构ID
-	 */
-	private Long orgId;
-	/**
-	 * 考试ID
-	 */
-	private Long examId;
-	/**
-	 * 课程code
-	 */
-	private String courseCode;
-	/**
-	 * 课程名称
-	 */
-	private String courseName;
-	/**
-	 * 试卷ID
-	 */
-	private String paperId;
-	/**
-	 * 试卷名称
-	 */
-	private String paperName;
-	/**
-	 * 试卷P数
-	 */
-	private Integer pNum;
-	/**
-	 * 试卷htmlURL
-	 */
-	private String paperHtmlUrl;
-	/**
-	 * 答案htmlURL
-	 */
-	private String answerHtmlUrl;
-	/**
-	 * 创建时间
-	 */
-	private Date createTime;
-	
-	public CoursePaperDto(){}
-	
-	public CoursePaperDto(Long orgId, Long examId, String courseCode) {
-		this.orgId = orgId;
-		this.examId = examId;
-		this.courseCode = courseCode;
-	}
-
-	public Long getId() {
-		return id;
-	}
-	public void setId(Long id) {
-		this.id = id;
-	}
-	
-	public Long getOrgId() {
-		return orgId;
-	}
-
-	public void setOrgId(Long orgId) {
-		this.orgId = orgId;
-	}
-	
-	public Long getExamId() {
-		return examId;
-	}
-
-	public void setExamId(Long examId) {
-		this.examId = examId;
-	}
-
-	public String getCourseCode() {
-		return courseCode;
-	}
-	public void setCourseCode(String courseCode) {
-		this.courseCode = courseCode;
-	}
-	public String getCourseName() {
-		return courseName;
-	}
-	public void setCourseName(String courseName) {
-		this.courseName = courseName;
-	}
-	public String getPaperName() {
-		return paperName;
-	}
-	public void setPaperName(String paperName) {
-		this.paperName = paperName;
-	}
-	public Date getCreateTime() {
-		return createTime;
-	}
-	public void setCreateTime(Date createTime) {
-		this.createTime = createTime;
-	}
-
-	public Integer getpNum() {
-		return pNum;
-	}
-
-	public void setpNum(Integer pNum) {
-		this.pNum = pNum;
-	}
-
-	public String getPaperId() {
-		return paperId;
-	}
-
-	public void setPaperId(String paperId) {
-		this.paperId = paperId;
-	}
-
-	public String getPaperHtmlUrl() {
-		return paperHtmlUrl;
-	}
-
-	public void setPaperHtmlUrl(String paperHtmlUrl) {
-		this.paperHtmlUrl = paperHtmlUrl;
-	}
-
-	public String getAnswerHtmlUrl() {
-		return answerHtmlUrl;
-	}
-
-	public void setAnswerHtmlUrl(String answerHtmlUrl) {
-		this.answerHtmlUrl = answerHtmlUrl;
-	}
-	
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/question/PaperDetailDto.java

@@ -1,76 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.question;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * Created by songyue on 17/3/15.
- */
-public class PaperDetailDto implements Serializable {
-
-    private static final long serialVersionUID = -3520871668728091404L;
-
-    private String id;
-
-    private Integer number;// 大题序号
-
-    private String cnNum;// 中文序号
-
-    private String name;// 大题名称
-
-    private Double score;// 大题分数
-
-    private List<PaperDetailUnitDto> paperDetailUnits;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public String getCnNum() {
-        return cnNum;
-    }
-
-    public void setCnNum(String cnNum) {
-        this.cnNum = cnNum;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public List<PaperDetailUnitDto> getPaperDetailUnits() {
-        return paperDetailUnits;
-    }
-
-    public void setPaperDetailUnits(List<PaperDetailUnitDto> paperDetailUnits) {
-        this.paperDetailUnits = paperDetailUnits;
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/question/PaperDetailUnitDto.java

@@ -1,132 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.question;
-
-import java.io.Serializable;
-import java.util.List;
-
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-
-/**
- * Created by songyue on 17/3/15.
- */
-public class PaperDetailUnitDto implements Serializable {
-
-    private static final long serialVersionUID = 6507445685386413261L;
-
-    private String id;
-
-    private Integer number;// 小题序号
-
-    private Double score;// 小题分数
-
-    private QuesStructType questionType;// 小题类型
-
-    private List<SubQuestionDto> subQuestions;// 套题下面的子题,如不是套题集合为空
-
-    private String quesId;// 关联试题Id
-
-    private String answer;// 试题答案
-
-    private List<Double> subScoreList;// 对应套题的情况下，各子题的分数分布
-
-    /**
-     * 选择题下option的排序,按照number排序 一般：4,2,3,1 套题下的选择题:1,2,3,4;2,3,4,1;3,2,1,4
-     * 题与题之间按分号";"分隔
-     */
-    private String optionOrder;
-    
-    private String quesBody;// 子题题干,默认为html
-    
-    private List<QuesOptionDto> quesOptions;// 子题选项
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public QuesStructType getQuestionType() {
-        return questionType;
-    }
-
-    public void setQuestionType(QuesStructType questionType) {
-        this.questionType = questionType;
-    }
-
-    public String getQuesId() {
-        return quesId;
-    }
-
-    public void setQuesId(String quesId) {
-        this.quesId = quesId;
-    }
-
-    public String getAnswer() {
-        return answer;
-    }
-
-    public void setAnswer(String answer) {
-        this.answer = answer;
-    }
-
-    public List<SubQuestionDto> getSubQuestions() {
-        return subQuestions;
-    }
-
-    public void setSubQuestions(List<SubQuestionDto> subQuestions) {
-        this.subQuestions = subQuestions;
-    }
-
-    public List<Double> getSubScoreList() {
-        return subScoreList;
-    }
-
-    public void setSubScoreList(List<Double> subScoreList) {
-        this.subScoreList = subScoreList;
-    }
-
-    public String getOptionOrder() {
-        return optionOrder;
-    }
-
-    public void setOptionOrder(String optionOrder) {
-        this.optionOrder = optionOrder;
-    }
-
-	public String getQuesBody() {
-		return quesBody;
-	}
-
-	public void setQuesBody(String quesBody) {
-		this.quesBody = quesBody;
-	}
-	
-	public List<QuesOptionDto> getQuesOptions() {
-		return quesOptions;
-	}
-
-	public void setQuesOptions(List<QuesOptionDto> quesOptions) {
-		this.quesOptions = quesOptions;
-	}
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/question/PaperDto.java

@@ -1,127 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.question;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Created by songyue on 17/3/15.
- */
-public class PaperDto implements Serializable{
-    private static final long serialVersionUID = -4673013279766466337L;
-
-    private String id;
-
-    private String name;//试卷名称
-
-    private String title;//试卷标题
-
-    private Double totalScore;//试卷总分
-    /**
-     * 试卷中是否全为客观题
-     * 是：true
-     * 否：false
-     */
-    private boolean isAllQbjectiveQuestion;
-    
-    private List<PaperDetailDto> paperDetails;
-
-    private Map<String,String> params;//导入试卷属性
-
-    /**
-     * 调卷规则原始试卷ID
-     */
-    private String basePaperId;
-    
-    /**
-     * 是否包含音频题
-     */
-    private Boolean hasAudio;
-    
-    private String examRemark;//考试说明
-    
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getTitle() {
-        return title;
-    }
-
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    public Double getTotalScore() {
-        return totalScore;
-    }
-
-    public void setTotalScore(Double totalScore) {
-        this.totalScore = totalScore;
-    }
-
-    public List<PaperDetailDto> getPaperDetails() {
-        return paperDetails;
-    }
-
-    public void setPaperDetails(List<PaperDetailDto> paperDetails) {
-        this.paperDetails = paperDetails;
-    }
-
-    public Map<String, String> getParams() {
-        return params;
-    }
-
-    public void setParams(Map<String, String> params) {
-        this.params = params;
-    }
-
-	public String getBasePaperId() {
-		return basePaperId;
-	}
-
-	public void setBasePaperId(String basePaperId) {
-		this.basePaperId = basePaperId;
-	}
-
-	public boolean isAllQbjectiveQuestion() {
-		return isAllQbjectiveQuestion;
-	}
-
-	public void setAllQbjectiveQuestion(boolean isAllQbjectiveQuestion) {
-		this.isAllQbjectiveQuestion = isAllQbjectiveQuestion;
-	}
-
-	public Boolean getHasAudio() {
-		return hasAudio;
-	}
-
-	public void setHasAudio(Boolean hasAudio) {
-		this.hasAudio = hasAudio;
-	}
-
-	public String getExamRemark() {
-		return examRemark;
-	}
-
-	public void setExamRemark(String examRemark) {
-		this.examRemark = examRemark;
-	}
-    
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/question/QuesOptionDto.java

@@ -1,33 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.question;
-
-import java.io.Serializable;
-
-public class QuesOptionDto implements Serializable {
-
-    private static final long serialVersionUID = -49939145760800880L;
-
-    private String number;// 选项编号
-
-    private String optionBody;// 选项内容
-
-    public String getNumber() {
-        return number;
-    }
-
-    public void setNumber(String number) {
-        this.number = number;
-    }
-
-    public String getOptionBody() {
-        return optionBody;
-    }
-
-    public void setOptionBody(String optionBody) {
-        this.optionBody = optionBody;
-    }
-
-    public static long getSerialversionuid() {
-        return serialVersionUID;
-    }
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/question/QuestionDto.java

@@ -1,122 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.question;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-
-public class QuestionDto implements Serializable {
-
-    private static final long serialVersionUID = 1866951329075565891L;
-
-    private String id;
-
-    private String quesBody;// 题干,默认为html
-
-    private String quesAnswer;// 答案,默认为html
-
-    private List<SubQuestionDto> subQuestions;// 子题目,用于套题
-
-    private List<QuesOptionDto> quesOptions;// 试题选项
-
-    private QuesStructType questionType;// 试题结构类型
-
-    private Map<String, String> quesParams;// 试题属性
-
-    private Double score;// 预设分值
-
-    /**
-     * 是否包含音频
-     */
-    private Boolean hasAudio;
-    /**
-     * 播放次数
-     */
-    private Integer playTime;
-
-    public String getId() {
-        return id;
-    }
-
-    public void setId(String id) {
-        this.id = id;
-    }
-
-    public String getQuesBody() {
-        return quesBody;
-    }
-
-    public void setQuesBody(String quesBody) {
-        this.quesBody = quesBody;
-    }
-
-    public String getQuesAnswer() {
-        return quesAnswer;
-    }
-
-    public void setQuesAnswer(String quesAnswer) {
-        this.quesAnswer = quesAnswer;
-    }
-
-    public List<QuesOptionDto> getQuesOptions() {
-        return quesOptions;
-    }
-
-    public void setQuesOptions(List<QuesOptionDto> quesOptions) {
-        this.quesOptions = quesOptions;
-    }
-
-    public QuesStructType getQuestionType() {
-        return questionType;
-    }
-
-    public void setQuestionType(QuesStructType questionType) {
-        this.questionType = questionType;
-    }
-
-    public Map<String, String> getQuesParams() {
-        return quesParams;
-    }
-
-    public void setQuesParams(Map<String, String> quesParams) {
-        this.quesParams = quesParams;
-    }
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Double getScore() {
-        return score == null ? 0 : score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-
-    public List<SubQuestionDto> getSubQuestions() {
-        return subQuestions;
-    }
-
-    public void setSubQuestions(List<SubQuestionDto> subQuestions) {
-        this.subQuestions = subQuestions;
-    }
-
-    public Boolean getHasAudio() {
-        return hasAudio;
-    }
-
-    public void setHasAudio(Boolean hasAudio) {
-        this.hasAudio = hasAudio;
-    }
-
-    public Integer getPlayTime() {
-        return playTime;
-    }
-
-    public void setPlayTime(Integer playTime) {
-        this.playTime = playTime;
-    }
-
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/question/SubQuestionDto.java

@@ -1,82 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.question;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Map;
-
-import cn.com.qmth.examcloud.common.dto.question.enums.QuesStructType;
-
-public class SubQuestionDto implements Serializable {
-
-    private static final long serialVersionUID = -7612222458755752097L;
-
-    private Integer number;// 子题的序号
-
-    private String quesBody;// 子题题干,默认为html
-
-    private String quesAnswer;// 子题答案,默认为html
-
-    private List<QuesOptionDto> quesOptions;// 子题选项
-
-    private QuesStructType questionType;// 子题结构类型
-
-    private Map<String, String> quesParams;// 试题属性
-
-    private Double score;// 预设分值
-
-    public Integer getNumber() {
-        return number;
-    }
-
-    public void setNumber(Integer number) {
-        this.number = number;
-    }
-
-    public String getQuesBody() {
-        return quesBody;
-    }
-
-    public void setQuesBody(String quesBody) {
-        this.quesBody = quesBody;
-    }
-
-    public String getQuesAnswer() {
-        return quesAnswer;
-    }
-
-    public void setQuesAnswer(String quesAnswer) {
-        this.quesAnswer = quesAnswer;
-    }
-
-    public List<QuesOptionDto> getQuesOptions() {
-        return quesOptions;
-    }
-
-    public void setQuesOptions(List<QuesOptionDto> quesOptions) {
-        this.quesOptions = quesOptions;
-    }
-
-    public QuesStructType getQuestionType() {
-        return questionType;
-    }
-
-    public void setQuestionType(QuesStructType questionType) {
-        this.questionType = questionType;
-    }
-
-    public Map<String, String> getQuesParams() {
-        return quesParams;
-    }
-
-    public void setQuesParams(Map<String, String> quesParams) {
-        this.quesParams = quesParams;
-    }
-
-    public Double getScore() {
-        return score;
-    }
-
-    public void setScore(Double score) {
-        this.score = score;
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/question/enums/QuesStructType.java

@@ -1,97 +0,0 @@
-package cn.com.qmth.examcloud.common.dto.question.enums;
-
-public enum QuesStructType {
-	
-	/**
-	 * 单选
-	 */
-	SINGLE_ANSWER_QUESTION(1L,"单选",true,false),
-	/**
-	 * 多选
-	 */
-	MULTIPLE_ANSWER_QUESTION(2L,"多选",true,false),
-	/**
-	 * 判断
-	 */
-	BOOL_ANSWER_QUESTION(3L,"判断",true,false),
-	/**
-	 * 填空
-	 */
-	FILL_BLANK_QUESTION(4L,"填空",false,false),
-	/**
-	 * 问答
-	 */
-	TEXT_ANSWER_QUESTION(5L,"问答",false,false),
-	/**
-	 * 套题
-	 */
-	NESTED_ANSWER_QUESTION(6L,"套题",false,true);
-	
-	private Long id;
-	private String name;
-	private boolean objective;//是否是客观题
-	private boolean combline;//是否是组合题
-		
-	private QuesStructType(Long id, String name, boolean objective, boolean combline) {
-		this.id = id;
-		this.name = name;;
-		this.objective = objective;
-		this.combline = combline;
-	}
-	
-	/**
-	 * 通过ID获取试题类型
-	 * @param id
-	 * @return
-	 */
-	public static QuesStructType getQuesStructTypeById(Long id){
-		for(QuesStructType type:QuesStructType.values()){
-			if(type.getId()==id){
-				return type;
-			}
-		}
-		return null;
-	}
-	
-	private QuesStructType(){
-		
-	}
-
-	public Long getId() {
-		return id;
-	}
-
-	public void setId(Long id) {
-		this.id = id;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public boolean isObjective() {
-		return objective;
-	}
-
-	public void setObjective(boolean objective) {
-		this.objective = objective;
-	}
-
-	public boolean isCombline() {
-		return combline;
-	}
-
-	public void setCombline(boolean combline) {
-		this.combline = combline;
-	}
-
-	public String toString(){
-		return getName();
-	}
-	
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/core/enums/CourseLevel.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/CourseLevel.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.core.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 public enum CourseLevel {
 

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/enums/ExamRecordStatus.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/ExamRecordStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.em.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 /**
  * 考试记录状态

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/enums/ExamType.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/ExamType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.em.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 /**
  * @author ting.yin

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/enums/GenerateStudentPaperStatus.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/GenerateStudentPaperStatus.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.em.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 /**
  * Created by yuanpan on 2017/8/8.

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/enums/IsSuccess.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/IsSuccess.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.em.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 /**
  * @author  	chenken

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/enums/MarkingType.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/MarkingType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.em.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 /**
  * Created by songyue on 17/6/22.

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/enums/PracticeType.java → examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/enums/PracticeType.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.em.enums;
+package cn.com.qmth.examcloud.exchange.base.enums;
 
 /**
  * Created by songyue on 17/6/22.

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/DetectNoFaceException.java

@@ -1,7 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/5/15.
- */
-public class DetectNoFaceException extends Exception {
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/ExamStudentNotExistException.java

@@ -1,26 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/8/2.
- */
-public class ExamStudentNotExistException extends Exception {
-
-    public ExamStudentNotExistException() {
-    }
-
-    public ExamStudentNotExistException(String message) {
-        super(message);
-    }
-
-    public ExamStudentNotExistException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public ExamStudentNotExistException(Throwable cause) {
-        super(cause);
-    }
-
-    public ExamStudentNotExistException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/FaceppException.java

@@ -1,15 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/5/15.
- */
-public class FaceppException extends Exception {
-
-    public FaceppException() {
-        super();
-    }
-
-    public FaceppException(String message) {
-        super(message);
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/InvalidJpgException.java

@@ -1,15 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/5/11.
- */
-public class InvalidJpgException extends Exception {
-
-    public InvalidJpgException() {
-        super();
-    }
-
-    public InvalidJpgException(String message) {
-        super(message);
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchCourseLevelException.java

@@ -1,7 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/4/25.
- */
-public class NoSuchCourseLevelException extends Exception {
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchExamException.java

@@ -1,7 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/4/25.
- */
-public class NoSuchExamException extends Exception {
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/NoSuchExamStudentException.java

@@ -1,15 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/5/11.
- */
-public class NoSuchExamStudentException extends Exception {
-
-    public NoSuchExamStudentException() {
-        super();
-    }
-
-    public NoSuchExamStudentException(String message) {
-        super(message);
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/SaveExamException.java

@@ -1,30 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/4/25.
- */
-public class SaveExamException extends RuntimeException {
-	
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = -8244262438827548422L;
-
-	public SaveExamException() {
-        super();
-    }
-
-    public SaveExamException(String message) {
-        super(message);
-    }
-
-    public SaveExamException(Throwable cause) {
-        super(cause);
-    }
-
-    public SaveExamException(String message, Throwable cause) {
-        super(message, cause);
-    }
-	
-	
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/SaveExamStudentException.java

@@ -1,27 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/5/8.
- */
-public class SaveExamStudentException extends RuntimeException {
-    /**
-	 * 
-	 */
-	private static final long serialVersionUID = -300824565660602644L;
-
-	public SaveExamStudentException() {
-        super();
-    }
-
-    public SaveExamStudentException(String message) {
-        super(message);
-    }
-
-    public SaveExamStudentException(Throwable cause) {
-        super(cause);
-    }
-
-    public SaveExamStudentException(String message, Throwable cause) {
-        super(message, cause);
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/exception/UpYunException.java

@@ -1,26 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.exception;
-
-/**
- * Created by yuanpan on 2017/8/2.
- */
-public class UpYunException extends Exception {
-
-    public UpYunException() {
-    }
-
-    public UpYunException(String message) {
-        super(message);
-    }
-
-    public UpYunException(String message, Throwable cause) {
-        super(message, cause);
-    }
-
-    public UpYunException(Throwable cause) {
-        super(cause);
-    }
-
-    public UpYunException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
-        super(message, cause, enableSuppression, writableStackTrace);
-    }
-}

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/util/OutletUtils.java

@@ -1,40 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.util;
-
-import java.lang.reflect.Field;
-import java.util.HashMap;
-import java.util.Map;
-
-/**
- * @author  	chenken
- * @date    	2018年5月17日 下午3:56:42
- * @company 	QMTH
- * @description OutletUtils.java
- */
-public class OutletUtils {
-
-    public static Map<String, Object> getKeyAndValue(Object obj) {
-        Map<String, Object> map = new HashMap<String, Object>();
-        // 得到类对象
-        Class<?> userCla = (Class<?>) obj.getClass();
-        /* 得到类中的所有属性集合 */
-        Field[] fs = userCla.getDeclaredFields();
-        for (int i = 0; i < fs.length; i++) {
-            Field f = fs[i];
-            f.setAccessible(true); // 设置些属性是可以访问的
-            Object val = new Object();
-            try {
-                val = f.get(obj);
-                // 得到此属性的值
-                map.put(f.getName(), val);// 设置键值
-            } catch (IllegalArgumentException e) {
-                e.printStackTrace();
-            } catch (IllegalAccessException e) {
-                e.printStackTrace();
-            }
-        }
-        System.out.println("单个对象的所有键值==反射==" + map.toString());
-        return map;
-    }
-	
-}
-

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/exchange/base/util/SpringContextUtils.java

@@ -1,59 +0,0 @@
-package cn.com.qmth.examcloud.exchange.base.util;
-
-import java.util.Map;
-
-import org.springframework.beans.BeansException;
-import org.springframework.context.ApplicationContext;
-import org.springframework.context.ApplicationContextAware;
-import org.springframework.stereotype.Component;
-
-/**
- * 获取ApplicationContext和Object的工具类
- */
-@Component
-public class SpringContextUtils implements ApplicationContextAware {
-    private static ApplicationContext applicationContext;
- 
-    public void setApplicationContext(ApplicationContext arg0)
-            throws BeansException {
-        applicationContext = arg0;
-    }
- 
-    /**
-     * 获取applicationContext对象
-     * @return
-     */
-    public static ApplicationContext getApplicationContext(){
-        return applicationContext;
-    }
-     
-    /**
-     * 根据bean的id来查找对象
-     * @param id
-     * @return
-     */
-    public static Object getBeanById(String id){
-        return applicationContext.getBean(id);
-    }
-     
-    /**
-     * 根据bean的class来查找对象
-     * @param c
-     * @return
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-	public static Object getBeanByClass(Class c){
-        return applicationContext.getBean(c);
-    }
-     
-    /**
-     * 根据bean的class来查找所有的对象(包括子类)
-     * @param c
-     * @return
-     */
-    @SuppressWarnings({ "unchecked", "rawtypes" })
-	public static Map getBeansByClass(Class c){
-        return applicationContext.getBeansOfType(c);
-    }
-}
-

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/swufe/StudentInfoController.java

@@ -13,7 +13,6 @@ import org.springframework.web.bind.annotation.RestController;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
 import cn.com.qmth.examcloud.core.basic.api.StudentCloudService;
@@ -27,6 +26,7 @@ import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
+import cn.com.qmth.examcloud.exchange.base.enums.CourseLevel;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.swufe.bean.StudentInfoReq;
 import io.swagger.annotations.ApiOperation;
 

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/StudentExamInfoController.java

@@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import com.google.common.collect.Lists;
 
-import cn.com.qmth.examcloud.common.dto.core.enums.CourseLevel;
 import cn.com.qmth.examcloud.commons.base.exception.StatusException;
 import cn.com.qmth.examcloud.commons.base.util.DateUtil;
 import cn.com.qmth.examcloud.commons.base.util.DateUtil.DatePatterns;
@@ -32,6 +31,7 @@ import cn.com.qmth.examcloud.examwork.api.request.SaveExamReq;
 import cn.com.qmth.examcloud.examwork.api.request.SaveExamStudentReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
 import cn.com.qmth.examcloud.examwork.api.response.SaveExamStudentResp;
+import cn.com.qmth.examcloud.exchange.base.enums.CourseLevel;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.ExamStudentImportDTO;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.FailureRecordDomain;
 import cn.com.qmth.examcloud.exchange.outer.api.controller.sydx.bean.OutletExam;

examcloud-exchange-outer-api-provider/src/main/java/cn/com/qmth/examcloud/exchange/outer/api/controller/sydx/bean/OutletExam.java

@@ -5,9 +5,9 @@ import java.util.Date;
 
 import javax.validation.constraints.NotNull;
 
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamType;
-import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
-import cn.com.qmth.examcloud.common.dto.em.enums.PracticeType;
+import cn.com.qmth.examcloud.exchange.base.enums.ExamType;
+import cn.com.qmth.examcloud.exchange.base.enums.MarkingType;
+import cn.com.qmth.examcloud.exchange.base.enums.PracticeType;
 
 public class OutletExam implements Serializable {
 

examcloud-exchange-base/src/main/java/cn/com/qmth/examcloud/common/dto/em/ExamStudent.java → examcloud-exchange-outer-service/src/main/java/cn/com/qmth/examcloud/exchange/outer/service/bean/ExamStudent.java

@@ -1,4 +1,4 @@
-package cn.com.qmth.examcloud.common.dto.em;
+package cn.com.qmth.examcloud.exchange.outer.service.bean;
 
 import java.io.Serializable;
 

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

@@ -1,6 +1,5 @@
 package cn.com.qmth.examcloud.exchange.outer.service.bean;
 
-import cn.com.qmth.examcloud.common.dto.em.ExamStudent;
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.OeExamStudentBean;
 
 /**

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

@@ -12,8 +12,6 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import cn.com.qmth.examcloud.common.dto.em.enums.ExamRecordStatus;
-import cn.com.qmth.examcloud.common.dto.em.enums.MarkingType;
 import cn.com.qmth.examcloud.commons.base.util.DateUtil;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamRecordCloudService;
 import cn.com.qmth.examcloud.core.oe.admin.api.ExamScoreCloudService;
@@ -38,6 +36,8 @@ import cn.com.qmth.examcloud.examwork.api.request.GetExamPropertyReq;
 import cn.com.qmth.examcloud.examwork.api.request.GetExamReq;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamPropertyResp;
 import cn.com.qmth.examcloud.examwork.api.response.GetExamResp;
+import cn.com.qmth.examcloud.exchange.base.enums.ExamRecordStatus;
+import cn.com.qmth.examcloud.exchange.base.enums.MarkingType;
 import cn.com.qmth.examcloud.exchange.outer.service.OutletScoreService;
 import cn.com.qmth.examcloud.exchange.outer.service.bean.OutletScore;