Browse Source

merge from release_v4.1.3

deason 2 years ago
parent
commit
dbadc14625

+ 14 - 15
examcloud-core-oe-task-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/task/client/AbstractCloudClientSupport.java

@@ -5,27 +5,26 @@ import cn.com.qmth.examcloud.web.cloud.CloudClientSupport;
 
 /**
  * @author WANGWEI
- *
  */
 public abstract class AbstractCloudClientSupport extends CloudClientSupport {
 
-	private static final String APP_NAME = "EC-CORE-OE-TASK";
+    private static final String APP_NAME = "EC-CORE-OE-TASK";
 
-	@Override
-	protected String getRequestMappingPrefix() {
-		return "api/core/oe/student/face";
-	}
+    @Override
+    protected String getRequestMappingPrefix() {
+        return "api/core/oe/student/face";
+    }
 
-	protected void post(String requestMappingSuffix, BaseRequest body) {
-		super.post(APP_NAME, requestMappingSuffix, body);
-	}
+    protected void post(String requestMappingSuffix, BaseRequest body) {
+        super.post(APP_NAME, requestMappingSuffix, body);
+    }
 
-	protected void post(String requestMappingSuffix) {
-		super.post(APP_NAME, requestMappingSuffix);
-	}
+    protected void post(String requestMappingSuffix) {
+        super.post(APP_NAME, requestMappingSuffix);
+    }
 
-	protected <T> T post(String requestMappingSuffix, BaseRequest body, Class<T> responseType) {
-		return super.post(APP_NAME, requestMappingSuffix, body, responseType);
-	}
+    protected <T> T post(String requestMappingSuffix, BaseRequest body, Class<T> responseType) {
+        return super.post(APP_NAME, requestMappingSuffix, body, responseType);
+    }
 
 }

+ 1 - 34
examcloud-core-oe-task-api-client/src/main/java/cn/com/qmth/examcloud/core/oe/task/client/ExamCaptureCloudServiceClient.java

@@ -1,10 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.task.client;
 
 import cn.com.qmth.examcloud.core.oe.task.api.ExamCaptureCloudService;
-import cn.com.qmth.examcloud.core.oe.task.api.request.ExistUnhandledCaptureQueueReq;
-import cn.com.qmth.examcloud.core.oe.task.api.request.SaveExamCaptureSyncCompareResultReq;
-import cn.com.qmth.examcloud.core.oe.task.api.request.UpdateExamCaptureQueuePriorityReq;
-import cn.com.qmth.examcloud.core.oe.task.api.response.ExistUnhandledCaptureQueueResp;
 import org.springframework.stereotype.Service;
 
 /**
@@ -14,35 +10,6 @@ import org.springframework.stereotype.Service;
  * @Version 1.0
  */
 @Service("examCaptureCloudService")
-public class ExamCaptureCloudServiceClient extends AbstractCloudClientSupport
-        implements
-        ExamCaptureCloudService {
-    private static final String APP_NAME = "EC-CORE-OE-TASK";
+public class ExamCaptureCloudServiceClient extends AbstractCloudClientSupport implements ExamCaptureCloudService {
 
-    @Override
-    public void saveExamCaptureSyncCompareResult(SaveExamCaptureSyncCompareResultReq request) {
-        post("examCapture/saveExamCaptureSyncCompareResult", request);
-    }
-
-    /**
-     * @param req 更新照片优先级请求参数
-     * @description 更新考试抓拍照片在队列优中的先级
-     * @date 2019/7/31 16:46
-     * @author lideyin
-     */
-    @Override
-    public void updateExamCaptureQueuePriority(UpdateExamCaptureQueuePriorityReq req) {
-        post("examCapture/updateExamCaptureQueuePriority", req);
-    }
-
-    /**
-     * 是否存在未处理的图片抓拍队列(处理完成的队列数据都会清理掉)
-     *
-     * @param req
-     * @return
-     */
-    @Override
-    public ExistUnhandledCaptureQueueResp existsUnhandledCaptureQueue(ExistUnhandledCaptureQueueReq req) {
-        return post("examCapture/existsUnhandledCaptureQueue", req, ExistUnhandledCaptureQueueResp.class);
-    }
 }

+ 0 - 26
examcloud-core-oe-task-api/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/ExamCaptureCloudService.java

@@ -1,11 +1,6 @@
 package cn.com.qmth.examcloud.core.oe.task.api;
 
-
 import cn.com.qmth.examcloud.api.commons.CloudService;
-import cn.com.qmth.examcloud.core.oe.task.api.request.ExistUnhandledCaptureQueueReq;
-import cn.com.qmth.examcloud.core.oe.task.api.request.SaveExamCaptureSyncCompareResultReq;
-import cn.com.qmth.examcloud.core.oe.task.api.request.UpdateExamCaptureQueuePriorityReq;
-import cn.com.qmth.examcloud.core.oe.task.api.response.ExistUnhandledCaptureQueueResp;
 
 /**
  * @Description 考试抓拍云服务接口
@@ -14,26 +9,5 @@ import cn.com.qmth.examcloud.core.oe.task.api.response.ExistUnhandledCaptureQueu
  * @Version 1.0
  */
 public interface ExamCaptureCloudService extends CloudService {
-    /**
-     * 保存同步比较的抓拍照片结果
-     *
-     * @param request
-     */
-    void saveExamCaptureSyncCompareResult(SaveExamCaptureSyncCompareResultReq request);
-
-    /**
-     * @param req 更新照片优先级请求参数
-     * @description 更新考试抓拍照片在队列优中的先级
-     * @date 2019/7/31 16:46
-     * @author lideyin
-     */
-    void updateExamCaptureQueuePriority(UpdateExamCaptureQueuePriorityReq req);
 
-    /**
-     * 是否存在未处理的图片抓拍队列(处理完成的队列数据都会清理掉)
-     *
-     * @param req
-     * @return
-     */
-    ExistUnhandledCaptureQueueResp existsUnhandledCaptureQueue(ExistUnhandledCaptureQueueReq req);
 }

+ 0 - 25
examcloud-core-oe-task-api/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/request/ExistUnhandledCaptureQueueReq.java

@@ -1,25 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.task.api.request;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
-
-/**
- * @Description 是否存在未处理的抓拍队列请求类
- * @Author lideyin
- * @Date 2019/12/13 10:45
- * @Version 1.0
- */
-public class ExistUnhandledCaptureQueueReq extends BaseRequest {
-    private static final long serialVersionUID = 7851877428824179091L;
-    /**
-     * 考试记录id
-     */
-    private Long examRecordDataId;
-
-    public Long getExamRecordDataId() {
-        return examRecordDataId;
-    }
-
-    public void setExamRecordDataId(Long examRecordDataId) {
-        this.examRecordDataId = examRecordDataId;
-    }
-}

+ 0 - 31
examcloud-core-oe-task-api/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/request/SaveExamCaptureSyncCompareResultReq.java

@@ -1,31 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.task.api.request;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
-
-/**
- * @Description 保存同步人脸比对的结果
- * @Author lideyin
- * @Date 2019/12/13 10:48
- * @Version 1.0
- */
-public class SaveExamCaptureSyncCompareResultReq extends BaseRequest {
-    private static final long serialVersionUID = -6717698237605934610L;
-    private Long studentId;
-    private Long examRecordDataId;
-
-    public Long getStudentId() {
-        return studentId;
-    }
-
-    public void setStudentId(Long studentId) {
-        this.studentId = studentId;
-    }
-
-    public Long getExamRecordDataId() {
-        return examRecordDataId;
-    }
-
-    public void setExamRecordDataId(Long examRecordDataId) {
-        this.examRecordDataId = examRecordDataId;
-    }
-}

+ 0 - 37
examcloud-core-oe-task-api/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/request/UpdateExamCaptureQueuePriorityReq.java

@@ -1,37 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.task.api.request;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseRequest;
-
-/**
- * @Description 更新照片在队列中的优先级请求类
- * @Author lideyin
- * @Date 2019/12/13 10:47
- * @Version 1.0
- */
-public class UpdateExamCaptureQueuePriorityReq extends BaseRequest {
-    private static final long serialVersionUID = 4540866221965698301L;
-    /**
-     * 优先级
-     */
-    private int priority;
-    /**
-     * 考试记录id
-     */
-    private Long examRecordDataId;
-
-    public int getPriority() {
-        return priority;
-    }
-
-    public void setPriority(int priority) {
-        this.priority = priority;
-    }
-
-    public Long getExamRecordDataId() {
-        return examRecordDataId;
-    }
-
-    public void setExamRecordDataId(Long examRecordDataId) {
-        this.examRecordDataId = examRecordDataId;
-    }
-}

+ 0 - 24
examcloud-core-oe-task-api/src/main/java/cn/com/qmth/examcloud/core/oe/task/api/response/ExistUnhandledCaptureQueueResp.java

@@ -1,24 +0,0 @@
-package cn.com.qmth.examcloud.core.oe.task.api.response;
-
-import cn.com.qmth.examcloud.api.commons.exchange.BaseResponse;
-
-/**
- * @Description 是否存在未处理抓拍队列数据响应类
- * @Author lideyin
- * @Date 2019/12/13 10:44
- * @Version 1.0
- */
-public class ExistUnhandledCaptureQueueResp extends BaseResponse {
-		/**
-		 * 是否存在未处理的抓拍照片队列数据
-		 */
-		private Boolean exist;
-
-		public Boolean getExist() {
-			return exist;
-		}
-
-		public void setExist(Boolean exist) {
-			this.exist = exist;
-		}
-}