bug fix

themis-admin/src/main/java/com/qmth/themis/admin/api/TEExamController.java

@@ -156,7 +156,7 @@ public class TEExamController {
                         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                 JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                                 String.valueOf(teExam.getId()), prop, tbUser.getName());
-                        mqDtoService.assembleSendOneWayMsg(mqDto);
+                        mqDtoService.assembleSendOneOrderMsg(mqDto);
                     }
                     //删除quartz任务,发送mq消息end
                     //删除数据
@@ -191,7 +191,7 @@ public class TEExamController {
                         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                 JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                                 String.valueOf(teExam.getId()), prop, tbUser.getName());
-                        mqDtoService.assembleSendOneWayMsg(mqDto);
+                        mqDtoService.assembleSendOneOrderMsg(mqDto);
                         //新增quartz任务,发送mq消息end
                     }
                 } else {
@@ -213,7 +213,7 @@ public class TEExamController {
                         MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                                 JacksonUtil.parseJson(Arrays.asList(teExamActivity)), MqTagEnum.EXAM_ACTIVITY,
                                 String.valueOf(teExam.getId()), prop, tbUser.getName());
-                        mqDtoService.assembleSendOneWayMsg(mqDto);
+                        mqDtoService.assembleSendOneOrderMsg(mqDto);
                     }
                 }
             }

themis-business/src/main/java/com/qmth/themis/business/service/impl/TEExamActivityServiceImpl.java

@@ -322,7 +322,7 @@ public class TEExamActivityServiceImpl extends ServiceImpl<TEExamActivityMapper,
                 MqDto mqDto = new MqDto(mqUtil.getMqGroupDomain().getTopic(), MqTagEnum.EXAM_ACTIVITY.name(),
                         JacksonUtil.parseJson(teExamActivityList), MqTagEnum.EXAM_ACTIVITY,
                         String.valueOf(teExam.getId()), prop, tbUser.getName());
-                mqDtoService.assembleSendOneWayMsg(mqDto);
+                mqDtoService.assembleSendOneOrderMsg(mqDto);
                 //新增quartz任务,发送mq消息end
             }
         } catch (Exception e) {

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

@@ -6,10 +6,10 @@ import com.qmth.themis.business.dto.MqDto;
 import com.qmth.themis.business.util.JacksonUtil;
 import com.qmth.themis.business.util.RedisUtil;
 import com.qmth.themis.common.contanst.Constants;
-import com.qmth.themis.mq.templete.Orderly;
+import com.qmth.themis.mq.templete.Concurrently;
 import com.qmth.themis.task.listener.service.MqTaskLogicService;
-import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyContext;
-import org.apache.rocketmq.client.consumer.listener.ConsumeOrderlyStatus;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyContext;
+import org.apache.rocketmq.client.consumer.listener.ConsumeConcurrentlyStatus;
 import org.apache.rocketmq.common.message.MessageExt;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -26,11 +26,11 @@ import java.util.Objects;
  * @Date: 2020/7/31
  */
 @Service
-public class QuartzOrderlyImpl implements Orderly {
+public class QuartzOrderlyImpl implements Concurrently {
     private final static Logger log = LoggerFactory.getLogger(QuartzOrderlyImpl.class);
 
     @Override
-    public ConsumeOrderlyStatus consumeMessage(List<MessageExt> msgs, ConsumeOrderlyContext consumeConcurrentlyContext) {
+    public ConsumeConcurrentlyStatus consumeMessage(List<MessageExt> msgs, ConsumeConcurrentlyContext consumeConcurrentlyContext) {
         RedisUtil redisUtil = SpringContextHolder.getBean(RedisUtil.class);
         MqTaskLogicService mqTaskLogicService = SpringContextHolder.getBean(MqTaskLogicService.class);
         MqDto mqDto = null;
@@ -48,7 +48,7 @@ public class QuartzOrderlyImpl implements Orderly {
                     if (Objects.nonNull(mqDto.getAck()) && mqDto.getAck().intValue() != SystemConstant.STANDARD_ACK_TYPE && Objects.nonNull(redisUtil.get(SystemConstant.MQ_TOPIC_BUFFER_LIST, mqDto.getId())) && redisUtil.lock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId(), SystemConstant.REDIS_LOCK_MQ_TIME_OUT)) {
                         try {
                             mqTaskLogicService.execMqQuartzLogic(mqDto, SystemConstant.MQ_TOPIC_BUFFER_LIST);
-                            return ConsumeOrderlyStatus.SUCCESS;
+                            return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;
                         } finally {
                             if (Objects.nonNull(mqDto)) {
                                 redisUtil.releaseLock(SystemConstant.REDIS_LOCK_MQ_PREFIX + mqDto.getId());
@@ -59,8 +59,8 @@ public class QuartzOrderlyImpl implements Orderly {
             }
         } catch (Exception e) {
             log.error("mq quartz顺序，消息消费出错", e);
-            return ConsumeOrderlyStatus.SUSPEND_CURRENT_QUEUE_A_MOMENT;//重试
+            return ConsumeConcurrentlyStatus.RECONSUME_LATER;//重试
         }
-        return ConsumeOrderlyStatus.SUCCESS;//成功
+        return ConsumeConcurrentlyStatus.CONSUME_SUCCESS;//成功
     }
 }