mq修改

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

@@ -14,7 +14,6 @@ import com.qmth.themis.business.entity.TEExamStudent;
 import com.qmth.themis.business.entity.TEStudent;
 import com.qmth.themis.business.enums.ExamModeEnum;
 import com.qmth.themis.business.service.TBExamInvigilateUserService;
-import com.qmth.themis.business.service.TBUserRoleService;
 import com.qmth.themis.business.service.TEExamStudentService;
 import com.qmth.themis.business.service.TEStudentService;
 import com.qmth.themis.business.templete.TaskImportCommon;
@@ -28,7 +27,6 @@ import com.qmth.themis.common.util.Result;
 import com.qmth.themis.common.util.ResultUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.LinkedMultiValueMap;
 
@@ -37,7 +35,6 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 考生导入任务
@@ -106,7 +103,6 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
             TBExamInvigilateUserService tbExamInvigilateUserService = SpringContextHolder.getBean(TBExamInvigilateUserService.class);
 
             List<TEExamStudent> teExamStudentList = new ArrayList<>();
-            List<TEExamStudent> teExamStudentUpdateList = new ArrayList<>();
             List<TEStudent> teStudentList = new ArrayList<>();
 //            List<TBUserRole> tbUserRoleList = new ArrayList<>();
             List<TBExamInvigilateUser> tbExamInvigilateUserList = new ArrayList<>();
@@ -158,9 +154,6 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
                                 teExamStudent.setStudentId(teStudent.getId());
                                 teExamStudent.setCreateId(taskImportCommon.getCreateId());
                             } else {
-                                TEExamStudent teExamStudentUpdate = new TEExamStudent();
-                                BeanUtils.copyProperties(teExamStudent, teExamStudentUpdate);
-                                teExamStudentUpdateList.add(teExamStudent);
                                 teExamStudent.setUpdateId(taskImportCommon.getCreateId());
                                 teExamStudent.setName(examStudentImportDto.getName());
                                 teExamStudent.setCourseName(examStudentImportDto.getCourseName());
@@ -207,21 +200,6 @@ public class TaskExamStudentImportTemplete implements TaskImportTemplete {
             } catch (Exception e) {
                 e.printStackTrace();
                 txtList = taskImportCommon.exception(min, y, e, txtList);
-                if (Objects.nonNull(teStudentList) && teStudentList.size() > 0) {
-                    teStudentService.removeByIds(teStudentList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-                }
-//                if (Objects.nonNull(tbUserRoleList) && tbUserRoleList.size() > 0) {
-//                    tbUserRoleService.removeByIds(tbUserRoleList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-//                }
-                if (Objects.nonNull(teExamStudentList) && teExamStudentList.size() > 0) {
-                    teExamStudentService.removeByIds(teExamStudentList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-                }
-                if (Objects.nonNull(teExamStudentUpdateList) && teExamStudentUpdateList.size() > 0) {
-                    teExamStudentService.updateBatchById(teExamStudentUpdateList);
-                }
-                if (Objects.nonNull(tbExamInvigilateUserList) && tbExamInvigilateUserList.size() > 0) {
-                    tbExamInvigilateUserService.removeByIds(tbExamInvigilateUserList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-                }
                 if (e instanceof BusinessException) {
                     throw new BusinessException(e.getMessage());
                 } else {

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

@@ -32,7 +32,6 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.util.*;
-import java.util.stream.Collectors;
 
 /**
  * @Description: 考场导入任务
@@ -138,15 +137,6 @@ public class TaskRoomCodeImportTemplete implements TaskImportTemplete {
             } catch (Exception e) {
                 e.printStackTrace();
                 txtList = taskImportCommon.exception(min, y, e, txtList);
-                if (Objects.nonNull(tbUserList) && tbUserList.size() > 0) {
-                    tbUserService.removeByIds(tbUserList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-                }
-                if (Objects.nonNull(tbUserRoleList) && tbUserRoleList.size() > 0) {
-                    tbUserRoleService.removeByIds(tbUserRoleList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-                }
-                if (Objects.nonNull(tbExamInvigilateUserList) && tbExamInvigilateUserList.size() > 0) {
-                    tbExamInvigilateUserService.removeByIds(tbExamInvigilateUserList.stream().map(s -> s.getId()).collect(Collectors.toList()));
-                }
                 if (e instanceof BusinessException) {
                     throw new BusinessException(e.getMessage());
                 } else {

themis-exam/src/main/java/com/qmth/themis/exam/websocket/WebSocketOeServer.java

@@ -40,6 +40,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import javax.websocket.*;
 import javax.websocket.server.PathParam;
@@ -289,6 +290,7 @@ public class WebSocketOeServer
     }
 
     @Override
+    @Transactional
     public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
         RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
         TMRocketMessageService tmRocketMessageService = SpringContextHolder.getBean(TMRocketMessageService.class);
@@ -347,7 +349,11 @@ public class WebSocketOeServer
             }
         } catch (Exception e) {
             e.printStackTrace();
-            return ConsumeConcurrentlyStatus.RECONSUME_LATER;//重试
+            if (e instanceof BusinessException) {
+                throw new BusinessException(e.getMessage());
+            } else {
+                throw new RuntimeException(e);
+            }
         } finally {
             if (Objects.nonNull(mqDto)) {
                 redisUtil.releaseLock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId());

themis-task/src/main/java/com/qmth/themis/task/listener/RocketQuartzConsumer.java

@@ -30,6 +30,7 @@ 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.util.*;
@@ -61,6 +62,7 @@ public class RocketQuartzConsumer implements MessageListenerOrderly {
      * 考试场次监听
      */
     @Override
+    @Transactional
     public ConsumeOrderlyStatus consumeMessage(List<MessageExt> msgs, ConsumeOrderlyContext consumeOrderlyContext) {
         MqDto mqDto = null;
         try {