Browse Source

修复密号重复以及异步任务可能数据遗漏BUG-优化

wangliang 5 năm trước cách đây
mục cha
commit
e436a5ff5c

+ 0 - 2
stmms-ms-commons/src/test/java/cn/com/qmth/stmms/ms/commons/image/ImageThumberTest.java

@@ -4,10 +4,8 @@ import javafx.application.Application;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.scheduling.config.ScheduledTask;
 import org.springframework.test.context.junit4.SpringRunner;
 
-import javax.annotation.Resource;
 import java.io.IOException;
 
 /**

+ 6 - 6
stmms-ms-marking/src/main/java/cn/com/qmth/stmms/ms/marking/service/MarkingService.java

@@ -189,12 +189,12 @@ public class MarkingService {
      * @param markTaskJob
      */
     public void levelsLog(List<MarkTask> markTasks, Paper paper, MarkTaskJob markTaskJob) {
-        List<MarkTask> result = markTasks.stream().filter(x -> Objects.isNull(x.getResult())).collect(Collectors.toList());
-        if (Objects.nonNull(result) && result.size() > 0) {
-            LOG.info("数据有误,未完成评卷任务");
-            markTaskJobRepo.updateMarkTaskJobByVersion(markTaskJob.getId(), markTaskJob.getVersion());
-            return;
-        }
+//        List<MarkTask> result = markTasks.stream().filter(x -> Objects.isNull(x.getResult())).collect(Collectors.toList());
+//        if (Objects.nonNull(result) && result.size() > 0) {
+//            LOG.info("数据有误,未完成评卷任务");
+//            markTaskJobRepo.updateMarkTaskJobByVersion(markTaskJob.getId(), markTaskJob.getVersion());
+//            return;
+//        }
         Map<Long, String> levelsMap = markTasks.stream().collect(Collectors.toMap(MarkTask::getMarkerId, o -> o.getResult().toUpperCase()));
         arbitrateCallback.judge(levelsMap, paper.getLevel(), new ArbitrateResult() {
             @Override