考务entity修改

themis-backend/pom.xml

@@ -30,6 +30,10 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-data-elasticsearch</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

themis-backend/src/main/resources/application.properties

@@ -95,12 +95,12 @@ spring.redis.jedis.pool.min-idle=1
 spring.redis.jedis.timeout=180000
 
 #mongodb
-spring.data.mongodb.uri=mongodb://${mongodb.host}:${mongodb.port}/${mongodb.database}
-spring.data.mongodb.grid-fs-database=${mongodb.database}
-spring.data.mongodb.database=${mongodb.database}
+#spring.data.mongodb.uri=mongodb://${mongodb.host}:${mongodb.port}/${mongodb.database}
+#spring.data.mongodb.grid-fs-database=${mongodb.database}
+#spring.data.mongodb.database=${mongodb.database}
 
 #elasticsearch
-spring.elasticsearch.rest.uris=http://localhost:9200
+#spring.elasticsearch.rest.uris=http://localhost:9200
 #spring.elasticsearch.rest.username=elastic
 #spring.elasticsearch.rest.password=123456
 

themis-business/src/main/java/com/qmth/themis/business/dao/TMRocketMessageMapper.java

@@ -0,0 +1,17 @@
+package com.qmth.themis.business.dao;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.qmth.themis.business.entity.TMRocketMessage;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Description: rocketmq消息 Mapper 接口
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/7/9
+ */
+@Mapper
+public interface TMRocketMessageMapper extends BaseMapper<TMRocketMessage> {
+
+}

themis-business/src/main/java/com/qmth/themis/business/entity/TMRocketMessage.java

@@ -0,0 +1,172 @@
+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.enums.MqEnum;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @Description: rocketmq消息
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/7/9
+ */
+@ApiModel(value = "t_m_rocket_message", description = "rocketmq消息")
+public class TMRocketMessage implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "主键")
+    @TableId(value = "id")
+    private String id;
+
+    @ApiModelProperty(value = "消息topic")
+    @TableField(value = "topic")
+    private String topic;
+
+    @ApiModelProperty(value = "消息tag")
+    @TableField(value = "tag")
+    private String tag;
+
+    @ApiModelProperty(value = "消息内容")
+    @TableField(value = "body")
+    private Object body;
+
+    @ApiModelProperty(value = "消息类型")
+    @TableField(value = "type")
+    private MqEnum type;
+
+    @ApiModelProperty(value = "关联业务id")
+    @TableField(value = "obj_id")
+    private String objId;
+
+    @ApiModelProperty(value = "关联业务名称")
+    @TableField(value = "obj_name")
+    private String objName;
+
+    @ApiModelProperty(value = "消息ack")
+    @TableField(value = "ack")
+    private Integer ack;
+
+    @ApiModelProperty(value = "消息序号")
+    @TableField(value = "sequence")
+    private Integer sequence;
+
+    @ApiModelProperty(value = "扩展类型")
+    @TableField(value = "properties")
+    private Map<String, Object> properties;
+
+    @ApiModelProperty(value = "创建时间")
+    @TableField(value = "create_time", fill = FieldFill.INSERT)
+    private Date createTime;
+
+    @ApiModelProperty(value = "时间戳")
+    @TableField(value = "timestamp")
+    private Long timestamp;
+
+    public static long getSerialVersionUID() {
+        return serialVersionUID;
+    }
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getTopic() {
+        return topic;
+    }
+
+    public void setTopic(String topic) {
+        this.topic = topic;
+    }
+
+    public String getTag() {
+        return tag;
+    }
+
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getObjName() {
+        return objName;
+    }
+
+    public void setObjName(String objName) {
+        this.objName = objName;
+    }
+
+    public Integer getAck() {
+        return ack;
+    }
+
+    public void setAck(Integer ack) {
+        this.ack = ack;
+    }
+
+    public Integer getSequence() {
+        return sequence;
+    }
+
+    public void setSequence(Integer sequence) {
+        this.sequence = sequence;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Object getBody() {
+        return body;
+    }
+
+    public void setBody(Object body) {
+        this.body = body;
+    }
+
+    public MqEnum getType() {
+        return type;
+    }
+
+    public void setType(MqEnum type) {
+        this.type = type;
+    }
+
+    public Map<String, Object> getProperties() {
+        return properties;
+    }
+
+    public void setProperties(Map<String, Object> properties) {
+        this.properties = properties;
+    }
+
+    public Long getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Long timestamp) {
+        this.timestamp = timestamp;
+    }
+}

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

@@ -65,6 +65,30 @@ public class ExamPaper extends BaseEntity {
     @TableField(value = "audio_play_time")
     private Integer audioPlayTime;
 
+    @ApiModelProperty(value = "结构文件路径")
+    @TableField(value = "struct_path")
+    private String structPath;
+
+    @ApiModelProperty(value = "解密向量")
+    @TableField(value = "decrypt_vector")
+    private String decryptVector;
+
+    public String getStructPath() {
+        return structPath;
+    }
+
+    public void setStructPath(String structPath) {
+        this.structPath = structPath;
+    }
+
+    public String getDecryptVector() {
+        return decryptVector;
+    }
+
+    public void setDecryptVector(String decryptVector) {
+        this.decryptVector = decryptVector;
+    }
+
     public String getName() {
         return name;
     }

themis-business/src/main/java/com/qmth/themis/business/service/TMRocketMessageService.java

@@ -0,0 +1,15 @@
+package com.qmth.themis.business.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.qmth.themis.business.entity.TMRocketMessage;
+
+/**
+ * @Description: rocketmq消息 服务类
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/7/9
+ */
+public interface TMRocketMessageService extends IService<TMRocketMessage> {
+
+}

themis-business/src/main/java/com/qmth/themis/business/service/impl/TMRocketMessageServiceImpl.java

@@ -0,0 +1,19 @@
+package com.qmth.themis.business.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.qmth.themis.business.dao.TMRocketMessageMapper;
+import com.qmth.themis.business.entity.TMRocketMessage;
+import com.qmth.themis.business.service.TMRocketMessageService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Description: rocketmq消息 服务实现类
+ * @Param:
+ * @return:
+ * @Author: wangliang
+ * @Date: 2020/7/9
+ */
+@Service
+public class TMRocketMessageServiceImpl extends ServiceImpl<TMRocketMessageMapper, TMRocketMessage> implements TMRocketMessageService {
+
+}

themis-business/src/main/resources/db/init.sql

@@ -90,6 +90,7 @@ CREATE TABLE `QRTZ_CRON_TRIGGERS` (
 
 LOCK TABLES `QRTZ_CRON_TRIGGERS` WRITE;
 /*!40000 ALTER TABLE `QRTZ_CRON_TRIGGERS` DISABLE KEYS */;
+INSERT INTO `QRTZ_CRON_TRIGGERS` VALUES ('ClusterQuartz','backendJob','backendGroupName','0 0/1 * * * ?','Asia/Shanghai');
 /*!40000 ALTER TABLE `QRTZ_CRON_TRIGGERS` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -163,6 +164,7 @@ CREATE TABLE `QRTZ_JOB_DETAILS` (
 
 LOCK TABLES `QRTZ_JOB_DETAILS` WRITE;
 /*!40000 ALTER TABLE `QRTZ_JOB_DETAILS` DISABLE KEYS */;
+INSERT INTO `QRTZ_JOB_DETAILS` VALUES ('ClusterQuartz','backendJob','backendGroupName',NULL,'com.qmth.themis.task.quartz.MqJob','0','0','0','0',_binary '��\0sr\0org.quartz.JobDataMap���迩��\0\0xr\0&org.quartz.utils.StringKeyDirtyFlagMap�����](\0
Z\0allowsTransientDataxr\0org.quartz.utils.DirtyFlagMap�.�(v\n�\0Z\0dirtyL\0mapt\0Ljava/util/Map;xp
sr\0java.util.HashMap���`�\0F\0\nloadFactorI\0	thresholdxp?@\0\0\0\0\0w\0\0\0\0\0\0
t\0namet\0!com.qmth.themis.task.quartz.MqJobx\0');
 /*!40000 ALTER TABLE `QRTZ_JOB_DETAILS` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -186,6 +188,7 @@ CREATE TABLE `QRTZ_LOCKS` (
 
 LOCK TABLES `QRTZ_LOCKS` WRITE;
 /*!40000 ALTER TABLE `QRTZ_LOCKS` DISABLE KEYS */;
+INSERT INTO `QRTZ_LOCKS` VALUES ('ClusterQuartz','STATE_ACCESS'),('ClusterQuartz','TRIGGER_ACCESS');
 /*!40000 ALTER TABLE `QRTZ_LOCKS` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -234,7 +237,7 @@ CREATE TABLE `QRTZ_SCHEDULER_STATE` (
 
 LOCK TABLES `QRTZ_SCHEDULER_STATE` WRITE;
 /*!40000 ALTER TABLE `QRTZ_SCHEDULER_STATE` DISABLE KEYS */;
-INSERT INTO `QRTZ_SCHEDULER_STATE` VALUES ('ClusterQuartz','kingdeMacBook-Air.local1593682790876',1593683183321,5000);
+INSERT INTO `QRTZ_SCHEDULER_STATE` VALUES ('ClusterQuartz','kingdeMacBook-Air.local1594287268892',1594287518535,5000);
 /*!40000 ALTER TABLE `QRTZ_SCHEDULER_STATE` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -349,6 +352,7 @@ CREATE TABLE `QRTZ_TRIGGERS` (
 
 LOCK TABLES `QRTZ_TRIGGERS` WRITE;
 /*!40000 ALTER TABLE `QRTZ_TRIGGERS` DISABLE KEYS */;
+INSERT INTO `QRTZ_TRIGGERS` VALUES ('ClusterQuartz','backendJob','backendGroupName','backendJob','backendGroupName',NULL,1594287540000,1594287480000,5,'WAITING','CRON',1594287377000,0,NULL,0,'');
 /*!40000 ALTER TABLE `QRTZ_TRIGGERS` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -367,6 +371,8 @@ CREATE TABLE `t_b_app` (
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   `last_access_time` datetime DEFAULT NULL COMMENT '最近访问时间',
+  `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+  `update_id` bigint DEFAULT NULL COMMENT '更新人id',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='app信息';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -393,10 +399,11 @@ CREATE TABLE `t_b_client_version` (
   `value` int NOT NULL COMMENT '版本号',
   `url` varchar(100) NOT NULL COMMENT '版本详情链接',
   `description` varchar(200) DEFAULT NULL COMMENT '版本描述',
-  `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
-  `user_id` bigint DEFAULT NULL COMMENT '更新人id',
+  `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
   `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`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='客户端版本';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -419,16 +426,22 @@ DROP TABLE IF EXISTS `t_b_org`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_b_org` (
   `id` bigint NOT NULL COMMENT '主键',
-  `org_code` varchar(50) NOT NULL COMMENT '机构代码，通常用学校简称表示，全局唯一',
+  `code` varchar(50) NOT NULL COMMENT '机构代码，通常用学校简称表示，全局唯一',
   `name` varchar(100) NOT NULL COMMENT '名称',
   `logo` varchar(100) DEFAULT NULL COMMENT 'logo图片url',
-  `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
+  `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
   `enable_simulate` tinyint DEFAULT NULL COMMENT '是否开启模考',
   `simulate_paper_id` bigint DEFAULT NULL COMMENT '模考试卷id',
-  `access_key` varchar(50) NOT NULL COMMENT '外部访问凭证',
-  `access_secret` varchar(50) NOT NULL COMMENT '外部访问密钥',
+  `access_key` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '外部访问凭证',
+  `access_secret` varchar(50) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '外部访问密钥',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `contact_name` varchar(50) DEFAULT NULL COMMENT '联系人',
+  `contact_phone` varchar(30) DEFAULT NULL COMMENT '联系人电话',
+  `enable_liveness` tinyint DEFAULT NULL COMMENT '是否允许使用活体',
+  `enable_video_record` tinyint DEFAULT NULL COMMENT '是否允许视频转录',
+  `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+  `update_id` bigint DEFAULT NULL COMMENT '更新人id',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='机构';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -439,7 +452,7 @@ CREATE TABLE `t_b_org` (
 
 LOCK TABLES `t_b_org` WRITE;
 /*!40000 ALTER TABLE `t_b_org` DISABLE KEYS */;
-INSERT INTO `t_b_org` VALUES (1,'20200702001','测试机构1',NULL,1,NULL,NULL,'1','2','2020-07-02 12:08:31',NULL);
+INSERT INTO `t_b_org` VALUES (1,'test1','test1',NULL,1,0,NULL,NULL,NULL,'2020-07-02 12:08:31','2020-07-02 12:08:31','sysadmin','11111111111',0,0,NULL,NULL);
 /*!40000 ALTER TABLE `t_b_org` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -533,14 +546,14 @@ DROP TABLE IF EXISTS `t_b_session`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_b_session` (
-  `id` varchar(100) NOT NULL COMMENT '主键',
+  `id` varchar(30) NOT NULL COMMENT '主键',
   `identity` varchar(100) NOT NULL COMMENT '用户标识',
   `type` varchar(50) NOT NULL COMMENT '用户类型',
   `source` varchar(50) NOT NULL COMMENT '访问来源',
   `platform` varchar(50) NOT NULL COMMENT '设备分类',
   `device_id` varchar(100) NOT NULL COMMENT '设备标识',
   `address` varchar(100) NOT NULL COMMENT '登录IP地址',
-  `access_token` varchar(500) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL COMMENT '访问令牌',
+  `access_token` varchar(50) NOT NULL COMMENT '访问令牌',
   `last_access_time` datetime DEFAULT NULL COMMENT '最近访问时间',
   `last_access_ip` varchar(100) DEFAULT NULL COMMENT '最近访问IP地址',
   `update_time` datetime DEFAULT NULL COMMENT '令牌更新时间',
@@ -555,7 +568,6 @@ CREATE TABLE `t_b_session` (
 
 LOCK TABLES `t_b_session` WRITE;
 /*!40000 ALTER TABLE `t_b_session` DISABLE KEYS */;
-INSERT INTO `t_b_session` VALUES ('1_SUPER_ADMIN_pc','1','SUPER_ADMIN','pc','win','1234567891','0:0:0:0:0:0:0:1','AbdrBCUGKv9vVvlbQXhqxq7gx9yZ1yW7','2020-07-02 17:43:16',NULL,'2020-07-02 17:43:16','2020-07-03 17:43:16'),('2_TEACHER_pc','2','TEACHER','pc','win','1234567891','0:0:0:0:0:0:0:1','xM1AgSKivYmruH7Pxn5HiUjkqhQucR08','2020-07-02 17:43:54',NULL,'2020-07-02 17:43:54','2020-07-03 17:43:54'),('3_STUDENT_pc','3','STUDENT','pc','win','1234567891','0:0:0:0:0:0:0:1','x4plwyCN4XKtpkFDRJnE0ewxVz4pInI2','2020-07-02 17:41:52',NULL,'2020-07-02 17:41:52','2020-07-03 17:41:52');
 /*!40000 ALTER TABLE `t_b_session` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -571,11 +583,14 @@ CREATE TABLE `t_b_user` (
   `login_name` varchar(50) NOT NULL COMMENT '用户名',
   `password` varchar(30) NOT NULL COMMENT '密码',
   `mobile_number` varchar(30) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '手机号',
-  `enable` tinyint NOT NULL DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
-  `org_id` bigint DEFAULT NULL COMMENT '机构id',
+  `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
+  `org_id` bigint NOT NULL COMMENT '机构id',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
   `remark` varchar(100) DEFAULT NULL COMMENT '备注',
+  `name` varchar(50) NOT NULL COMMENT '姓名',
+  `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+  `update_id` bigint DEFAULT NULL COMMENT '更新人id',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='用户';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -586,7 +601,7 @@ CREATE TABLE `t_b_user` (
 
 LOCK TABLES `t_b_user` WRITE;
 /*!40000 ALTER TABLE `t_b_user` DISABLE KEYS */;
-INSERT INTO `t_b_user` VALUES (1,'sysadmin','yXVUkR45PFz0UfpbDB8/ew==','',1,NULL,'2020-07-02 12:08:31',NULL,'系统管理员'),(2,'t1','yXVUkR45PFz0UfpbDB8/ew==',NULL,1,1,'2020-07-02 12:08:31',NULL,NULL),(3,'s1','yXVUkR45PFz0UfpbDB8/ew==',NULL,1,1,'2020-07-02 12:08:31',NULL,NULL);
+INSERT INTO `t_b_user` VALUES (1,'sysadmin','yXVUkR45PFz0UfpbDB8/ew==',NULL,1,1,'2020-07-02 12:08:31',NULL,'系统管理员','sysadmin',NULL,NULL),(2,'t1','yXVUkR45PFz0UfpbDB8/ew==',NULL,1,1,'2020-07-02 12:08:31',NULL,NULL,'测试老师1',NULL,NULL),(3,'s1','yXVUkR45PFz0UfpbDB8/ew==',NULL,1,1,'2020-07-02 12:08:31',NULL,NULL,'测试学生1',NULL,NULL);
 /*!40000 ALTER TABLE `t_b_user` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -615,6 +630,32 @@ INSERT INTO `t_b_user_role` VALUES (1,1,'SUPER_ADMIN'),(2,2,'TEACHER'),(3,3,'STU
 /*!40000 ALTER TABLE `t_b_user_role` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `t_e_config`
+--
+
+DROP TABLE IF EXISTS `t_e_config`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t_e_config` (
+  `id` bigint NOT NULL COMMENT '主键',
+  `similarity_threshold` double DEFAULT NULL COMMENT '相似度比较阀值',
+  `liveness_action_count` int DEFAULT NULL COMMENT '活体动作个数',
+  `liveness_action_retry_count` int DEFAULT NULL COMMENT '活体单个动作重试次数',
+  `liveness_action_limit_seconds` int DEFAULT NULL COMMENT '活体单个动作限时秒数',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='全局配置';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `t_e_config`
+--
+
+LOCK TABLES `t_e_config` WRITE;
+/*!40000 ALTER TABLE `t_e_config` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t_e_config` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `t_e_exam`
 --
@@ -640,13 +681,6 @@ CREATE TABLE `t_e_exam` (
   `exam_count` int DEFAULT NULL COMMENT '允许考试次数',
   `break_expire_seconds` int DEFAULT NULL COMMENT '断点失效时间(秒)',
   `break_resume_count` int DEFAULT NULL COMMENT '断点续考次数',
-  `liveness_action_count` int DEFAULT NULL COMMENT '活体动作个数',
-  `liveness_action_retry_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 '考试过程中随机活体验证次数',
-  `constant_liveness_retry_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 '是否开启/强制微信小程序监控',
@@ -654,11 +688,28 @@ CREATE TABLE `t_e_exam` (
   `camera_photo_upload` tinyint DEFAULT NULL COMMENT '是否允许使用摄像头拍照答题',
   `wxapp_photo_upload` tinyint DEFAULT NULL COMMENT '是否允许使用微信拍照答题',
   `reexam_auditing` tinyint DEFAULT NULL COMMENT '重考是否审批',
-  `select_strategy` tinyint DEFAULT NULL COMMENT '多次考试记录的选择逻辑：全部阅卷后取最高分；客观分最高；最后一次提交',
-  `ip_limit` varchar(1000) DEFAULT NULL COMMENT 'IP段限制',
   `show_objective_score` tinyint DEFAULT NULL COMMENT '交卷后是否显示客观得分',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `mode` tinyint DEFAULT NULL COMMENT '模式，0：集中统一，1：随到随考',
+  `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
+  `archived` tinyint DEFAULT NULL COMMENT '是否归档',
+  `opening_seconds` int DEFAULT NULL COMMENT '允许开考开放时长(秒)，相当于迟到时间',
+  `max_duration_seconds` int DEFAULT NULL COMMENT '最大考试时长',
+  `force_finish` tinyint DEFAULT NULL COMMENT '是否在结束时间集中强制收卷',
+  `entry_authentication_policy` tinyint DEFAULT NULL COMMENT '开考身份验证策略\noff: 关闭\nface_verify_optional: 非强制人脸验证\nface_verify_force: 强制人脸验证\nliveness: 活体验证',
+  `in_process_face_verify` tinyint DEFAULT NULL COMMENT '考试过程中人脸检测是否开启',
+  `in_process_face_stranger_ignore` tinyint DEFAULT NULL COMMENT '考试过程中人脸检测是否忽略陌生人\n',
+  `in_process_liveness_verify` tinyint DEFAULT NULL COMMENT '考试过程中是否启用活体检测\n',
+  `in_process_liveness_interval_seconds` tinyint DEFAULT NULL COMMENT '考试过程中活体检测间隔时间',
+  `in_process_liveness_retry_count` tinyint DEFAULT NULL COMMENT '考试过程中活体检测重试次数\n',
+  `in_process_liveness_judge_policy` tinyint DEFAULT NULL COMMENT '考试过程中活体检测结果判定规则\nany: 任意一次通过\nall: 全部都要通过\nmore: 通过次数大于失败次数',
+  `record_select_strategy` tinyint DEFAULT NULL COMMENT '多次考试记录的选择逻辑：\nhighest_total_score: 全部阅卷后取最高分\nhighest_objective_score: 客观分最高\nlatest: 最后一次提交',
+  `enable_ip_limit` tinyint DEFAULT NULL COMMENT '是否IP段限制',
+  `ip_allow` varchar(1000) DEFAULT NULL COMMENT '允许IP段',
+  `score_status` tinyint DEFAULT NULL COMMENT '算分状态\nnever: 从未算分\ncalculating: 正在算分\nfinish: 算分完成',
+  `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+  `update_id` bigint DEFAULT NULL COMMENT '更新人id',
   PRIMARY KEY (`id`),
   UNIQUE KEY `t_e_exam_code_Idx` (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试批次';
@@ -670,6 +721,7 @@ CREATE TABLE `t_e_exam` (
 
 LOCK TABLES `t_e_exam` WRITE;
 /*!40000 ALTER TABLE `t_e_exam` DISABLE KEYS */;
+INSERT INTO `t_e_exam` VALUES (14017935244787712,1,'zXnGzKId0o6l4VVm0lfw','123','test1','2020-07-09 16:22:16','2020-07-09 16:22:16',0,'123456',30,30,'99999',30,'88888',5,30,3,1,1,1,1,1,1,1,1,'2020-07-09 16:22:16',NULL,0,1,0,30,30,1,1,1,1,1,30,3,1,1,1,'1',1,NULL,NULL),(14018717067247616,1,'tveXEdkYjQEHvQd1JqKK','123','test1','2020-07-09 16:25:23','2020-07-09 16:25:23',0,'123456',30,30,'99999',30,'88888',5,30,3,1,1,1,1,1,1,1,1,'2020-07-09 16:25:23',NULL,0,1,0,30,30,1,1,1,1,1,30,3,1,1,1,'1',1,NULL,NULL),(14018960554983424,1,'gtWz7PojgIE9rmutRkKq','123','test1','2020-07-09 16:26:21','2020-07-09 16:26:21',0,'123456',30,30,'99999',30,'88888',5,30,3,1,1,1,1,1,1,1,1,'2020-07-09 16:26:25',NULL,0,1,0,30,30,1,1,1,1,1,30,3,1,1,1,'1',1,NULL,NULL),(14019477511340032,1,'aRghUl1VDFU9gEMnpChX','123','test1','2020-07-09 16:28:24','2020-07-09 16:28:24',0,'123456',30,30,'99999',30,'88888',5,30,3,1,1,1,1,1,1,1,1,'2020-07-09 16:28:24','2020-07-09 16:28:24',0,1,0,30,30,1,1,1,1,1,30,3,1,1,1,'1',1,NULL,NULL);
 /*!40000 ALTER TABLE `t_e_exam` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -684,26 +736,16 @@ CREATE TABLE `t_e_exam_activity` (
   `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 '是否启用，0：停用，1：启用',
+  `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 `t_e_exam_activity_code_Idx` (`code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试场次';
@@ -718,6 +760,42 @@ LOCK TABLES `t_e_exam_activity` WRITE;
 /*!40000 ALTER TABLE `t_e_exam_activity` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `t_e_exam_activity_test1`
+--
+
+DROP TABLE IF EXISTS `t_e_exam_activity_test1`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t_e_exam_activity_test1` (
+  `id` bigint NOT NULL COMMENT '主键',
+  `exam_id` bigint NOT NULL COMMENT '批次id',
+  `code` varchar(50) NOT NULL COMMENT '场次代码',
+  `prepare_seconds` int NOT NULL COMMENT '提前多长时间开始候考(秒)',
+  `max_duration_seconds` int 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 `t_e_exam_activity_test1_code_Idx` (`code`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试场次';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `t_e_exam_activity_test1`
+--
+
+LOCK TABLES `t_e_exam_activity_test1` WRITE;
+/*!40000 ALTER TABLE `t_e_exam_activity_test1` DISABLE KEYS */;
+INSERT INTO `t_e_exam_activity_test1` VALUES (14017936758931456,14017935244787712,'O1XFPKl9L9cGfj8r8nLq',30,30,1,30,'2020-07-09 16:22:17','2020-07-09 16:22:17','2020-07-09 16:22:17',NULL,NULL,NULL),(14018717528621056,14018717067247616,'SZiB2Tsn3PaEJUbKOpXw',30,30,1,30,'2020-07-09 16:25:23','2020-07-09 16:25:23','2020-07-09 16:25:23',NULL,NULL,NULL),(14019124715847680,14018960554983424,'Ffu657LSUwsCT9lPYiI3',30,30,1,30,'2020-07-09 16:27:00','2020-07-09 16:27:00','2020-07-09 16:27:00',NULL,NULL,NULL),(14019477708472320,14019477511340032,'VVh0GsP5KKbZaCeu5dtX',30,30,1,30,'2020-07-09 16:28:24','2020-07-09 16:28:24','2020-07-09 16:28:24',NULL,NULL,NULL);
+/*!40000 ALTER TABLE `t_e_exam_activity_test1` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `t_e_exam_breach_log`
 --
@@ -762,12 +840,13 @@ DROP TABLE IF EXISTS `t_e_exam_course`;
 CREATE TABLE `t_e_exam_course` (
   `id` bigint NOT NULL COMMENT '主键',
   `exam_id` bigint NOT NULL COMMENT '考试ID',
-  `exam_activity_id` bigint NOT NULL COMMENT '场次ID',
   `course_code` varchar(30) NOT NULL COMMENT '科目编码',
   `course_name` varchar(50) NOT NULL COMMENT '科目名称',
   `objective_shuffle` tinyint DEFAULT NULL COMMENT '是否开启客观题乱序',
   `option_shuffle` tinyint DEFAULT NULL COMMENT '是否选项乱序，针对一个科目进行设置',
-  `paper_ids` varchar(2000) NOT NULL COMMENT '所有绑定的考试试卷',
+  `paper_count` int DEFAULT NULL COMMENT '已绑定试卷数量',
+  `has_answer` tinyint DEFAULT NULL COMMENT '是否已补齐标答',
+  `audio_play_time` int DEFAULT NULL COMMENT '音频播放次数',
   PRIMARY KEY (`id`),
   UNIQUE KEY `t_e_exam_course_course_code_Idx` (`course_code`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试科目';
@@ -779,6 +858,7 @@ CREATE TABLE `t_e_exam_course` (
 
 LOCK TABLES `t_e_exam_course` WRITE;
 /*!40000 ALTER TABLE `t_e_exam_course` DISABLE KEYS */;
+INSERT INTO `t_e_exam_course` VALUES (14017937207721984,14017935244787712,'HExIq','测试科目1',1,1,1,1,1),(14018717809639424,14018717067247616,'MtHC8','测试科目1',1,1,1,1,1),(14019125760229376,14018960554983424,'Lh6AE','测试科目1',1,1,1,1,1),(14019477788164096,14019477511340032,'iLbDF','测试科目1',1,1,1,1,1);
 /*!40000 ALTER TABLE `t_e_exam_course` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -794,13 +874,22 @@ CREATE TABLE `t_e_exam_paper` (
   `name` varchar(100) NOT NULL COMMENT '试卷名称',
   `total_score` double NOT NULL COMMENT '试卷总分',
   `paper_path` varchar(100) DEFAULT NULL COMMENT '题干路径',
-  `standard_answer_path` varchar(100) DEFAULT NULL COMMENT '标答路径',
   `decrypt_secret` varchar(50) DEFAULT NULL COMMENT '解密密钥',
   `encrypt_mode` tinyint DEFAULT NULL COMMENT '自动、手动、不加密',
-  `has_video` tinyint DEFAULT NULL COMMENT '题干包含音视频',
   `need_voice_answer` tinyint DEFAULT NULL COMMENT '是否需要语音作答',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `exam_id` bigint DEFAULT NULL COMMENT '考试批次id',
+  `code` varchar(50) DEFAULT NULL COMMENT '试卷编码',
+  `answer_path` varchar(100) DEFAULT NULL COMMENT '标答路径',
+  `has_audio` tinyint DEFAULT NULL COMMENT '题干包含音频',
+  `weight` double DEFAULT NULL COMMENT '调卷比例',
+  `audio_play_time` int DEFAULT NULL COMMENT '音频播放次数',
+  `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+  `update_id` bigint DEFAULT NULL COMMENT '更新人id',
+  `course_code` varchar(30) DEFAULT NULL COMMENT '科目编码',
+  `struct_path` varchar(100) DEFAULT NULL COMMENT '结构文件路径',
+  `decrypt_vector` varchar(100) DEFAULT NULL COMMENT '解密向量',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试试卷';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -871,6 +960,12 @@ CREATE TABLE `t_e_exam_student` (
   `left_exam_count` int DEFAULT NULL COMMENT '剩余考试次数',
   `current_record_id` bigint DEFAULT NULL COMMENT '当前考试记录ID',
   `select_record_id` bigint DEFAULT NULL COMMENT '最终生效的记录ID',
+  `room_name` varchar(100) DEFAULT NULL COMMENT '考场名称',
+  `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
+  `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`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考生库';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -881,6 +976,7 @@ CREATE TABLE `t_e_exam_student` (
 
 LOCK TABLES `t_e_exam_student` WRITE;
 /*!40000 ALTER TABLE `t_e_exam_student` DISABLE KEYS */;
+INSERT INTO `t_e_exam_student` VALUES (14017938180800512,14017935244787712,14017936758931456,14017934745665536,'HExIq','1','SFiCvTk5ERz6bq5jxUzP','132','{\"examTest1\":\"aaa\",\"examTest2\":\"bbb\"}',1,NULL,NULL,'test1',1,'2020-07-09 16:22:17',NULL,NULL,NULL),(14018718455562240,14018717067247616,14018717528621056,14018716748480512,'MtHC8','1','R75yEUGeO40N7G74BfHl','132','{\"examTest1\":\"aaa\",\"examTest2\":\"bbb\"}',1,NULL,NULL,'test1',1,'2020-07-09 16:25:23',NULL,NULL,NULL),(14019126959800320,14018960554983424,14019124715847680,14018960143941632,'Lh6AE','1','ZVJfQteiTjg0D1ISA3Ye','132','{\"examTest1\":\"aaa\",\"examTest2\":\"bbb\"}',1,NULL,NULL,'test1',1,'2020-07-09 16:27:00',NULL,NULL,NULL),(14019477951741952,14019477511340032,14019477708472320,14019477171601408,'iLbDF','1','Y7bwz3KvsdSmCCSQfduV','132','{\"examTest1\":\"aaa\",\"examTest2\":\"bbb\"}',1,NULL,NULL,'test1',1,'2020-07-09 16:28:24','2020-07-09 16:28:24',NULL,NULL);
 /*!40000 ALTER TABLE `t_e_exam_student` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -915,31 +1011,33 @@ LOCK TABLES `t_e_exam_student_log` WRITE;
 UNLOCK TABLES;
 
 --
--- Table structure for table `t_e_exam_user_privilege`
+-- Table structure for table `t_e_simulate_paper`
 --
 
-DROP TABLE IF EXISTS `t_e_exam_user_privilege`;
+DROP TABLE IF EXISTS `t_e_simulate_paper`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `t_e_exam_user_privilege` (
+CREATE TABLE `t_e_simulate_paper` (
   `id` bigint NOT NULL COMMENT '主键',
-  `user_id` bigint NOT NULL COMMENT '用户ID',
-  `role_code` varchar(30) NOT NULL COMMENT '角色编码',
-  `exam_id` bigint NOT NULL COMMENT '考试ID',
-  `exam_activity_id` bigint NOT NULL COMMENT '考试场次ID',
-  `course_code` varchar(30) NOT NULL COMMENT '科目编码',
-  `room_code` varchar(50) NOT NULL COMMENT '考场代码',
+  `org_id` bigint NOT NULL COMMENT '机构id',
+  `name` varchar(100) NOT NULL COMMENT '试卷名称',
+  `total_score` double NOT NULL COMMENT '总分',
+  `paper_path` varchar(100) 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`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考务权限设置';
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='模拟试卷';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
--- Dumping data for table `t_e_exam_user_privilege`
+-- Dumping data for table `t_e_simulate_paper`
 --
 
-LOCK TABLES `t_e_exam_user_privilege` WRITE;
-/*!40000 ALTER TABLE `t_e_exam_user_privilege` DISABLE KEYS */;
-/*!40000 ALTER TABLE `t_e_exam_user_privilege` ENABLE KEYS */;
+LOCK TABLES `t_e_simulate_paper` WRITE;
+/*!40000 ALTER TABLE `t_e_simulate_paper` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t_e_simulate_paper` ENABLE KEYS */;
 UNLOCK TABLES;
 
 --
@@ -961,6 +1059,9 @@ CREATE TABLE `t_e_student` (
   `base_photo_path` varchar(100) 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',
+  `enable` tinyint DEFAULT '1' COMMENT '是否启用，0：停用，1：启用',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='学生档案';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -971,6 +1072,7 @@ CREATE TABLE `t_e_student` (
 
 LOCK TABLES `t_e_student` WRITE;
 /*!40000 ALTER TABLE `t_e_student` DISABLE KEYS */;
+INSERT INTO `t_e_student` VALUES (14017934745665536,1,'gohtNJ7vBpn1LQsrPShynwjfi9FCi7','123456','Y1Cru3cVGkOzjB07JB','57541179016','aaa',1,'http://11111','2020-07-09 16:22:16',NULL,NULL,NULL,1),(14018716748480512,1,'N9EoeYUHmz52fw27jtIp0rFtTLwc8j','123456','Td25r1Y4zFVB1sxF4d','94684987712','aaa',1,'http://11111','2020-07-09 16:25:23',NULL,NULL,NULL,1),(14018960143941632,1,'CRA0fFM3eXaG6bNf4ZXP7axv3O0p8Y','123456','upwjbg4s0Zj7muOykT','66120611075','aaa',1,'http://11111','2020-07-09 16:26:21',NULL,NULL,NULL,1),(14019477171601408,1,'xZtRoAV3uTD0FsBgCuWDyUcNDKbrpk','123456','tqep3qX5oWZ4Ygqwbe','20836923204','aaa',1,'http://11111','2020-07-09 16:28:24','2020-07-09 16:28:24',NULL,NULL,1);
 /*!40000 ALTER TABLE `t_e_student` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -983,8 +1085,8 @@ DROP TABLE IF EXISTS `t_e_user_log`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_e_user_log` (
   `id` bigint NOT NULL COMMENT '主键',
-  `user_id` bigint NOT NULL COMMENT '用户ID',
-  `type` tinyint DEFAULT NULL COMMENT '类型',
+  `user_id` bigint NOT NULL COMMENT '用户id',
+  `type` tinyint NOT NULL COMMENT '类型',
   `description` varchar(1000) DEFAULT NULL COMMENT '描述',
   `remark` varchar(1000) DEFAULT NULL COMMENT '备注',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
@@ -1095,6 +1197,39 @@ LOCK TABLES `t_ie_invigilate_warn_info` WRITE;
 /*!40000 ALTER TABLE `t_ie_invigilate_warn_info` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `t_m_rocket_message`
+--
+
+DROP TABLE IF EXISTS `t_m_rocket_message`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t_m_rocket_message` (
+  `id` varchar(50) NOT NULL COMMENT '主键',
+  `topic` varchar(100) NOT NULL COMMENT '消息topic',
+  `tag` varchar(100) NOT NULL COMMENT '消息tag',
+  `body` mediumtext NOT NULL COMMENT '消息内容',
+  `type` varchar(50) NOT NULL COMMENT '消息类型',
+  `obj_id` varchar(50) NOT NULL COMMENT '关联业务id',
+  `obj_name` varchar(100) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '关联业务名称',
+  `ack` tinyint NOT NULL COMMENT '消息ack',
+  `sequence` int DEFAULT NULL COMMENT '消息序号',
+  `properties` varchar(1000) CHARACTER SET utf8 COLLATE utf8_general_ci DEFAULT NULL COMMENT '扩展类型',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `timestamp` bigint DEFAULT NULL COMMENT '时间戳',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='rocketmq消息';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `t_m_rocket_message`
+--
+
+LOCK TABLES `t_m_rocket_message` WRITE;
+/*!40000 ALTER TABLE `t_m_rocket_message` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t_m_rocket_message` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `t_oe_exam_answer`
 --
@@ -1112,6 +1247,7 @@ CREATE TABLE `t_oe_exam_answer` (
   `version` bigint DEFAULT NULL COMMENT '版本时间戳',
   `history` mediumtext COMMENT '作答轨迹',
   `duration_seconds` int DEFAULT NULL COMMENT '作答时长',
+  `score` double DEFAULT NULL COMMENT '分数',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='作答结果';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1140,10 +1276,8 @@ CREATE TABLE `t_oe_exam_break_history` (
   `resume_reason` varchar(300) DEFAULT NULL COMMENT '提交异常原因',
   `prepare_time` datetime DEFAULT NULL COMMENT '恢复候考时间',
   `start_time` datetime DEFAULT NULL COMMENT '恢复开考时间',
-  `entry_face_verify_result` tinyint DEFAULT NULL COMMENT '恢复开考人脸验证结果',
-  `entry_face_verify_history_id` bigint DEFAULT NULL COMMENT '恢复开考人脸验证记录ID',
-  `entry_liveness_verify_result` tinyint DEFAULT NULL COMMENT '恢复开考活体验证结果',
-  `entry_liveness_verify_history_id` bigint DEFAULT NULL COMMENT '恢复开考活体验证记录ID',
+  `entry_authentication_result` tinyint DEFAULT NULL COMMENT '恢复开考身份验证结果',
+  `entry_authentication_id` bigint DEFAULT NULL COMMENT '恢复开考身份验证记录ID',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试断点记录';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1157,6 +1291,32 @@ LOCK TABLES `t_oe_exam_break_history` WRITE;
 /*!40000 ALTER TABLE `t_oe_exam_break_history` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `t_oe_exam_invigilate_user`
+--
+
+DROP TABLE IF EXISTS `t_oe_exam_invigilate_user`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t_oe_exam_invigilate_user` (
+  `id` bigint NOT NULL COMMENT '主键',
+  `org_id` bigint NOT NULL COMMENT '机构ID',
+  `user_id` bigint NOT NULL COMMENT '用户ID',
+  `room_code` varchar(50) NOT NULL COMMENT '考场代码',
+  `room_name` varchar(100) NOT NULL COMMENT '考场名称',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='监考员设置';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `t_oe_exam_invigilate_user`
+--
+
+LOCK TABLES `t_oe_exam_invigilate_user` WRITE;
+/*!40000 ALTER TABLE `t_oe_exam_invigilate_user` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t_oe_exam_invigilate_user` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Table structure for table `t_oe_exam_record`
 --
@@ -1170,7 +1330,6 @@ CREATE TABLE `t_oe_exam_record` (
   `exam_activity_id` bigint NOT NULL COMMENT '考试场次ID',
   `exam_student_id` bigint NOT NULL COMMENT '考生ID',
   `paper_id` bigint NOT NULL COMMENT '实际使用的试卷ID',
-  `paper_struct_path` varchar(100) DEFAULT NULL COMMENT '个人试卷结构保存地址',
   `answer_path` varchar(100) DEFAULT NULL COMMENT '全部作答保存地址',
   `order_number` int DEFAULT NULL COMMENT '第几次考试',
   `status` tinyint DEFAULT NULL COMMENT '当前状态',
@@ -1180,14 +1339,6 @@ CREATE TABLE `t_oe_exam_record` (
   `last_prepare_time` datetime DEFAULT NULL COMMENT '最近恢复候考时间',
   `last_start_time` datetime DEFAULT NULL COMMENT '最近恢复开考时间',
   `left_break_resume_count` int DEFAULT NULL COMMENT '剩余断点续考次数',
-  `entry_face_verify_result` tinyint DEFAULT NULL COMMENT '开考人脸验证结果',
-  `entry_face_verify_history_id` bigint DEFAULT NULL COMMENT '开考人脸验证记录ID',
-  `entry_liveness_verify_result` tinyint DEFAULT NULL COMMENT '开考活体验证结果',
-  `entry_liveness_verify_history_id` bigint DEFAULT NULL COMMENT '开考活体验证记录ID',
-  `last_face_verify_result` tinyint DEFAULT NULL COMMENT '最近过程人脸验证结果',
-  `last_face_verify_history_id` bigint DEFAULT NULL COMMENT '最近过程人脸验证记录ID',
-  `last_liveness_verify_result` tinyint DEFAULT NULL COMMENT '最近活体验证结果',
-  `last_liveness_verify_history_id` bigint DEFAULT NULL COMMENT '最近活体验证记录ID',
   `client_current_ip` varchar(30) DEFAULT NULL COMMENT '客户端当前IP地址',
   `client_websocket_status` tinyint DEFAULT NULL COMMENT '客户端websocket状态',
   `client_websocket_id` varchar(50) DEFAULT NULL COMMENT '客户端websocket连接标识',
@@ -1208,6 +1359,15 @@ CREATE TABLE `t_oe_exam_record` (
   `objective_score` double DEFAULT NULL COMMENT '客观题分数',
   `paper_download` tinyint DEFAULT NULL COMMENT '试题下载，0：是，1：不是',
   `breach_status` tinyint DEFAULT NULL COMMENT '是否违纪，0：是，1：不是',
+  `paper_struct` mediumtext COMMENT '个人试卷结构',
+  `paper_struct_upload` tinyint DEFAULT NULL COMMENT '个人试卷结构是否已上传',
+  `serial_number` int DEFAULT NULL COMMENT '第几次考试',
+  `last_break_id` bigint DEFAULT NULL COMMENT '最近断点记录ID',
+  `entry_authentication_result` tinyint DEFAULT NULL COMMENT '开考身份验证结果',
+  `entry_authentication_id` bigint DEFAULT NULL COMMENT '开考身份验证记录ID',
+  `in_process_face_verify_status` tinyint DEFAULT NULL COMMENT '当前过程人脸检测状态',
+  `in_process_liveness_verify_status` tinyint DEFAULT NULL COMMENT '当前过程活体验证状态',
+  `in_process_liveness_verify_count` int DEFAULT NULL COMMENT '已完成过程活体验证次数',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='考试记录';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1256,12 +1416,13 @@ DROP TABLE IF EXISTS `t_oe_face_verify_history`;
 CREATE TABLE `t_oe_face_verify_history` (
   `id` bigint NOT NULL COMMENT '主键',
   `exam_record_id` bigint NOT NULL COMMENT '考试记录ID',
-  `photo_path` varchar(100) DEFAULT NULL COMMENT '图片保存路径',
   `similarity` double DEFAULT NULL COMMENT '相似度分数',
   `realness` tinyint DEFAULT NULL COMMENT '真实性验证结果',
-  `local_pass` tinyint DEFAULT NULL COMMENT '本地验证是否通过',
   `create_time` datetime DEFAULT NULL COMMENT '创建时间',
   `update_time` datetime DEFAULT NULL COMMENT '更新时间',
+  `type` tinyint DEFAULT NULL COMMENT '初次开考、恢复开考、过程中',
+  `photo_url` varchar(100) DEFAULT NULL COMMENT '图片保存路径',
+  `pass` tinyint DEFAULT NULL COMMENT '本地验证是否通过',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='人脸验证记录';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1285,10 +1446,13 @@ DROP TABLE IF EXISTS `t_oe_liveness_verify_history`;
 CREATE TABLE `t_oe_liveness_verify_history` (
   `id` bigint NOT NULL COMMENT '主键',
   `exam_record_id` bigint NOT NULL COMMENT '考试记录ID',
-  `type` tinyint NOT NULL COMMENT '开考还是过程中',
+  `type` tinyint NOT NULL COMMENT '初次开考、恢复开考、过程中',
   `actions` varchar(2000) DEFAULT NULL COMMENT '随机动作与结果',
   `result` tinyint DEFAULT NULL COMMENT '检测结果',
-  `create_time` datetime DEFAULT NULL COMMENT '完成时间',
+  `retry` int DEFAULT NULL COMMENT '重试次数',
+  `pass` tinyint DEFAULT NULL COMMENT '本地验证是否通过',
+  `start_time` datetime DEFAULT NULL COMMENT '开始时间',
+  `finish_time` datetime DEFAULT NULL COMMENT '完成时间',
   PRIMARY KEY (`id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='活体验证记录';
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -1302,6 +1466,71 @@ LOCK TABLES `t_oe_liveness_verify_history` WRITE;
 /*!40000 ALTER TABLE `t_oe_liveness_verify_history` ENABLE KEYS */;
 UNLOCK TABLES;
 
+--
+-- Table structure for table `t_oe_simulate_paper`
+--
+
+DROP TABLE IF EXISTS `t_oe_simulate_paper`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t_oe_simulate_paper` (
+  `id` bigint NOT NULL COMMENT '主键',
+  `org_id` bigint NOT NULL COMMENT '机构ID',
+  `name` varchar(50) NOT NULL COMMENT '试卷名称',
+  `total_score` double DEFAULT NULL COMMENT '总分',
+  `paper_path` varchar(100) 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`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='模拟试卷';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `t_oe_simulate_paper`
+--
+
+LOCK TABLES `t_oe_simulate_paper` WRITE;
+/*!40000 ALTER TABLE `t_oe_simulate_paper` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t_oe_simulate_paper` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `t_oe_task_history`
+--
+
+DROP TABLE IF EXISTS `t_oe_task_history`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `t_oe_task_history` (
+  `id` bigint NOT NULL COMMENT '主键',
+  `type` tinyint NOT NULL COMMENT '任务类型：\ncalculate_exam_score: 考试重新算分\nimport_exam_student: 导入考生\nimport_exam_paper: 导入试卷\nimport_invigilate_user: 导入监考员\nexport_invigilate_user: 导出监考员',
+  `entity_id` bigint NOT NULL COMMENT '关联业务对象ID',
+  `status` tinyint NOT NULL COMMENT '任务状态：\ninit: 未开始\nrunning: 开始执行\nfinish: 执行结束',
+  `summary` varchar(100) DEFAULT NULL COMMENT '实时摘要信息',
+  `progress` double DEFAULT NULL COMMENT '执行进度',
+  `import_file_name` varchar(100) NOT NULL COMMENT '导入文件名',
+  `import_file_path` varchar(500) NOT NULL COMMENT '导入文件路径',
+  `result_file_path` varchar(500) NOT NULL COMMENT '结果文件路径',
+  `error_file_path` varchar(500) DEFAULT NULL COMMENT '错误记录路径',
+  `create_id` bigint DEFAULT NULL COMMENT '创建人id',
+  `create_time` datetime DEFAULT NULL COMMENT '创建时间',
+  `start_time` datetime DEFAULT NULL COMMENT '开始时间',
+  `finish_time` datetime DEFAULT NULL COMMENT '结束时间',
+  PRIMARY KEY (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='异步任务';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `t_oe_task_history`
+--
+
+LOCK TABLES `t_oe_task_history` WRITE;
+/*!40000 ALTER TABLE `t_oe_task_history` DISABLE KEYS */;
+/*!40000 ALTER TABLE `t_oe_task_history` ENABLE KEYS */;
+UNLOCK TABLES;
+
 --
 -- Dumping routines for database 'themis'
 --
@@ -1315,4 +1544,4 @@ UNLOCK TABLES;
 /*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
 /*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
 
--- Dump completed on 2020-07-02 17:46:36
+-- Dump completed on 2020-07-09 18:48:31

themis-business/src/main/resources/mapper/TMRocketMessageMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qmth.themis.business.dao.TMRocketMessageMapper">
+
+</mapper>

themis-mq/src/main/java/com/qmth/themis/mq/listener/RocketSessionConsumer.java

@@ -1,8 +1,11 @@
 package com.qmth.themis.mq.listener;
 
+import com.google.gson.Gson;
 import com.qmth.themis.business.constant.SystemConstant;
 import com.qmth.themis.business.entity.TBSession;
+import com.qmth.themis.business.entity.TMRocketMessage;
 import com.qmth.themis.business.service.TBSessionService;
+import com.qmth.themis.business.service.TMRocketMessageService;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
@@ -21,6 +24,7 @@ import org.apache.rocketmq.spring.core.RocketMQPushConsumerLifecycleListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -47,6 +51,9 @@ public class RocketSessionConsumer implements
     @Resource
     RedisUtil redisUtil;
 
+    @Resource
+    TMRocketMessageService tmRocketMessageService;
+
     /**
      * 并发消费
      *
@@ -55,10 +62,12 @@ public class RocketSessionConsumer implements
      * @return
      */
     @Override
+    @Transactional
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
         try {
             long threadId = Thread.currentThread().getId();
             String threadName = Thread.currentThread().getName();
+            Gson gson = new Gson();
             for (MessageExt messageExt : msgs) {
                 log.info(":{}-:{} sessionConsumer 重试次数:{}", threadId, threadName, messageExt.getReconsumeTimes());
                 MqDto mqDto = JacksonUtil.readJson(new String(messageExt.getBody(), Constants.CHARSET), MqDto.class);
@@ -67,6 +76,10 @@ public class RocketSessionConsumer implements
                 if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE) {
                     log.info(":{}-:{} 更新db", threadId, threadName);
                     tbSessionService.saveSessionInfo(JacksonUtil.readJson(JacksonUtil.parseJson(mqDto.getBody()), TBSession.class), mqDto.getTimestamp());
+                    mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
+                    TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
+                    tmRocketMessage.setBody(JacksonUtil.parseJson(tmRocketMessage.getBody()));
+                    tmRocketMessageService.save(tmRocketMessage);
                     redisUtil.deleteSessionTopicList(SystemConstant.SESSION_TOPIC_BUFFER_LIST, mqDto.getId());
                     return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                 } else {

themis-mq/src/main/java/com/qmth/themis/mq/listener/RocketUserLogConsumer.java

@@ -1,9 +1,12 @@
 package com.qmth.themis.mq.listener;
 
+import com.google.gson.Gson;
 import com.qmth.themis.business.constant.SystemConstant;
+import com.qmth.themis.business.entity.TMRocketMessage;
 import com.qmth.themis.business.enums.MqEnum;
 import com.qmth.themis.business.enums.SystemOperationEnum;
 import com.qmth.themis.business.service.TEUserLogService;
+import com.qmth.themis.business.service.TMRocketMessageService;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
@@ -22,6 +25,7 @@ import org.apache.rocketmq.spring.core.RocketMQPushConsumerLifecycleListener;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -44,11 +48,16 @@ public class RocketUserLogConsumer implements MessageListenerConcurrently {
     @Resource
     TEUserLogService teUserLogService;
 
+    @Resource
+    TMRocketMessageService tmRocketMessageService;
+
     @Override
+    @Transactional
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
         try {
             long threadId = Thread.currentThread().getId();
             String threadName = Thread.currentThread().getName();
+            Gson gson = new Gson();
             for (MessageExt messageExt : msgs) {
                 log.info(":{}-:{} userLogConsumer重试次数:{}", threadId, threadName, messageExt.getReconsumeTimes());
 //                MqDto mqDto = (MqDto) toJavaObject(parseObject(new String(messageExt.getBody(), Constants.CHARSET)), MqDto.class);
@@ -58,6 +67,9 @@ public class RocketUserLogConsumer implements MessageListenerConcurrently {
                 if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE) {
                     log.info(":{}-:{} 插入用户轨迹日志", threadId, threadName);
                     teUserLogService.saveUserLogInfo(mqDto.getTimestamp(), mqDto.getObjId(), MqEnum.valueOf(String.valueOf(mqDto.getType())).getId(), SystemOperationEnum.valueOf(String.valueOf(mqDto.getBody())).getCode(), JacksonUtil.parseJson(mqDto));
+                    mqDto.setAck(SystemConstant.STANDARD_ACK_TYPE);
+                    TMRocketMessage tmRocketMessage = gson.fromJson(gson.toJson(mqDto), TMRocketMessage.class);
+                    tmRocketMessageService.save(tmRocketMessage);
                     redisUtil.deleteSessionTopicList(SystemConstant.USERLOG_TOPIC_BUFFER_LIST, mqDto.getId());
                     return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                 } else {

themis-task/src/main/java/com/qmth/themis/task/start/StartRunning.java

@@ -2,6 +2,7 @@ package com.qmth.themis.task.start;
 
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.task.config.DictionaryConfig;
+import com.qmth.themis.task.quartz.MqJob;
 import com.qmth.themis.task.service.QuartzService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -9,6 +10,7 @@ import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -34,10 +36,10 @@ public class StartRunning implements CommandLineRunner {
         log.info("服务器启动时执行 start");
         log.info("增加mqjob start");
         //如果已经创建了任务，下次并不需要删除和新增
-//        Map map = new HashMap();
-//        map.put("name", MqJob.class.getName());
-//        quartzService.deleteJob(dictionaryConfig.quartzConfigDomain().getBackendJobName(), dictionaryConfig.quartzConfigDomain().getBackendJobGroupName());
-//        quartzService.addJob(MqJob.class, dictionaryConfig.quartzConfigDomain().getBackendJobName(), dictionaryConfig.quartzConfigDomain().getBackendJobGroupName(), "0 0/1 * * * ?", map);
+        Map map = new HashMap();
+        map.put("name", MqJob.class.getName());
+        quartzService.deleteJob(dictionaryConfig.quartzConfigDomain().getBackendJobName(), dictionaryConfig.quartzConfigDomain().getBackendJobGroupName());
+        quartzService.addJob(MqJob.class, dictionaryConfig.quartzConfigDomain().getBackendJobName(), dictionaryConfig.quartzConfigDomain().getBackendJobGroupName(), "0 0/1 * * * ?", map);
         log.info("增加mqjob end");
         log.info("服务器启动时执行 end");
     }