...

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/consumer/MarkWorkCreateConsumer.java

@@ -2,11 +2,8 @@ package cn.com.qmth.examcloud.task.service.consumer;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import cn.com.qmth.examcloud.core.oe.admin.api.bean.ExamRecordForMarkingBean;
-import cn.com.qmth.examcloud.core.oe.student.api.OeExamRecordForMarkingCloudService;
-import cn.com.qmth.examcloud.core.oe.student.api.request.UpdateExamRecordForMarkingBatchNumReq;
 import cn.com.qmth.examcloud.examwork.api.ExamStudentCloudService;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamCourseRelationBean;
 import cn.com.qmth.examcloud.examwork.api.bean.ExamStudentBean;
@@ -27,8 +24,6 @@ public class MarkWorkCreateConsumer extends Consumer<MarkWorkCreateDto> {
     private ExamStudentCloudService examStudentCloudService = SpringContextHolder
             .getBean(ExamStudentCloudService.class);
 
-    private OeExamRecordForMarkingCloudService oeExamRecordForMarkingCloudService = SpringContextHolder
-            .getBean(OeExamRecordForMarkingCloudService.class);
 
     @Override
     public void consume(MarkWorkCreateDto dto) {
@@ -54,10 +49,10 @@ public class MarkWorkCreateConsumer extends Consumer<MarkWorkCreateDto> {
         sreq.setWorkId(workId);
         sreq.setStudentPaperBeanList(studentPapers);
         studentPaperCloudService.saveStudentPaper(sreq);
-        UpdateExamRecordForMarkingBatchNumReq req = new UpdateExamRecordForMarkingBatchNumReq();
-        List<Long> ids = studentPapers.stream().map(m -> m.getExamRecordMarkingPk()).collect(Collectors.toList());
-        req.setIdList(ids);
-        req.setBatchNum(workId + "");
-        oeExamRecordForMarkingCloudService.updateExamRecordForMarkingBatchNum(req);
+//        UpdateExamRecordForMarkingBatchNumReq req = new UpdateExamRecordForMarkingBatchNumReq();
+//        List<Long> ids = studentPapers.stream().map(m -> m.getExamRecordMarkingPk()).collect(Collectors.toList());
+//        req.setIdList(ids);
+//        req.setBatchNum(workId + "");
+//        oeExamRecordForMarkingCloudService.updateExamRecordForMarkingBatchNum(req);
     }
 }

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ChangeExamCaptureQueueStatusTask.java

@@ -1,38 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.core.oe.task.api.ExamCaptureQueueCloudService;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-
-/**
- * 
- * @author  	chenken
- * @date    	2018年9月22日 下午2:25:22
- * @company 	QMTH
- * @description 将超过XX分钟，还在处理中抓拍照片的状态修改为未处理
- */
-@Component("changeExamCaptureQueueStatusTask")
-public class ChangeExamCaptureQueueStatusTask extends AbstractTask{
-	
-	@Autowired
-	TaskTracker taskTracker;
-	
-	@Autowired
-	private ExamCaptureQueueCloudService examCaptureQueueCloudService;
-	
-	@Override
-	public void run(ScheduleJob scheduleJob) throws Exception {
-		examCaptureQueueCloudService.changeExamCaptureQueueStatus();
-	}
-
-	@Override
-	public TaskTracker getTaskTracker() {
-		return taskTracker;
-	}
-	
-	
-}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamCaptureQueueFailedDisposeTask.java

@@ -1,38 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.core.oe.task.api.ExamCaptureQueueCloudService;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-
-
-/**
- * 
- * @author  	chenken
- * @date    	2018年12月3日 上午10:11:26
- * @company 	QMTH
- * @description 抓拍照片失败处理
- */
-@Component("examCaptureQueueFailedDisposeTask")
-public class ExamCaptureQueueFailedDisposeTask extends AbstractTask{
-
-	@Autowired
-	TaskTracker taskTracker;
-	
-	@Autowired
-	private ExamCaptureQueueCloudService examCaptureQueueCloudService;
-	
-	@Override
-	public TaskTracker getTaskTracker() {
-		return taskTracker;
-	}
-
-	@Override
-	public void run(ScheduleJob scheduleJob) throws Exception {
-		examCaptureQueueCloudService.examCaptureQueueFailedDispose();
-	}
-
-}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamScoreObtainNotifyQueueTask.java

@@ -1,38 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.core.oe.student.api.OeExamScoreObtainQueueCloudService;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-
-/**
- * 
- * @author  	chenken,lideyin
- * @date    	2018年12月27日 下午1:43:31,20190313
- * @company 	QMTH
- * @description 获取考试分数通知队列任务
- */
-@Component("examScoreObtainNotifyQueueTask")
-public class ExamScoreObtainNotifyQueueTask extends AbstractTask{
-
-	@Autowired
-	private TaskTracker taskTracker;
-	
-	@Autowired
-	private OeExamScoreObtainQueueCloudService oeExamScoreObtainQueueCloudService;
-	
-	@Override
-	public TaskTracker getTaskTracker() {
-		return taskTracker;
-	}
-
-	@Override
-	public void run(ScheduleJob scheduleJob) throws Exception {
-		oeExamScoreObtainQueueCloudService.updateObtainScoreNodifyQueue();
-	}
-	
-	
-}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ExamScoreObtainNotifyTask.java

@@ -1,36 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.core.oe.student.api.OeExamScoreNoticeQueueCloudService;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-
-/**
- * 
- * @author lideyin
- * @date 2019年3月11日 下午6:26:23
- * @description 获取考试分数通知任务
- */
-@Component("examScoreObtainNotifyTask")
-public class ExamScoreObtainNotifyTask extends AbstractTask{
-
-	@Autowired
-	private TaskTracker taskTracker;
-	@Autowired
-	private OeExamScoreNoticeQueueCloudService oeExamScoreNoticeQueueCloudService;
-	
-	@Override
-	public TaskTracker getTaskTracker() {
-		return taskTracker;
-	}
-
-	@Override
-	public void run(ScheduleJob scheduleJob) throws Exception {
-		oeExamScoreNoticeQueueCloudService.sendObtainScoreNotice();
-	}
-	
-	
-}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/OeCleanExamingRecordTask.java

@@ -1,70 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import cn.com.qmth.examcloud.core.oe.student.api.OeStudentExamRecordCloudService;
-import cn.com.qmth.examcloud.core.oe.student.api.bean.ExamingRecordBean;
-import cn.com.qmth.examcloud.core.oe.student.api.request.CleanExamingRecordReq;
-import cn.com.qmth.examcloud.core.oe.student.api.request.GetExamingRecordReq;
-import cn.com.qmth.examcloud.core.oe.student.api.response.GetExamingRecordResp;
-import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 网考自动交卷服务
- */
-@Component("oeCleanExamingRecordTask")
-public class OeCleanExamingRecordTask extends AbstractTask {
-
-	@Autowired
-	TaskTracker taskTracker;
-	
-	@Autowired
-	private OeStudentExamRecordCloudService oeStudentExamRecordCloudService;
-	private static final Log log = LogFactory.getLog(OeCleanExamingRecordTask.class);
-	
-	@Override
-	public void run(ScheduleJob scheduleJob) throws Exception {
-		Long startId = 0L;
-		int limit = PropertyHolder.getInt("oe.cleanExamingRecord.limit", 100);
-
-		while (true) {
-			GetExamingRecordReq req = new GetExamingRecordReq();
-			req.setLimit(limit);
-			req.setStartId(startId);
-			GetExamingRecordResp resp = oeStudentExamRecordCloudService.getExamingRecords(req);
-
-			if (startId.equals(resp.getNextId())) {
-				break;
-			} else {
-				//因为有可能手动交卷处理掉，所以找不到数据时，不抛错，继续执行下一批数据
-				if (null == resp.getList() || resp.getList().isEmpty()) {
-					startId = resp.getNextId();
-					continue;
-				}
-
-				for (ExamingRecordBean examingRecord : resp.getList()) {
-					try {
-						CleanExamingRecordReq cleanExamingRecordReq = new CleanExamingRecordReq();
-						cleanExamingRecordReq.setExamRecordDataId(examingRecord.getExamRecordDataId());
-						cleanExamingRecordReq.setId(examingRecord.getId());
-						cleanExamingRecordReq.setStudentId(examingRecord.getStudentId());
-						oeStudentExamRecordCloudService.cleanExamingRecord(cleanExamingRecordReq);
-					} catch (Exception e) {
-						log.error("[oeCleanExamingRecordTask_"+examingRecord.getExamRecordDataId()+"]交卷自动服务处理失败",e);
-					}
-				}
-				startId = resp.getNextId();
-			}
-		}
-	}
-
-	@Override
-	public TaskTracker getTaskTracker() {
-		return taskTracker;
-	}
-}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/OeCleanHandInExamRecordTask.java

@@ -1,69 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import cn.com.qmth.examcloud.core.oe.student.api.OeStudentExamRecordCloudService;
-import cn.com.qmth.examcloud.core.oe.student.api.bean.HandInExamRecordBean;
-import cn.com.qmth.examcloud.core.oe.student.api.request.CleanHandInExamRecordReq;
-import cn.com.qmth.examcloud.core.oe.student.api.request.GetHandInExamRecordReq;
-import cn.com.qmth.examcloud.core.oe.student.api.response.GetHandInExamRecordResp;
-import cn.com.qmth.examcloud.web.bootstrap.PropertyHolder;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * 处理已经交卷的数据
- */
-@Component("oeCleanHandInExamRecordTask")
-public class OeCleanHandInExamRecordTask extends AbstractTask {
-
-    private static final Log log = LogFactory.getLog(OeCleanHandInExamRecordTask.class);
-    @Autowired
-    TaskTracker taskTracker;
-    @Autowired
-    private OeStudentExamRecordCloudService oeStudentExamRecordCloudService;
-
-    @Override
-    public void run(ScheduleJob scheduleJob) throws Exception {
-        Long startId = 0L;
-        int limit = PropertyHolder.getInt("oe.cleanHandInExamRecord.limit", 100);
-
-        while (true) {
-            GetHandInExamRecordReq req = new GetHandInExamRecordReq();
-            req.setLimit(limit);
-            req.setStartId(startId);
-            GetHandInExamRecordResp resp = oeStudentExamRecordCloudService.getHandInExamRecords(req);
-
-            if (startId.equals(resp.getNextId())) {
-                break;
-            } else {
-                //因为有可能手动交卷处理掉，所以找不到数据时，不抛错，继续执行下一批数据
-                if (null == resp.getList() || resp.getList().isEmpty()) {
-                    startId = resp.getNextId();
-                    continue;
-                }
-
-                for (HandInExamRecordBean handInExam : resp.getList()) {
-                    try {
-                        CleanHandInExamRecordReq cleanHandInExamRecordReq = new CleanHandInExamRecordReq();
-                        cleanHandInExamRecordReq.setExamRecordDataId(handInExam.getExamRecordDataId());
-                        cleanHandInExamRecordReq.setId(handInExam.getId());
-                        cleanHandInExamRecordReq.setStudentId(handInExam.getStudentId());
-                        oeStudentExamRecordCloudService.cleanHandInExamRecord(cleanHandInExamRecordReq);
-                    } catch (Exception e) {
-                        log.error("[oeCleanHandInExamRecordTask_"+handInExam.getExamRecordDataId()+"]交卷后续动作自动服务处理失败",e);
-                    }
-                }
-                startId = resp.getNextId();
-            }
-        }
-    }
-
-    @Override
-    public TaskTracker getTaskTracker() {
-        return taskTracker;
-    }
-}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/OeCleanTempFileAnswerTask.java

@@ -1,34 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import cn.com.qmth.examcloud.core.oe.student.api.OeStudentExamRecordCloudService;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-/**
- * @Description 清理文件作答的临时数据
- * @Author lideyin
- * @Date 2019/8/13 19:10
- * @Version 1.0
- */
-@Component("oeCleanTempFileAnswerTask")
-public class OeCleanTempFileAnswerTask extends AbstractTask {
-
-	@Autowired
-	TaskTracker taskTracker;
-	
-	@Autowired
-	private OeStudentExamRecordCloudService oeStudentExamRecordCloudService;
-	
-	@Override
-	public void run(ScheduleJob scheduleJob) throws Exception {
-		oeStudentExamRecordCloudService.cleanTempFileAnswers();
-	}
-
-	@Override
-	public TaskTracker getTaskTracker() {
-		return taskTracker;
-	}
-}

examcloud-task-service/src/main/java/cn/com/qmth/examcloud/task/service/job/ProcessingExamCaptureQueueTask.java

@@ -1,37 +0,0 @@
-package cn.com.qmth.examcloud.task.service.job;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import cn.com.qmth.examcloud.core.oe.task.api.ExamCaptureQueueCloudService;
-import cn.com.qmth.examcloud.web.task.AbstractTask;
-import cn.com.qmth.examcloud.web.task.ScheduleJob;
-import cn.com.qmth.examcloud.web.task.TaskTracker;
-
-/**
- * 
- * @author  	chenken
- * @date    	2018年9月26日 上午9:39:51
- * @company 	QMTH
- * @description 处理照片队列
- */
-@Component("processingExamCaptureQueueTask")
-public class ProcessingExamCaptureQueueTask extends AbstractTask{
-
-	@Autowired
-	TaskTracker taskTracker;
-	
-	@Autowired
-	private ExamCaptureQueueCloudService examCaptureQueueCloudService;
-	
-	@Override
-	public TaskTracker getTaskTracker() {
-		return taskTracker;
-	}
-
-	@Override
-	public void run(ScheduleJob scheduleJob) throws Exception {
-		examCaptureQueueCloudService.processingExamCaptureQueue();
-	}
-
-}