wangliang 5 жил өмнө
parent
commit
9bfd1ae26f
33 өөрчлөгдсөн 367 нэмэгдсэн , 656 устгасан
  1. 1 0
      themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java
  2. 16 118
      themis-backend/src/main/java/com/qmth/themis/backend/elasticsearch/entity/ETEStudentEntity.java
  3. 1 0
      themis-business/src/main/java/com/qmth/themis/business/base/BaseEntity.java
  4. 5 23
      themis-business/src/main/java/com/qmth/themis/business/entity/TBApp.java
  5. 6 27
      themis-business/src/main/java/com/qmth/themis/business/entity/TBClientVersion.java
  6. 13 34
      themis-business/src/main/java/com/qmth/themis/business/entity/TBOrg.java
  7. 9 7
      themis-business/src/main/java/com/qmth/themis/business/entity/TBPrivilege.java
  8. 5 3
      themis-business/src/main/java/com/qmth/themis/business/entity/TBRole.java
  9. 3 2
      themis-business/src/main/java/com/qmth/themis/business/entity/TBRolePrivilege.java
  10. 11 23
      themis-business/src/main/java/com/qmth/themis/business/entity/TBSession.java
  11. 8 29
      themis-business/src/main/java/com/qmth/themis/business/entity/TBUser.java
  12. 9 27
      themis-business/src/main/java/com/qmth/themis/business/entity/TEExamBreachLog.java
  13. 17 15
      themis-business/src/main/java/com/qmth/themis/business/entity/TEExamReexam.java
  14. 10 8
      themis-business/src/main/java/com/qmth/themis/business/entity/TEExamStudentLog.java
  15. 7 6
      themis-business/src/main/java/com/qmth/themis/business/entity/TEUserLog.java
  16. 9 8
      themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateNotice.java
  17. 11 9
      themis-business/src/main/java/com/qmth/themis/business/entity/TIeInvigilateExceptionInfo.java
  18. 13 11
      themis-business/src/main/java/com/qmth/themis/business/entity/TIeInvigilateWarnInfo.java
  19. 10 9
      themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamAnswer.java
  20. 9 8
      themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamBreakHistory.java
  21. 43 42
      themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamRecord.java
  22. 5 4
      themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamSimulateHistory.java
  23. 10 8
      themis-business/src/main/java/com/qmth/themis/business/entity/TOeFaceVerifyHistory.java
  24. 9 8
      themis-business/src/main/java/com/qmth/themis/business/entity/TOeLivenessVerifyHistory.java
  25. 10 10
      themis-business/src/main/java/com/qmth/themis/business/entity/TOeTaskHistory.java
  26. 42 53
      themis-business/src/main/java/com/qmth/themis/business/entity/common/Exam.java
  27. 9 26
      themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamActivity.java
  28. 9 8
      themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamCourse.java
  29. 14 31
      themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamPaper.java
  30. 14 31
      themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamStudent.java
  31. 10 27
      themis-business/src/main/java/com/qmth/themis/business/entity/common/Student.java
  32. 0 2
      themis-business/src/main/java/com/qmth/themis/business/service/impl/TBSessionServiceImpl.java
  33. 19 39
      themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

+ 1 - 0
themis-backend/src/main/java/com/qmth/themis/backend/api/TBUserController.java

@@ -290,6 +290,7 @@ public class TBUserController {
         teExamActivity.setOpeningSeconds(30);
         teExamActivity.setStartTime(new Date());
         teExamActivity.setFinishTime(new Date());
+        teExamActivity.setCreateTime(new Date());
         teExamActivityService.insertInfo(tableName, teExamActivity);
 
         //考试科目

+ 16 - 118
themis-backend/src/main/java/com/qmth/themis/backend/elasticsearch/entity/ETEStudentEntity.java

@@ -1,6 +1,8 @@
 package com.qmth.themis.backend.elasticsearch.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.springframework.data.annotation.Id;
@@ -20,150 +22,46 @@ import java.util.Date;
  */
 @ApiModel(value = "TEStudent", description = "学生档案")
 @Document(indexName = "student_index", shards = 1, replicas = 0)
-public class ETEStudentEntity implements Serializable {
-    private static final long serialVersionUID = 1L;
-
-    @Id
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
+public class ETEStudentEntity extends BaseEntity {
 
     @ApiModelProperty(value = "机构ID")
-    @TableId(value = "org_id")
+    @TableField(value = "org_id")
     private Long orgId;
 
     @ApiModelProperty(value = "证件号")
-    @TableId(value = "identity")
-//    @Field(type = FieldType.Keyword)
-//    @Field(type = FieldType.Auto)
+    @TableField(value = "identity")
     private String identity;
 
     @ApiModelProperty(value = "登陆密码,密文保存")
-    @TableId(value = "password")
+    @TableField(value = "password")
     private String password;
 
     @ApiModelProperty(value = "身份证号")
-    @TableId(value = "idcard_number")
+    @TableField(value = "idcard_number")
     private String idcardNumber;
 
     @ApiModelProperty(value = "手机号")
-    @TableId(value = "mobile_number")
-    @Field(type = FieldType.Text, analyzer = "ik_max_word")
+    @TableField(value = "mobile_number")
     private String mobileNumber;
 
     @ApiModelProperty(value = "姓名")
-    @TableId(value = "name")
+    @TableField(value = "name")
     @Field(type = FieldType.Text, analyzer = "ik_max_word")
+//    @Field(type = FieldType.Keyword)
+//    @Field(type = FieldType.Auto)
     //keyword:存储数据时候,不会分词建立索引
     //text:存储数据时候,会自动分词,并生成索引(这是很智能的,但在有些字段里面是没用的,所以对于有些字段使用text则浪费了空间)。
     private String name;
 
     @ApiModelProperty(value = "性别")
-    @TableId(value = "gender")
-//    @Field(type = FieldType.Integer)
+    @TableField(value = "gender")
     private Integer gender;
 
     @ApiModelProperty(value = "底照保存地址")
-    @TableId(value = "base_photo_path")
+    @TableField(value = "base_photo_path")
     private String basePhotoPath;
 
-    @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
-    private Date createTime;
-
-    @ApiModelProperty(value = "更新时间")
-    @TableId(value = "update_time")
-    private Date updateTime;
-
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    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 String getIdentity() {
-        return identity;
-    }
-
-    public void setIdentity(String identity) {
-        this.identity = identity;
-    }
-
-    public String getPassword() {
-        return password;
-    }
-
-    public void setPassword(String password) {
-        this.password = password;
-    }
-
-    public String getIdcardNumber() {
-        return idcardNumber;
-    }
-
-    public void setIdcardNumber(String idcardNumber) {
-        this.idcardNumber = idcardNumber;
-    }
-
-    public String getMobileNumber() {
-        return mobileNumber;
-    }
-
-    public void setMobileNumber(String mobileNumber) {
-        this.mobileNumber = mobileNumber;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public Integer getGender() {
-        return gender;
-    }
-
-    public void setGender(Integer gender) {
-        this.gender = gender;
-    }
-
-    public String getBasePhotoPath() {
-        return basePhotoPath;
-    }
-
-    public void setBasePhotoPath(String basePhotoPath) {
-        this.basePhotoPath = basePhotoPath;
-    }
-
-    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;
-    }
+    @ApiModelProperty(value = "是否启用,0:停用,1:启用")
+    @TableField(value = "enable")
+    private Integer enable;
 }

+ 1 - 0
themis-business/src/main/java/com/qmth/themis/business/base/BaseEntity.java

@@ -3,6 +3,7 @@ package com.qmth.themis.business.base;
 import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.qmth.themis.common.contanst.Constants;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;

+ 5 - 23
themis-business/src/main/java/com/qmth/themis/business/entity/TBApp.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.business.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,40 +17,22 @@ import java.util.Date;
 @ApiModel(value = "t_b_app", description = "app信息")
 public class TBApp extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "应用名")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "访问凭证")
-    @TableId(value = "access_key")
+    @TableField(value = "access_key")
     private String accessKey;
 
     @ApiModelProperty(value = "访问密钥")
-    @TableId(value = "access_secret")
+    @TableField(value = "access_secret")
     private String accessSecret;
 
     @ApiModelProperty(value = "最近访问时间")
-    @TableId(value = "last_access_time")
+    @TableField(value = "last_access_time")
     private Date lastAccessTime;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }

+ 6 - 27
themis-business/src/main/java/com/qmth/themis/business/entity/TBClientVersion.java

@@ -1,13 +1,10 @@
 package com.qmth.themis.business.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * @Description: 客户端版本
  * @Param:
@@ -18,44 +15,26 @@ import java.util.Date;
 @ApiModel(value = "t_b_client_version", description = "客户端版本")
 public class TBClientVersion extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "版本名")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "版本号")
-    @TableId(value = "value")
+    @TableField(value = "value")
     private Integer value;
 
     @ApiModelProperty(value = "版本详情链接")
-    @TableId(value = "url")
+    @TableField(value = "url")
     private String url;
 
     @ApiModelProperty(value = "版本描述")
-    @TableId(value = "description")
+    @TableField(value = "description")
     private String description;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @TableId(value = "enable")
+    @TableField(value = "enable")
     private Integer enable;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }

+ 13 - 34
themis-business/src/main/java/com/qmth/themis/business/entity/TBOrg.java

@@ -1,13 +1,10 @@
 package com.qmth.themis.business.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * @Description: 机构
  * @Param:
@@ -18,58 +15,52 @@ import java.util.Date;
 @ApiModel(value = "t_b_org", description = "机构")
 public class TBOrg extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "机构代码,通常用学校简称表示,全局唯一")
-    @TableId(value = "org_code")
+    @TableField(value = "org_code")
     private String orgCode;
 
     @ApiModelProperty(value = "名称")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "logo图片url")
-    @TableId(value = "logo")
+    @TableField(value = "logo")
     private String logo;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @TableId(value = "enable")
+    @TableField(value = "enable")
     private Integer enable;
 
     @ApiModelProperty(value = "是否开启模考")
-    @TableId(value = "id")
+    @TableField(value = "id")
     private Integer enable_simulate;
 
     @ApiModelProperty(value = "模考试卷id")
-    @TableId(value = "simulate_paper_id")
+    @TableField(value = "simulate_paper_id")
     private Long simulatePaperId;
 
     @ApiModelProperty(value = "外部访问凭证")
-    @TableId(value = "access_key")
+    @TableField(value = "access_key")
     private String accessKey;
 
     @ApiModelProperty(value = "外部访问密钥")
-    @TableId(value = "access_secret")
+    @TableField(value = "access_secret")
     private String accessSecret;
 
     @ApiModelProperty(value = "联系人")
-    @TableId(value = "contact_name")
+    @TableField(value = "contact_name")
     private String contactName;
 
     @ApiModelProperty(value = "联系人电话")
-    @TableId(value = "contact_phone")
+    @TableField(value = "contact_phone")
     private String contactPhone;
 
     @ApiModelProperty(value = "是否允许使用活体")
-    @TableId(value = "enable_liveness")
+    @TableField(value = "enable_liveness")
     private String enableLiveness;
 
     @ApiModelProperty(value = "是否允许视频转录")
-    @TableId(value = "enable_video_record")
+    @TableField(value = "enable_video_record")
     private String enableVideoRecord;
 
     public String getContactName() {
@@ -104,18 +95,6 @@ public class TBOrg extends BaseEntity {
         this.enableVideoRecord = enableVideoRecord;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getOrgCode() {
         return orgCode;
     }

+ 9 - 7
themis-business/src/main/java/com/qmth/themis/business/entity/TBPrivilege.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,31 +26,31 @@ public class TBPrivilege implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "名称")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "地址")
-    @TableId(value = "url")
+    @TableField(value = "url")
     private String url;
 
     @ApiModelProperty(value = "类型")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private String type;
 
     @ApiModelProperty(value = "父id")
-    @TableId(value = "parent_id")
+    @TableField(value = "parent_id")
     private Long parentId;
 
     @ApiModelProperty(value = "序号")
-    @TableId(value = "sequence")
+    @TableField(value = "sequence")
     private Integer sequence;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     public static long getSerialVersionUID() {

+ 5 - 3
themis-business/src/main/java/com/qmth/themis/business/entity/TBRole.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,15 +26,15 @@ public class TBRole implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "角色编码")
-    @TableId(value = "role_code")
+    @TableField(value = "role_code")
     private String roleCode;
 
     @ApiModelProperty(value = "角色名称")
-    @TableId(value = "role_name")
+    @TableField(value = "role_name")
     private String roleName;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     public static long getSerialVersionUID() {

+ 3 - 2
themis-business/src/main/java/com/qmth/themis/business/entity/TBRolePrivilege.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,11 +24,11 @@ public class TBRolePrivilege implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "角色编码")
-    @TableId(value = "role_code")
+    @TableField(value = "role_code")
     private String roleCode;
 
     @ApiModelProperty(value = "权限id")
-    @TableId(value = "privilege_id")
+    @TableField(value = "privilege_id")
     private Long privilegeId;
 
     public static long getSerialVersionUID() {

+ 11 - 23
themis-business/src/main/java/com/qmth/themis/business/entity/TBSession.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.qmth.themis.business.constant.SystemConstant;
@@ -26,19 +27,19 @@ public class TBSession implements Serializable {
     private String id;
 
     @ApiModelProperty(value = "用户标识")
-    @TableId(value = "identity")
+    @TableField(value = "identity")
     private String identity;
 
     @ApiModelProperty(value = "用户类型")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private String type;
 
     @ApiModelProperty(value = "访问来源")
-    @TableId(value = "source")
+    @TableField(value = "source")
     private String source;
 
     @ApiModelProperty(value = "设备分类")
-    @TableId(value = "platform")
+    @TableField(value = "platform")
     private String platform;
 
     @ApiModelProperty(value = "设备标识")
@@ -46,40 +47,29 @@ public class TBSession implements Serializable {
     private String deviceId;
 
     @ApiModelProperty(value = "登录IP地址")
-    @TableId(value = "address")
+    @TableField(value = "address")
     private String address;
 
     @ApiModelProperty(value = "访问令牌")
-    @TableId(value = "access_token")
+    @TableField(value = "access_token")
     private String accessToken;
 
     @ApiModelProperty(value = "最近访问时间")
-    @TableId(value = "last_access_time")
+    @TableField(value = "last_access_time")
     private Date lastAccessTime;
 
     @ApiModelProperty(value = "最近访问IP地址")
-    @TableId(value = "last_access_ip")
+    @TableField(value = "last_access_ip")
     private String lastAccessIp;
 
     @ApiModelProperty(value = "令牌更新时间")
-    @TableId(value = "update_time")
+    @TableField(value = "update_time", fill = FieldFill.INSERT_UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "令牌强制失效时间")
-    @TableId(value = "expire_time")
+    @TableField(value = "expire_time")
     private Date expireTime;
 
-//    @TableField(exist = false)
-//    private Integer ack; //mq ack
-//
-//    public Integer getAck() {
-//        return ack;
-//    }
-//
-//    public void setAck(Integer ack) {
-//        this.ack = ack;
-//    }
-
     public static long getSerialVersionUID() {
         return serialVersionUID;
     }
@@ -195,7 +185,5 @@ public class TBSession implements Serializable {
         this.accessToken = accessToken;
         this.expireTime = expireTime;
         this.lastAccessTime = new Date();
-        this.updateTime = new Date();
-//        this.ack = SystemConstant.UNSEND_ACK_TYPE;
     }
 }

+ 8 - 29
themis-business/src/main/java/com/qmth/themis/business/entity/TBUser.java

@@ -1,13 +1,10 @@
 package com.qmth.themis.business.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
-import java.io.Serializable;
-import java.util.Date;
-
 /**
  * @Description: 用户
  * @Param:
@@ -18,38 +15,32 @@ import java.util.Date;
 @ApiModel(value = "t_b_user", description = "用户")
 public class TBUser extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "用户名")
-    @TableId(value = "login_name")
+    @TableField(value = "login_name")
     private String loginName;
 
     @ApiModelProperty(value = "密码")
-    @TableId(value = "password")
+    @TableField(value = "password")
     private String password;
 
     @ApiModelProperty(value = "手机号")
-    @TableId(value = "mobile_number")
+    @TableField(value = "mobile_number")
     private String mobileNumber;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @TableId(value = "enable")
+    @TableField(value = "enable")
     private Integer enable;
 
     @ApiModelProperty(value = "机构id")
-    @TableId(value = "org_id")
+    @TableField(value = "org_id")
     private Long orgId;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "姓名")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     public String getName() {
@@ -60,18 +51,6 @@ public class TBUser extends BaseEntity {
         this.name = name;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getLoginName() {
         return loginName;
     }

+ 9 - 27
themis-business/src/main/java/com/qmth/themis/business/entity/TEExamBreachLog.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.business.entity;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -15,56 +15,38 @@ import io.swagger.annotations.ApiModelProperty;
 @ApiModel(value = "t_e_exam_breach_log", description = "考生违纪处理")
 public class TEExamBreachLog extends BaseEntity {
 
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次ID")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "考生id")
-    @TableId(value = "exam_student_id")
+    @TableField(value = "exam_student_id")
     private Long examStudentId;
 
     @ApiModelProperty(value = "类型")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "描述")
-    @TableId(value = "description")
+    @TableField(value = "description")
     private String description;
 
     @ApiModelProperty(value = "状态,0:处理,1:撤销")
-    @TableId(value = "status")
+    @TableField(value = "status")
     private Integer status;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getExamId() {
         return examId;
     }

+ 17 - 15
themis-business/src/main/java/com/qmth/themis/business/entity/TEExamReexam.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,63 +26,63 @@ public class TEExamReexam implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次ID")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "考生id")
-    @TableId(value = "exam_student_id")
+    @TableField(value = "exam_student_id")
     private Long examStudentId;
 
     @ApiModelProperty(value = "重考方式,0:批次内,1:换批次")
-    @TableId(value = "apply_model")
+    @TableField(value = "apply_model")
     private Integer applyModel;
 
     @ApiModelProperty(value = "重考原因")
-    @TableId(value = "apply_reason")
+    @TableField(value = "apply_reason")
     private Integer applyReason;
 
     @ApiModelProperty(value = "状态,0:无需审核,1:待审核,2:已审核")
-    @TableId(value = "status")
+    @TableField(value = "status")
     private Integer status;
 
     @ApiModelProperty(value = "待审核人id")
-    @TableId(value = "auditing_id")
+    @TableField(value = "auditing_id")
     private Long auditingId;
 
     @ApiModelProperty(value = "审核状态,0:通过,1:不通过")
-    @TableId(value = "auditing_status")
+    @TableField(value = "auditing_status")
     private Integer auditingStatus;
 
     @ApiModelProperty(value = "审核时间")
-    @TableId(value = "auditing_time")
+    @TableField(value = "auditing_time")
     private Date auditingTime;
 
     @ApiModelProperty(value = "审批意见")
-    @TableId(value = "auditing_suggest")
+    @TableField(value = "auditing_suggest")
     private String auditingSuggest;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "创建人id")
-    @TableId(value = "create_id")
+    @TableField(value = "create_id")
     private Long createId;
 
     @ApiModelProperty(value = "更新时间")
-    @TableId(value = "update_time")
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     public static long getSerialVersionUID() {

+ 10 - 8
themis-business/src/main/java/com/qmth/themis/business/entity/TEExamStudentLog.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,35 +26,35 @@ public class TEExamStudentLog implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次ID")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "考生id")
-    @TableId(value = "exam_student_id")
+    @TableField(value = "exam_student_id")
     private Long examStudentId;
 
     @ApiModelProperty(value = "类型")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "描述")
-    @TableId(value = "description")
+    @TableField(value = "description")
     private String description;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     public static long getSerialVersionUID() {

+ 7 - 6
themis-business/src/main/java/com/qmth/themis/business/entity/TEUserLog.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.qmth.themis.common.contanst.Constants;
 import io.swagger.annotations.ApiModel;
@@ -25,23 +27,23 @@ public class TEUserLog implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "用户ID")
-    @TableId(value = "user_id")
+    @TableField(value = "user_id")
     private Long userId;
 
     @ApiModelProperty(value = "类型")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "描述")
-    @TableId(value = "description")
+    @TableField(value = "description")
     private String description;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     public TEUserLog() {
@@ -54,7 +56,6 @@ public class TEUserLog implements Serializable {
         this.type = type;
         this.description = description;
         this.remark = remark;
-        this.createTime = new Date();
     }
 
     public static long getSerialVersionUID() {

+ 9 - 8
themis-business/src/main/java/com/qmth/themis/business/entity/TIeExamInvigilateNotice.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,35 +25,35 @@ public class TIeExamInvigilateNotice implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次ID")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "监考人ID")
-    @TableId(value = "user_id")
+    @TableField(value = "user_id")
     private Long userId;
 
     @ApiModelProperty(value = "消息类型")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "消息内容")
-    @TableId(value = "content")
+    @TableField(value = "content")
     private String content;
 
     @ApiModelProperty(value = "发送时间")
-    @TableId(value = "send_time")
+    @TableField(value = "send_time")
     private Date sendTime;
 
     @ApiModelProperty(value = "接收时间")
-    @TableId(value = "receive_time")
+    @TableField(value = "receive_time")
     private Date receiveTime;
 
     public static long getSerialVersionUID() {

+ 11 - 9
themis-business/src/main/java/com/qmth/themis/business/entity/TIeInvigilateExceptionInfo.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,39 +26,39 @@ public class TIeInvigilateExceptionInfo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次ID")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "考生id")
-    @TableId(value = "exam_student_id")
+    @TableField(value = "exam_student_id")
     private Long examStudentId;
 
     @ApiModelProperty(value = "异常信息")
-    @TableId(value = "info")
+    @TableField(value = "info")
     private String info;
 
     @ApiModelProperty(value = "类别")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
-    @TableId(value = "update_time")
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     public static long getSerialVersionUID() {

+ 13 - 11
themis-business/src/main/java/com/qmth/themis/business/entity/TIeInvigilateWarnInfo.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -24,47 +26,47 @@ public class TIeInvigilateWarnInfo implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次ID")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "考生id")
-    @TableId(value = "exam_student_id")
+    @TableField(value = "exam_student_id")
     private Long examStudentId;
 
     @ApiModelProperty(value = "预警信息")
-    @TableId(value = "info")
+    @TableField(value = "info")
     private String info;
 
     @ApiModelProperty(value = "预警级别")
-    @TableId(value = "level")
+    @TableField(value = "level")
     private Integer level;
 
     @ApiModelProperty(value = "类别")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "备注")
-    @TableId(value = "remark")
+    @TableField(value = "remark")
     private String remark;
 
     @ApiModelProperty(value = "审阅状态,0:未阅,1:已阅")
-    @TableId(value = "approve_status")
+    @TableField(value = "approve_status")
     private Integer approveStatus;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
-    @TableId(value = "update_time")
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     public static long getSerialVersionUID() {

+ 10 - 9
themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamAnswer.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,39 +24,39 @@ public class TOeExamAnswer implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "作答记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "大题号")
-    @TableId(value = "main_number")
+    @TableField(value = "main_number")
     private Integer mainNumber;
 
     @ApiModelProperty(value = "小题号")
-    @TableId(value = "sub_number")
+    @TableField(value = "sub_number")
     private Integer subNumber;
 
     @ApiModelProperty(value = "子题序号")
-    @TableId(value = "sub_index")
+    @TableField(value = "sub_index")
     private Integer subIndex;
 
     @ApiModelProperty(value = "作答内容")
-    @TableId(value = "answer")
+    @TableField(value = "answer")
     private String answer;
 
     @ApiModelProperty(value = "版本时间戳")
-    @TableId(value = "version")
+    @TableField(value = "version")
     private Long version;
 
     @ApiModelProperty(value = "作答轨迹")
-    @TableId(value = "history")
+    @TableField(value = "history")
     private String history;
 
     @ApiModelProperty(value = "作答时长")
-    @TableId(value = "duration_seconds")
+    @TableField(value = "duration_seconds")
     private Integer duration_seconds;
 
     @ApiModelProperty(value = "分数")
-    @TableId(value = "score")
+    @TableField(value = "score")
     private Double score;
 
     public static long getSerialVersionUID() {

+ 9 - 8
themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamBreakHistory.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,35 +24,35 @@ public class TOeExamBreakHistory implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "断点发生时间")
-    @TableId(value = "break_time")
+    @TableField(value = "break_time")
     private Date breakTime;
 
     @ApiModelProperty(value = "断点判定原因")
-    @TableId(value = "break_reason")
+    @TableField(value = "break_reason")
     private Integer breakReason;
 
     @ApiModelProperty(value = "提交异常原因")
-    @TableId(value = "resume_reason")
+    @TableField(value = "resume_reason")
     private String resumeReason;
 
     @ApiModelProperty(value = "恢复候考时间")
-    @TableId(value = "prepare_time")
+    @TableField(value = "prepare_time")
     private Date prepareTime;
 
     @ApiModelProperty(value = "恢复开考时间")
-    @TableId(value = "start_time")
+    @TableField(value = "start_time")
     private Date startTime;
 
     @ApiModelProperty(value = "恢复开考身份验证结果")
-    @TableId(value = "entry_authentication_result")
+    @TableField(value = "entry_authentication_result")
     private Integer entryAuthenticationResult;
 
     @ApiModelProperty(value = "恢复开考身份验证记录ID")
-    @TableId(value = "entry_authentication_id")
+    @TableField(value = "entry_authentication_id")
     private Long entryAuthenticationId;
 
     public static long getSerialVersionUID() {

+ 43 - 42
themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamRecord.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,171 +24,171 @@ public class TOeExamRecord implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试批次ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "考试场次ID")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "考生ID")
-    @TableId(value = "exam_student_id")
+    @TableField(value = "exam_student_id")
     private Long examStudentId;
 
     @ApiModelProperty(value = "实际使用的试卷ID")
-    @TableId(value = "paper_id")
+    @TableField(value = "paper_id")
     private Long paperId;
 
     @ApiModelProperty(value = "全部作答保存地址")
-    @TableId(value = "answer_path")
+    @TableField(value = "answer_path")
     private String answerPath;
 
     @ApiModelProperty(value = "第几次考试")
-    @TableId(value = "order_number")
+    @TableField(value = "order_number")
     private Integer orderNumber;
 
     @ApiModelProperty(value = "当前状态")
-    @TableId(value = "status")
+    @TableField(value = "status")
     private Integer status;
 
     @ApiModelProperty(value = "首次进入候考时间")
-    @TableId(value = "first_prepare_time")
+    @TableField(value = "first_prepare_time")
     private Date firstPrepareTime;
 
     @ApiModelProperty(value = "首次开考时间")
-    @TableId(value = "first_start_time")
+    @TableField(value = "first_start_time")
     private Date firstStartTime;
 
     @ApiModelProperty(value = "最近断点时间")
-    @TableId(value = "last_break_time")
+    @TableField(value = "last_break_time")
     private Date lastBreakTime;
 
     @ApiModelProperty(value = "最近恢复候考时间")
-    @TableId(value = "last_prepare_time")
+    @TableField(value = "last_prepare_time")
     private Date lastPrepareTime;
 
     @ApiModelProperty(value = "最近恢复开考时间")
-    @TableId(value = "last_start_time")
+    @TableField(value = "last_start_time")
     private Date lastStartTime;
 
     @ApiModelProperty(value = "剩余断点续考次数")
-    @TableId(value = "left_break_resume_count")
+    @TableField(value = "left_break_resume_count")
     private Integer leftBreakResumeCount;
 
     @ApiModelProperty(value = "客户端当前IP地址")
-    @TableId(value = "client_current_ip")
+    @TableField(value = "client_current_ip")
     private String clientCurrentIp;
 
     @ApiModelProperty(value = "客户端websocket状态")
-    @TableId(value = "client_websocket_status")
+    @TableField(value = "client_websocket_status")
     private Integer clientWebsocketStatus;
 
     @ApiModelProperty(value = "客户端websocket连接标识")
-    @TableId(value = "client_websocket_id")
+    @TableField(value = "client_websocket_id")
     private String clientWebsocketId;
 
     @ApiModelProperty(value = "客户端最近同步时间")
-    @TableId(value = "client_last_sync_time")
+    @TableField(value = "client_last_sync_time")
     private Date clientLastSyncTime;
 
     @ApiModelProperty(value = "微信小程序websocket状态")
-    @TableId(value = "wxapp_websocket_status")
+    @TableField(value = "wxapp_websocket_status")
     private Integer wxappWebsocketStatus;
 
     @ApiModelProperty(value = "微信小程序websocket连接标识")
-    @TableId(value = "wxapp_websocket_id")
+    @TableField(value = "wxapp_websocket_id")
     private String wxappWebsocketId;
 
     @ApiModelProperty(value = "微信小程序最近同步时间")
-    @TableId(value = "wxapp_last_sync_time")
+    @TableField(value = "wxapp_last_sync_time")
     private Date wxappLastSyncTime;
 
     @ApiModelProperty(value = "客户端推流状态")
-    @TableId(value = "client_video_push_status")
+    @TableField(value = "client_video_push_status")
     private Integer clientVideoPushStatus;
 
     @ApiModelProperty(value = "客户端推流地址")
-    @TableId(value = "client_video_push_key")
+    @TableField(value = "client_video_push_key")
     private String clientVideoPushKey;
 
     @ApiModelProperty(value = "微信小程序推流状态")
-    @TableId(value = "wxapp_video_push_status")
+    @TableField(value = "wxapp_video_push_status")
     private Integer wxappVideoPushStatus;
 
     @ApiModelProperty(value = "微信小程序推流地址")
-    @TableId(value = "wxapp_video_push_key")
+    @TableField(value = "wxapp_video_push_key")
     private String wxappVideoPushKey;
 
     @ApiModelProperty(value = "答题进度")
-    @TableId(value = "answer_progress")
+    @TableField(value = "answer_progress")
     private Double answerProgress;
 
     @ApiModelProperty(value = "累计考试用时")
-    @TableId(value = "duration_seconds")
+    @TableField(value = "duration_seconds")
     private Integer durationSeconds;
 
     @ApiModelProperty(value = "交卷时间")
-    @TableId(value = "finish_time")
+    @TableField(value = "finish_time")
     private Date finishTime;
 
     @ApiModelProperty(value = "交卷原因")
-    @TableId(value = "finish_type")
+    @TableField(value = "finish_type")
     private Integer finishType;
 
     @ApiModelProperty(value = "预警次数")
-    @TableId(value = "warning_count")
+    @TableField(value = "warning_count")
     private Integer warningCount;
 
     @ApiModelProperty(value = "审核结果")
-    @TableId(value = "review_result")
+    @TableField(value = "review_result")
     private Integer reviewResult;
 
     @ApiModelProperty(value = "客观题分数")
-    @TableId(value = "objective_score")
+    @TableField(value = "objective_score")
     private Double objectiveScore;
 
     @ApiModelProperty(value = "试题下载,0:是,1:不是")
-    @TableId(value = "paper_download")
+    @TableField(value = "paper_download")
     private Integer paperDownload;
 
     @ApiModelProperty(value = "是否违纪,0:是,1:不是")
-    @TableId(value = "breach_status")
+    @TableField(value = "breach_status")
     private Integer breachStatus;
 
     @ApiModelProperty(value = "个人试卷结构")
-    @TableId(value = "paper_struct")
+    @TableField(value = "paper_struct")
     private String paperStruct;
 
     @ApiModelProperty(value = "个人试卷结构是否已上传")
-    @TableId(value = "paper_struct_upload")
+    @TableField(value = "paper_struct_upload")
     private Integer paperStructUpload;
 
     @ApiModelProperty(value = "第几次考试")
-    @TableId(value = "serial_number")
+    @TableField(value = "serial_number")
     private Integer serialNumber;
 
     @ApiModelProperty(value = "最近断点记录ID")
-    @TableId(value = "last_break_id")
+    @TableField(value = "last_break_id")
     private Long lastBreakId;
 
     @ApiModelProperty(value = "开考身份验证结果")
-    @TableId(value = "entry_authentication_result")
+    @TableField(value = "entry_authentication_result")
     private Integer entryAuthenticationResult;
 
     @ApiModelProperty(value = "开考身份验证记录ID")
-    @TableId(value = "entry_authentication_id")
+    @TableField(value = "entry_authentication_id")
     private Long entryAuthenticationId;
 
     @ApiModelProperty(value = "当前过程人脸检测状态")
-    @TableId(value = "in_process_face_verify_status")
+    @TableField(value = "in_process_face_verify_status")
     private Integer inProcessFaceVerifyStatus;
 
     @ApiModelProperty(value = "当前过程活体验证状态")
-    @TableId(value = "in_process_liveness_verify_status")
+    @TableField(value = "in_process_liveness_verify_status")
     private Integer inProcessLivenessVerifyStatus;
 
     @ApiModelProperty(value = "已完成过程活体验证次数")
-    @TableId(value = "in_process_liveness_verify_count")
+    @TableField(value = "in_process_liveness_verify_count")
     private Integer inProcessLivenessVerifyCount;
 
     public static long getSerialVersionUID() {

+ 5 - 4
themis-business/src/main/java/com/qmth/themis/business/entity/TOeExamSimulateHistory.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -14,7 +15,7 @@ import java.util.Date;
  * @Author: wangliang
  * @Date: 2020/6/25
  */
-@ApiModel(value = "t_oe_exam_simulate_history", description = "模拟考试记录  ")
+@ApiModel(value = "t_oe_exam_simulate_history", description = "模拟考试记录")
 public class TOeExamSimulateHistory implements Serializable {
 
     private static final long serialVersionUID = 1L;
@@ -24,15 +25,15 @@ public class TOeExamSimulateHistory implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "个人ID")
-    @TableId(value = "student_id")
+    @TableField(value = "student_id")
     private Long studentId;
 
     @ApiModelProperty(value = "模拟试卷ID")
-    @TableId(value = "paper_id")
+    @TableField(value = "paper_id")
     private Long paperId;
 
     @ApiModelProperty(value = "最近完成时间")
-    @TableId(value = "finish_time")
+    @TableField(value = "finish_time")
     private Date finishTime;
 
     public static long getSerialVersionUID() {

+ 10 - 8
themis-business/src/main/java/com/qmth/themis/business/entity/TOeFaceVerifyHistory.java

@@ -1,5 +1,7 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,35 +25,35 @@ public class TOeFaceVerifyHistory implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "相似度分数")
-    @TableId(value = "similarity")
+    @TableField(value = "similarity")
     private Double similarity;
 
     @ApiModelProperty(value = "真实性验证结果")
-    @TableId(value = "realness")
+    @TableField(value = "realness")
     private Integer realness;
 
     @ApiModelProperty(value = "创建时间")
-    @TableId(value = "create_time")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
     private Date createTime;
 
     @ApiModelProperty(value = "更新时间")
-    @TableId(value = "update_time")
+    @TableField(value = "update_time", fill = FieldFill.UPDATE)
     private Date updateTime;
 
     @ApiModelProperty(value = "初次开考、恢复开考、过程中")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "图片保存路径")
-    @TableId(value = "photo_url")
+    @TableField(value = "photo_url")
     private String photoUrl;
 
     @ApiModelProperty(value = "本地验证是否通过")
-    @TableId(value = "pass")
+    @TableField(value = "pass")
     private Integer pass;
 
     public static long getSerialVersionUID() {

+ 9 - 8
themis-business/src/main/java/com/qmth/themis/business/entity/TOeLivenessVerifyHistory.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
@@ -23,35 +24,35 @@ public class TOeLivenessVerifyHistory implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试记录ID")
-    @TableId(value = "exam_record_id")
+    @TableField(value = "exam_record_id")
     private Long examRecordId;
 
     @ApiModelProperty(value = "开考还是过程中")
-    @TableId(value = "type")
+    @TableField(value = "type")
     private Integer type;
 
     @ApiModelProperty(value = "随机动作与结果")
-    @TableId(value = "actions")
+    @TableField(value = "actions")
     private String actions;
 
     @ApiModelProperty(value = "检测结果")
-    @TableId(value = "result")
+    @TableField(value = "result")
     private Integer result;
 
     @ApiModelProperty(value = "重试次数")
-    @TableId(value = "retry")
+    @TableField(value = "retry")
     private Integer retry;
 
     @ApiModelProperty(value = "本地验证是否通过")
-    @TableId(value = "pass")
+    @TableField(value = "pass")
     private Integer pass;
 
     @ApiModelProperty(value = "开始时间")
-    @TableId(value = "start_time")
+    @TableField(value = "start_time")
     private Date startTime;
 
     @ApiModelProperty(value = "完成时间")
-    @TableId(value = "finish_time")
+    @TableField(value = "finish_time")
     private Date finishTime;
 
     public static long getSerialVersionUID() {

+ 10 - 10
themis-business/src/main/java/com/qmth/themis/business/entity/TOeTaskHistory.java

@@ -7,7 +7,7 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
-import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * @Description: 异步任务
@@ -66,15 +66,15 @@ public class TOeTaskHistory implements Serializable {
 
     @ApiModelProperty(value = "创建时间")
     @TableField(value = "create_time", fill = FieldFill.INSERT)
-    private LocalDateTime createTime;
+    private Date createTime;
 
     @ApiModelProperty(value = "开始时间")
     @TableField(value = "start_time")
-    private LocalDateTime startTime;
+    private Date startTime;
 
     @ApiModelProperty(value = "结束时间")
     @TableField(value = "finish_time")
-    private LocalDateTime finishTime;
+    private Date finishTime;
 
     public static long getSerialVersionUID() {
         return serialVersionUID;
@@ -168,27 +168,27 @@ public class TOeTaskHistory implements Serializable {
         this.createId = createId;
     }
 
-    public LocalDateTime getCreateTime() {
+    public Date getCreateTime() {
         return createTime;
     }
 
-    public void setCreateTime(LocalDateTime createTime) {
+    public void setCreateTime(Date createTime) {
         this.createTime = createTime;
     }
 
-    public LocalDateTime getStartTime() {
+    public Date getStartTime() {
         return startTime;
     }
 
-    public void setStartTime(LocalDateTime startTime) {
+    public void setStartTime(Date startTime) {
         this.startTime = startTime;
     }
 
-    public LocalDateTime getFinishTime() {
+    public Date getFinishTime() {
         return finishTime;
     }
 
-    public void setFinishTime(LocalDateTime finishTime) {
+    public void setFinishTime(Date finishTime) {
         this.finishTime = finishTime;
     }
 }

+ 42 - 53
themis-business/src/main/java/com/qmth/themis/business/entity/common/Exam.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity.common;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
@@ -17,172 +18,168 @@ import java.util.Date;
 public class Exam extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
-
     @ApiModelProperty(value = "机构ID")
-    @TableId(value = "org_id")
+    @TableField(value = "org_id")
     private Long orgId;
 
     @ApiModelProperty(value = "批次编码,机构唯一")
-    @TableId(value = "code")
+    @TableField(value = "code")
     private String code;
 
     @ApiModelProperty(value = "批次名称")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "批次标注,可用于多个考试批次归类")
-    @TableId(value = "tag")
+    @TableField(value = "tag")
     private String tag;
 
     @ApiModelProperty(value = "批次开始时间")
-    @TableId(value = "start_time")
+    @TableField(value = "start_time")
     private Date startTime;
 
     @ApiModelProperty(value = "批次结束时间")
-    @TableId(value = "end_time")
+    @TableField(value = "end_time")
     private Date endTime;
 
     @ApiModelProperty(value = "状态")
-    @TableId(value = "status")
+    @TableField(value = "status")
     private Integer status;
 
     @ApiModelProperty(value = "考试口令")
-    @TableId(value = "short_code")
+    @TableField(value = "short_code")
     private String shortCode;
 
     @ApiModelProperty(value = "提前多长时间开始候考(秒)")
-    @TableId(value = "prepare_seconds")
+    @TableField(value = "prepare_seconds")
     private Integer prepareSeconds;
 
     @ApiModelProperty(value = "最短考试时长,相当于考试冻结时间(秒)")
-    @TableId(value = "min_duration_seconds")
+    @TableField(value = "min_duration_seconds")
     private Integer minDurationSeconds;
 
     @ApiModelProperty(value = "考前须知")
-    @TableId(value = "pre_notice")
+    @TableField(value = "pre_notice")
     private String preNotice;
 
     @ApiModelProperty(value = "考试须知阅读时长(秒)")
-    @TableId(value = "pre_notice_stay_seconds")
+    @TableField(value = "pre_notice_stay_seconds")
     private Integer preNoticeStaySeconds;
 
     @ApiModelProperty(value = "考后说明,针对一个场次进行设置")
-    @TableId(value = "post_notice")
+    @TableField(value = "post_notice")
     private String postNotice;
 
     @ApiModelProperty(value = "允许考试次数")
-    @TableId(value = "exam_count")
+    @TableField(value = "exam_count")
     private Integer examCount;
 
     @ApiModelProperty(value = "断点失效时间(秒)")
-    @TableId(value = "break_expire_seconds")
+    @TableField(value = "break_expire_seconds")
     private Integer breakExpireSeconds;
 
     @ApiModelProperty(value = "断点续考次数")
-    @TableId(value = "break_resume_count")
+    @TableField(value = "break_resume_count")
     private Integer breakResumeCount;
 
     @ApiModelProperty(value = "是否开启/强制客户端视频监控")
-    @TableId(value = "client_video_push")
+    @TableField(value = "client_video_push")
     private Integer clientVideoPush;
 
     @ApiModelProperty(value = "是否开启客户端视频转录")
-    @TableId(value = "client_video_record")
+    @TableField(value = "client_video_record")
     private Integer clientVideoRecord;
 
     @ApiModelProperty(value = "是否开启/强制微信小程序监控")
-    @TableId(value = "wxapp_video_push")
+    @TableField(value = "wxapp_video_push")
     private Integer wxappVideoPush;
 
     @ApiModelProperty(value = "是否开启微信小程序视频转录")
-    @TableId(value = "wxapp_video_record")
+    @TableField(value = "wxapp_video_record")
     private Integer wxappVideoRecord;
 
     @ApiModelProperty(value = "是否允许使用摄像头拍照答题")
-    @TableId(value = "camera_photo_upload")
+    @TableField(value = "camera_photo_upload")
     private Integer cameraPhotoUpload;
 
     @ApiModelProperty(value = "是否允许使用微信拍照答题")
-    @TableId(value = "wxapp_photo_upload")
+    @TableField(value = "wxapp_photo_upload")
     private Integer wxappPhotoUpload;
 
     @ApiModelProperty(value = "重考是否审批")
-    @TableId(value = "reexam_auditing")
+    @TableField(value = "reexam_auditing")
     private Integer reexamAuditing;
 
     @ApiModelProperty(value = "交卷后是否显示客观得分")
-    @TableId(value = "show_objective_score")
+    @TableField(value = "show_objective_score")
     private Integer showObjectiveScore;
 
     @ApiModelProperty(value = "模式,0:集中统一,1:随到随考")
-    @TableId(value = "mode")
+    @TableField(value = "mode")
     private Integer mode;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @TableId(value = "enable")
+    @TableField(value = "enable")
     private Integer enable;
 
     @ApiModelProperty(value = "是否归档")
-    @TableId(value = "archived")
+    @TableField(value = "archived")
     private Integer archived;
 
     @ApiModelProperty(value = "允许开考开放时长(秒),相当于迟到时间")
-    @TableId(value = "opening_seconds")
+    @TableField(value = "opening_seconds")
     private Integer openingSeconds;
 
     @ApiModelProperty(value = "最大考试时长")
-    @TableId(value = "max_duration_seconds")
+    @TableField(value = "max_duration_seconds")
     private Integer maxDurationSeconds;
 
     @ApiModelProperty(value = "是否在结束时间集中强制收卷")
-    @TableId(value = "force_finish")
+    @TableField(value = "force_finish")
     private Integer forceFinish;
 
     @ApiModelProperty(value = "开考身份验证策略")
-    @TableId(value = "entry_authentication_policy")
+    @TableField(value = "entry_authentication_policy")
     private Integer entryAuthenticationPolicy;
 
     @ApiModelProperty(value = "考试过程中人脸检测是否开启")
-    @TableId(value = "in_process_face_verify")
+    @TableField(value = "in_process_face_verify")
     private Integer inProcessFaceVerify;
 
     @ApiModelProperty(value = "考试过程中人脸检测是否忽略陌生人")
-    @TableId(value = "in_process_face_stranger_ignore")
+    @TableField(value = "in_process_face_stranger_ignore")
     private Integer inProcessFaceStrangerIgnore;
 
     @ApiModelProperty(value = "考试过程中是否启用活体检测")
-    @TableId(value = "in_process_liveness_verify")
+    @TableField(value = "in_process_liveness_verify")
     private Integer inProcessLivenessVerify;
 
     @ApiModelProperty(value = "考试过程中活体检测间隔时间")
-    @TableId(value = "in_process_liveness_interval_seconds")
+    @TableField(value = "in_process_liveness_interval_seconds")
     private Integer inProcessLivenessIntervalSeconds;
 
     @ApiModelProperty(value = "考试过程中活体检测重试次数")
-    @TableId(value = "in_process_liveness_retry_count")
+    @TableField(value = "in_process_liveness_retry_count")
     private Integer inProcessLivenessRetryCount;
 
     @ApiModelProperty(value = "考试过程中活体检测结果判定规则")
-    @TableId(value = "in_process_liveness_judge_policy")
+    @TableField(value = "in_process_liveness_judge_policy")
     private Integer inProcessLivenessJudgePolicy;
 
     @ApiModelProperty(value = "多次考试记录的选择逻辑")
-    @TableId(value = "record_select_strategy")
+    @TableField(value = "record_select_strategy")
     private Integer recordSelectStrategy;
 
     @ApiModelProperty(value = "是否IP段限制")
-    @TableId(value = "enable_ip_limit")
+    @TableField(value = "enable_ip_limit")
     private Integer enableIpLimit;
 
     @ApiModelProperty(value = "允许IP段")
-    @TableId(value = "ip_allow")
+    @TableField(value = "ip_allow")
     private String ipAllow;
 
     @ApiModelProperty(value = "算分状态")
-    @TableId(value = "score_status")
+    @TableField(value = "score_status")
     private Integer scoreStatus;
 
     public Integer getMode() {
@@ -325,14 +322,6 @@ public class Exam extends BaseEntity {
         return serialVersionUID;
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getOrgId() {
         return orgId;
     }

+ 9 - 26
themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamActivity.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.business.entity.common;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -14,56 +14,39 @@ import java.util.Date;
  * @Date: 2020/7/7
  */
 public class ExamActivity extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
 
     @ApiModelProperty(value = "批次id")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次代码")
-    @TableId(value = "code")
+    @TableField(value = "code")
     private String code;
 
     @ApiModelProperty(value = "提前多长时间开始候考(秒)")
-    @TableId(value = "prepare_seconds")
+    @TableField(value = "prepare_seconds")
     private Integer prepareSeconds;
 
     @ApiModelProperty(value = "最大考试时长")
-    @TableId(value = "max_duration_seconds")
+    @TableField(value = "max_duration_seconds")
     private Integer maxDurationSeconds;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @TableId(value = "enable")
+    @TableField(value = "enable")
     private Integer enable;
 
     @ApiModelProperty(value = "允许开考时长(秒)")
-    @TableId(value = "opening_seconds")
+    @TableField(value = "opening_seconds")
     private Integer openingSeconds;
 
     @ApiModelProperty(value = "开考时间")
-    @TableId(value = "start_time")
+    @TableField(value = "start_time")
     private Date startTime;
 
     @ApiModelProperty(value = "结束时间")
-    @TableId(value = "finish_time")
+    @TableField(value = "finish_time")
     private Date finishTime;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getExamId() {
         return examId;
     }

+ 9 - 8
themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamCourse.java

@@ -1,5 +1,6 @@
 package com.qmth.themis.business.entity.common;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -20,35 +21,35 @@ public class ExamCourse implements Serializable {
     private Long id;
 
     @ApiModelProperty(value = "考试ID")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "科目编码")
-    @TableId(value = "course_code")
+    @TableField(value = "course_code")
     private String courseCode;
 
     @ApiModelProperty(value = "科目名称")
-    @TableId(value = "course_name")
+    @TableField(value = "course_name")
     private String courseName;
 
     @ApiModelProperty(value = "是否开启客观题乱序")
-    @TableId(value = "objective_shuffle")
+    @TableField(value = "objective_shuffle")
     private Integer objectiveShuffle;
 
     @ApiModelProperty(value = "是否选项乱序,针对一个科目进行设置")
-    @TableId(value = "option_shuffle")
+    @TableField(value = "option_shuffle")
     private Integer optionShuffle;
 
     @ApiModelProperty(value = "已绑定试卷数量")
-    @TableId(value = "paper_count")
+    @TableField(value = "paper_count")
     private Integer paperCount;
 
     @ApiModelProperty(value = "是否已补齐标答")
-    @TableId(value = "has_answer")
+    @TableField(value = "has_answer")
     private Integer hasAnswer;
 
     @ApiModelProperty(value = "音频播放次数")
-    @TableId(value = "audio_play_time")
+    @TableField(value = "audio_play_time")
     private Integer audioPlayTime;
 
     public static long getSerialVersionUID() {

+ 14 - 31
themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamPaper.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.business.entity.common;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,76 +12,59 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2020/7/7
  */
 public class ExamPaper extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
 
     @ApiModelProperty(value = "试卷名称")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "试卷总分")
-    @TableId(value = "total_score")
+    @TableField(value = "total_score")
     private Double totalScore;
 
     @ApiModelProperty(value = "题干路径")
-    @TableId(value = "paper_path")
+    @TableField(value = "paper_path")
     private String paperPath;
 
     @ApiModelProperty(value = "解密密钥")
-    @TableId(value = "decrypt_secret")
+    @TableField(value = "decrypt_secret")
     private String decryptSecret;
 
     @ApiModelProperty(value = "自动、手动、不加密")
-    @TableId(value = "encrypt_mode")
+    @TableField(value = "encrypt_mode")
     private Integer encryptMode;
 
     @ApiModelProperty(value = "是否需要语音作答")
-    @TableId(value = "need_voice_answer")
+    @TableField(value = "need_voice_answer")
     private Integer needVoiceAnswer;
 
     @ApiModelProperty(value = "批次id")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "科目编码")
-    @TableId(value = "course_code")
+    @TableField(value = "course_code")
     private String courseCode;
 
     @ApiModelProperty(value = "试卷编码")
-    @TableId(value = "code")
+    @TableField(value = "code")
     private String code;
 
     @ApiModelProperty(value = "标答路径")
-    @TableId(value = "answer_path")
+    @TableField(value = "answer_path")
     private String answerPath;
 
     @ApiModelProperty(value = "题干包含音频")
-    @TableId(value = "has_audio")
+    @TableField(value = "has_audio")
     private Integer hasAudio;
 
     @ApiModelProperty(value = "调卷比例")
-    @TableId(value = "weight")
+    @TableField(value = "weight")
     private Double weight;
 
     @ApiModelProperty(value = "音频播放次数")
-    @TableId(value = "audio_play_time")
+    @TableField(value = "audio_play_time")
     private Integer audioPlayTime;
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public String getName() {
         return name;
     }

+ 14 - 31
themis-business/src/main/java/com/qmth/themis/business/entity/common/ExamStudent.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.business.entity.common;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,62 +12,57 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2020/7/7
  */
 public class ExamStudent extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
 
     @ApiModelProperty(value = "批次id")
-    @TableId(value = "exam_id")
+    @TableField(value = "exam_id")
     private Long examId;
 
     @ApiModelProperty(value = "场次id")
-    @TableId(value = "exam_activity_id")
+    @TableField(value = "exam_activity_id")
     private Long examActivityId;
 
     @ApiModelProperty(value = "学生id")
-    @TableId(value = "student_id")
+    @TableField(value = "student_id")
     private Long studentId;
 
     @ApiModelProperty(value = "科目代码")
-    @TableId(value = "course_code")
+    @TableField(value = "course_code")
     private String courseCode;
 
     @ApiModelProperty(value = "虚拟考场代码,考试唯一")
-    @TableId(value = "room_code")
+    @TableField(value = "room_code")
     private String roomCode;
 
     @ApiModelProperty(value = "证件号,机构内唯一")
-    @TableId(value = "identity")
+    @TableField(value = "identity")
     private String identity;
 
     @ApiModelProperty(value = "姓名")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "扩展字段")
-    @TableId(value = "parameter")
+    @TableField(value = "parameter")
     private String parameter;
 
     @ApiModelProperty(value = "剩余考试次数")
-    @TableId(value = "left_exam_count")
+    @TableField(value = "left_exam_count")
     private Integer leftExamCount;
 
     @ApiModelProperty(value = "当前考试记录ID")
-    @TableId(value = "current_record_id")
+    @TableField(value = "current_record_id")
     private Long currentRecordId;
 
     @ApiModelProperty(value = "最终生效的记录ID")
-    @TableId(value = "select_record_id")
+    @TableField(value = "select_record_id")
     private Long selectRecordId;
 
     @ApiModelProperty(value = "考场名称")
-    @TableId(value = "room_name")
+    @TableField(value = "room_name")
     private String roomName;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @TableId(value = "enable")
+    @TableField(value = "enable")
     private Integer enable;
 
     public String getRoomName() {
@@ -86,18 +81,6 @@ public class ExamStudent extends BaseEntity {
         this.enable = enable;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getExamId() {
         return examId;
     }

+ 10 - 27
themis-business/src/main/java/com/qmth/themis/business/entity/common/Student.java

@@ -1,6 +1,6 @@
 package com.qmth.themis.business.entity.common;
 
-import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.qmth.themis.business.base.BaseEntity;
 import io.swagger.annotations.ApiModelProperty;
 
@@ -12,46 +12,41 @@ import io.swagger.annotations.ApiModelProperty;
  * @Date: 2020/7/7
  */
 public class Student extends BaseEntity {
-    private static final long serialVersionUID = 1L;
-
-    @ApiModelProperty(value = "主键")
-    @TableId(value = "id")
-    private Long id;
 
     @ApiModelProperty(value = "机构ID")
-    @TableId(value = "org_id")
+    @TableField(value = "org_id")
     private Long orgId;
 
     @ApiModelProperty(value = "证件号")
-    @TableId(value = "identity")
+    @TableField(value = "identity")
     private String identity;
 
     @ApiModelProperty(value = "登陆密码,密文保存")
-    @TableId(value = "password")
+    @TableField(value = "password")
     private String password;
 
     @ApiModelProperty(value = "身份证号")
-    @TableId(value = "idcard_number")
+    @TableField(value = "idcard_number")
     private String idcardNumber;
 
     @ApiModelProperty(value = "手机号")
-    @TableId(value = "mobile_number")
+    @TableField(value = "mobile_number")
     private String mobileNumber;
 
     @ApiModelProperty(value = "姓名")
-    @TableId(value = "name")
+    @TableField(value = "name")
     private String name;
 
     @ApiModelProperty(value = "性别")
-    @TableId(value = "gender")
+    @TableField(value = "gender")
     private Integer gender;
 
     @ApiModelProperty(value = "底照保存地址")
-    @TableId(value = "base_photo_path")
+    @TableField(value = "base_photo_path")
     private String basePhotoPath;
 
     @ApiModelProperty(value = "是否启用,0:停用,1:启用")
-    @TableId(value = "enable")
+    @TableField(value = "enable")
     private Integer enable;
 
     public Integer getEnable() {
@@ -62,18 +57,6 @@ public class Student extends BaseEntity {
         this.enable = enable;
     }
 
-    public static long getSerialVersionUID() {
-        return serialVersionUID;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public void setId(Long id) {
-        this.id = id;
-    }
-
     public Long getOrgId() {
         return orgId;
     }

+ 0 - 2
themis-business/src/main/java/com/qmth/themis/business/service/impl/TBSessionServiceImpl.java

@@ -46,8 +46,6 @@ public class TBSessionServiceImpl extends ServiceImpl<TBSessionMapper, TBSession
                 tbSessionDb.setDeviceId(tbSession.getDeviceId());
                 tbSessionDb.setAccessToken(tbSession.getAccessToken());
                 tbSessionDb.setLastAccessIp(tbSession.getLastAccessIp());
-                tbSessionDb.setLastAccessTime(new Date());
-                tbSessionDb.setUpdateTime(new Date());
                 tbSessionDb.setExpireTime(tbSession.getExpireTime());
                 this.saveOrUpdate(tbSessionDb);
             } else {

+ 19 - 39
themis-business/src/main/resources/mapper/TEExamActivityMapper.xml

@@ -9,7 +9,7 @@
             information_schema.TABLES
         where
             LCASE(TABLE_NAME)= #{tableName}
-        and TABLE_SCHEMA = #{schema};
+        and TABLE_SCHEMA = #{schema}
     </select>
 
     <update id="dropTable">
@@ -21,26 +21,16 @@
           `id` bigint NOT NULL COMMENT '主键',
           `exam_id` bigint NOT NULL COMMENT '批次id',
           `code` varchar(50) NOT NULL COMMENT '场次代码',
-          `name` varchar(100) NOT NULL COMMENT '场次名称',
           `prepare_seconds` int NOT NULL COMMENT '提前多长时间开始候考(秒)',
-          `min_start_time` datetime NOT NULL COMMENT '最早开考时间',
-          `max_start_time` datetime NOT NULL COMMENT '最晚开考时间,相当于迟到时间',
           `max_duration_seconds` int DEFAULT NULL COMMENT '最大考试时长',
-          `min_duration_seconds` int DEFAULT NULL COMMENT '最短考试时间,相当于考试冻结时间(秒)',
-          `max_finish_time` datetime DEFAULT NULL COMMENT '集中收卷时间',
-          `exam_count` int DEFAULT NULL COMMENT '允许考试次数',
-          `break_expire_seconds` int DEFAULT NULL COMMENT '断点失效时间(秒)',
-          `break_resume_count` int DEFAULT NULL COMMENT '断点续考次数',
-          `entry_face_verify` tinyint DEFAULT NULL COMMENT '是否开启/强制开考人脸识别',
-          `entry_liveness_verify` tinyint DEFAULT NULL COMMENT '是否开启/强制开考活体检测',
-          `constant_face_verify` tinyint DEFAULT NULL COMMENT '考试过程中人脸检测是否开启',
-          `constant_liveness_verify_count` int DEFAULT NULL COMMENT '考试过程中随机活体验证次数',
-          `client_video_push` tinyint DEFAULT NULL COMMENT '是否开启/强制客户端视频监控',
-          `client_video_record` tinyint DEFAULT NULL COMMENT '是否开启客户端视频转录',
-          `wxapp_video_push` tinyint DEFAULT NULL COMMENT '是否开启/强制微信小程序监控',
-          `wxapp_video_record` tinyint DEFAULT NULL COMMENT '是否开启微信小程序视频转录',
-          `camera_photo_upload` tinyint DEFAULT NULL COMMENT '是否允许使用摄像头拍照答题',
-          `wxapp_photo_upload` tinyint DEFAULT NULL COMMENT '是否允许使用微信拍照答题',
+          `enable` tinyint DEFAULT '1' COMMENT '是否启用',
+          `opening_seconds` int DEFAULT NULL COMMENT '允许开考时长(秒)',
+          `start_time` datetime DEFAULT NULL COMMENT '开考时间',
+          `finish_time` datetime DEFAULT NULL COMMENT '结束时间',
+          `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+          `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+          `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+          `update_id` bigint DEFAULT NULL COMMENT '更新人id',
           PRIMARY KEY (`id`),
           UNIQUE KEY `${tableName}_code_Idx` (`code`)
         ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试场次'
@@ -48,31 +38,21 @@
 
     <insert id="insertInfo" parameterType="com.qmth.themis.business.entity.TEExamActivity">
         INSERT INTO ${tableName}
-            (id, exam_id, code, name, prepare_seconds, min_start_time, max_start_time, max_duration_seconds, min_duration_seconds, max_finish_time, exam_count, break_expire_seconds, break_resume_count, entry_face_verify, entry_liveness_verify, constant_face_verify, constant_liveness_verify_count, client_video_push, client_video_record, wxapp_video_push, wxapp_video_record, camera_photo_upload, wxapp_photo_upload)
-            VALUES(
+            (id, exam_id, code, prepare_seconds, max_duration_seconds, enable, opening_seconds, start_time, finish_time, create_time, update_time, create_id, update_id)
+        VALUES(
             #{TEExamActivity.id},
             #{TEExamActivity.examId},
             #{TEExamActivity.code},
-            #{TEExamActivity.name},
             #{TEExamActivity.prepareSeconds},
-            #{TEExamActivity.minStartTime},
-            #{TEExamActivity.maxStartTime},
             #{TEExamActivity.maxDurationSeconds},
-            #{TEExamActivity.minDurationSeconds},
-            #{TEExamActivity.maxFinishTime},
-            #{TEExamActivity.examCount},
-            #{TEExamActivity.breakExpireSeconds},
-            #{TEExamActivity.breakResumeCount},
-            #{TEExamActivity.entryFaceVerify},
-            #{TEExamActivity.entryLivenessVerify},
-            #{TEExamActivity.constantFaceVerify},
-            #{TEExamActivity.constantLivenessVerifyCount},
-            #{TEExamActivity.clientVideoPush},
-            #{TEExamActivity.clientVideoRecord},
-            #{TEExamActivity.wxappVideoPush},
-            #{TEExamActivity.wxappVideoRecord},
-            #{TEExamActivity.cameraPhotoUpload},
-            #{TEExamActivity.wxappPhotoUpload});
+            #{TEExamActivity.enable},
+            #{TEExamActivity.openingSeconds},
+            #{TEExamActivity.startTime},
+            #{TEExamActivity.finishTime},
+            #{TEExamActivity.createTime},
+            #{TEExamActivity.updateTime},
+            #{TEExamActivity.createId},
+            #{TEExamActivity.updateId})
     </insert>
 
     <select id="selectListPage" resultType="com.qmth.themis.business.entity.TEExamActivity">