deason 3 жил өмнө
parent
commit
395b6b21d9

+ 7 - 5
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/ExamCaptureQueueRepo.java

@@ -1,14 +1,13 @@
 package cn.com.qmth.examcloud.core.oe.admin.dao;
 
+import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamCaptureQueueEntity;
+import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamCaptureQueueStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 import org.springframework.stereotype.Repository;
 
-import cn.com.qmth.examcloud.core.oe.admin.dao.entity.ExamCaptureQueueEntity;
-import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamCaptureQueueStatus;
-
 import javax.transaction.Transactional;
 import java.util.Date;
 import java.util.List;
@@ -19,6 +18,7 @@ import java.util.List;
  * @company QMTH
  * @description ExamCaptureQueueRepo
  */
+@Deprecated
 @Repository
 public interface ExamCaptureQueueRepo extends JpaRepository<ExamCaptureQueueEntity, Long>, JpaSpecificationExecutor<ExamCaptureQueueEntity> {
 
@@ -101,15 +101,17 @@ public interface ExamCaptureQueueRepo extends JpaRepository<ExamCaptureQueueEnti
     @Modifying
     @Query(value = "update ec_oe_exam_capture_queue set is_pass=?2,is_stranger=?3,`status`=?4,face_compare_result=?5,face_compare_start_time=?6,update_time=?7 where id=?1", nativeQuery = true)
     void saveExamCaptureQueueEntityBySuccessful(Long captureQueueId, Boolean isPass, Boolean isStranger, String status,
-                                                String faceCompareResult,Long faceCompareStartTime,Date updateDate);
+                                                String faceCompareResult, Long faceCompareStartTime, Date updateDate);
 
     /**
      * 更新批次号
+     *
      * @param captureQueueId 队列id
-     * @param batchNum 批次号
+     * @param batchNum       批次号
      */
     @Transactional
     @Modifying
     @Query(value = "update ec_oe_exam_capture_queue set process_batch_num=?2 where id=?1", nativeQuery = true)
     void updateProcessBatchNum(Long captureQueueId, String batchNum);
+
 }

+ 66 - 64
examcloud-core-oe-admin-dao/src/main/java/cn/com/qmth/examcloud/core/oe/admin/dao/entity/ExamCaptureQueueEntity.java

@@ -1,12 +1,9 @@
 package cn.com.qmth.examcloud.core.oe.admin.dao.entity;
 
-import javax.persistence.*;
-
 import cn.com.qmth.examcloud.core.oe.admin.dao.enums.ExamCaptureQueueStatus;
-import cn.com.qmth.examcloud.web.jpa.JpaEntity;
 import cn.com.qmth.examcloud.web.jpa.WithIdJpaEntity;
 
-import java.util.Date;
+import javax.persistence.*;
 
 /**
  * @author chenken
@@ -15,15 +12,17 @@ import java.util.Date;
  * @description 抓拍队列
  */
 @Entity
-@Table(name="ec_oe_exam_capture_queue",indexes = {
-        @Index(name = "IDX_E_O_E_C_Q_001",columnList = "examRecordDataId,fileName",unique = true),
-        @Index(name = "IDX_E_O_E_C_Q_002",columnList = "status,errorNum")
+@Table(name = "ec_oe_exam_capture_queue", indexes = {
+        @Index(name = "IDX_E_O_E_C_Q_001", columnList = "examRecordDataId,fileName", unique = true),
+        @Index(name = "IDX_E_O_E_C_Q_002", columnList = "status,errorNum")
 })
+@Deprecated
 public class ExamCaptureQueueEntity extends WithIdJpaEntity {
+
     /**
-	 * 
-	 */
-	private static final long serialVersionUID = 4094671807731989565L;
+     *
+     */
+    private static final long serialVersionUID = 4094671807731989565L;
 
     private Long studentId;
 
@@ -31,8 +30,8 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
      * ec_oe_exam_record_data  ID
      */
     private Long examRecordDataId;
-    
-    
+
+
     /**
      * 底照Token
      */
@@ -42,7 +41,7 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
      * 文件URL
      */
     private String fileUrl;
-    
+
     /**
      * 文件名称
      */
@@ -58,7 +57,7 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
      * 错误信息
      */
     private String errorMsg;
-    
+
     /**
      * 错误次数
      */
@@ -67,23 +66,23 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
     /**
      * 是否存在虚拟摄像头
      */
-    @Column(name="has_virtual_camera")
+    @Column(name = "has_virtual_camera")
     private Boolean hasVirtualCamera;
-    
+
     /**
      * 摄像头信息  json字符串数组
      */
     @Column(name = "camera_infos", length = 800)
     private String cameraInfos;
-    
+
     /**
      * 其他信息
      * Json格式
      * {
-     * 	"":""
+     * "":""
      * }
      */
-    @Column(name="ext_msg",length=800)
+    @Column(name = "ext_msg", length = 800)
     private String extMsg;
 
     /**
@@ -94,7 +93,7 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
     /**
      * 队列处理的优先级,默认值为0
      */
-    private int priority=0;
+    private int priority = 0;
 
     /**
      * 是否有陌生人
@@ -102,6 +101,7 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
      */
     @Column(name = "is_stranger")
     private Boolean isStranger;
+
     /**
      * 比较是否通过
      */
@@ -111,8 +111,9 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
     /**
      * 人脸比较返回信息
      */
-    @Column(name = "face_compare_result",length = 2000)
+    @Column(name = "face_compare_result", length = 2000)
     private String faceCompareResult;
+
     /**
      * 人脸比对开始时间
      */
@@ -121,7 +122,7 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
     /**
      * 百度在线活体检测结果
      */
-    @Column(name = "faceliveness_result",length = 2000)
+    @Column(name = "faceliveness_result", length = 2000)
     private String facelivenessResult;
 
     public Long getExamRecordDataId() {
@@ -156,61 +157,61 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
         this.errorMsg = errorMsg;
     }
 
-	public String getBaseFaceToken() {
-		return baseFaceToken;
-	}
+    public String getBaseFaceToken() {
+        return baseFaceToken;
+    }
 
-	public void setBaseFaceToken(String baseFaceToken) {
-		this.baseFaceToken = baseFaceToken;
-	}
+    public void setBaseFaceToken(String baseFaceToken) {
+        this.baseFaceToken = baseFaceToken;
+    }
 
-	public String getFileName() {
-		return fileName;
-	}
+    public String getFileName() {
+        return fileName;
+    }
 
-	public void setFileName(String fileName) {
-		this.fileName = fileName;
-	}
+    public void setFileName(String fileName) {
+        this.fileName = fileName;
+    }
 
-	public Integer getErrorNum() {
-		return errorNum;
-	}
+    public Integer getErrorNum() {
+        return errorNum;
+    }
 
-	public void setErrorNum(Integer errorNum) {
-		this.errorNum = errorNum;
-	}
+    public void setErrorNum(Integer errorNum) {
+        this.errorNum = errorNum;
+    }
 
-	public Long getStudentId() {
-		return studentId;
-	}
+    public Long getStudentId() {
+        return studentId;
+    }
 
-	public void setStudentId(Long studentId) {
-		this.studentId = studentId;
-	}
+    public void setStudentId(Long studentId) {
+        this.studentId = studentId;
+    }
 
-	public Boolean getHasVirtualCamera() {
-		return hasVirtualCamera;
-	}
+    public Boolean getHasVirtualCamera() {
+        return hasVirtualCamera;
+    }
 
-	public void setHasVirtualCamera(Boolean hasVirtualCamera) {
-		this.hasVirtualCamera = hasVirtualCamera;
-	}
+    public void setHasVirtualCamera(Boolean hasVirtualCamera) {
+        this.hasVirtualCamera = hasVirtualCamera;
+    }
 
-	public String getCameraInfos() {
-		return cameraInfos;
-	}
+    public String getCameraInfos() {
+        return cameraInfos;
+    }
 
-	public void setCameraInfos(String cameraInfos) {
-		this.cameraInfos = cameraInfos;
-	}
+    public void setCameraInfos(String cameraInfos) {
+        this.cameraInfos = cameraInfos;
+    }
 
-	public String getExtMsg() {
-		return extMsg;
-	}
+    public String getExtMsg() {
+        return extMsg;
+    }
 
-	public void setExtMsg(String extMsg) {
-		this.extMsg = extMsg;
-	}
+    public void setExtMsg(String extMsg) {
+        this.extMsg = extMsg;
+    }
 
     public String getProcessBatchNum() {
         return processBatchNum;
@@ -267,4 +268,5 @@ public class ExamCaptureQueueEntity extends WithIdJpaEntity {
     public void setFacelivenessResult(String facelivenessResult) {
         this.facelivenessResult = facelivenessResult;
     }
+
 }