考务导入接口

themis-business/src/main/java/com/qmth/themis/business/templete/impl/TaskExamStudentTemplete.java

@@ -15,7 +15,6 @@ import com.qmth.themis.business.enums.RoleEnum;
 import com.qmth.themis.business.enums.TaskTypeExecEnum;
 import com.qmth.themis.business.service.*;
 import com.qmth.themis.business.templete.TaskImportTemplete;
-import com.qmth.themis.business.threadPool.MyThreadPool;
 import com.qmth.themis.business.util.*;
 import com.qmth.themis.common.exception.BusinessException;
 import com.qmth.themis.common.util.Result;
@@ -169,9 +168,6 @@ public class TaskExamStudentTemplete implements TaskImportTemplete {
                             teExamStudentService.saveOrUpdate(teExamStudent);
                             roomCodeAndNameSet.add(teExamStudent.getRoomCode() + ":" + teExamStudent.getRoomName());
                             teExamStudentList.add(teExamStudent);
-//                            if (y == 2) {
-//                                int k = 1 / 0;
-//                            }
                         }
                         BigDecimal bigDecimal = new BigDecimal(100);
                         BigDecimal progress = new BigDecimal(Double.valueOf(new BigDecimal(max).divide(new BigDecimal(size), 2, BigDecimal.ROUND_HALF_UP).multiply(bigDecimal).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue())).setScale(0, BigDecimal.ROUND_HALF_UP);
@@ -281,7 +277,7 @@ public class TaskExamStudentTemplete implements TaskImportTemplete {
      * @param ossUtil
      * @param tbTaskHistoryService
      * @param tbTaskHistory
-     * @param jsonObject
+     * @param txtStr
      * @param path
      * @param type
      * @param ossEnv

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

@@ -25,7 +25,6 @@ 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.io.IOException;
@@ -55,7 +54,6 @@ public class RocketTaskConsumer implements MessageListenerConcurrently {
     MyThreadPool myThreadPool;
 
     @Override
-    @Transactional
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
         MqDto mqDto = null;
         try {

themis-task/src/main/java/com/qmth/themis/task/quartz/MqJob.java

@@ -44,6 +44,10 @@ public class MqJob extends QuartzJobBean {
             log.info("userLog_topic_job进来了");
             this.assembleJob(SystemConstant.USERLOG_TOPIC_BUFFER_LIST);
         });
+        myThreadPool.arbitratePoolTaskExecutor.execute(() -> {
+            log.info("task_topic_job进来了");
+            this.assembleJob(SystemConstant.TASKLOG_TOPIC_BUFFER_LIST);
+        });
     }
 
     public void assembleJob(String redisKey) {