|
@@ -72,14 +72,14 @@ public class TaskService {
|
|
log.info("未分配的mq队列数:{}",mqSendLogs.size());
|
|
log.info("未分配的mq队列数:{}",mqSendLogs.size());
|
|
|
|
|
|
//设置分配队列
|
|
//设置分配队列
|
|
- HashSet<String> numList = new HashSet<>();
|
|
|
|
|
|
+ HashSet<String> contentList = new HashSet<>();
|
|
for (MqSendLog mqSendLog : mqSendLogs) {
|
|
for (MqSendLog mqSendLog : mqSendLogs) {
|
|
if(StringUtils.isBlank(mqSendLog.getContent())){
|
|
if(StringUtils.isBlank(mqSendLog.getContent())){
|
|
mqSendLogService.updateStatus(mqSendLog.getId(),2,null);
|
|
mqSendLogService.updateStatus(mqSendLog.getId(),2,null);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
Integer configId = scenePlusService.getQueueConfig(mqSendLog);
|
|
Integer configId = scenePlusService.getQueueConfig(mqSendLog);
|
|
- if(numList.contains(mqSendLog.getNum())){
|
|
|
|
|
|
+ if(contentList.contains(mqSendLog.getContent())){
|
|
mqSendLogService.updateStatus(mqSendLog.getId(),2,null);
|
|
mqSendLogService.updateStatus(mqSendLog.getId(),2,null);
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -88,7 +88,7 @@ public class TaskService {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
mqSendLog.setConfigId(configId);
|
|
mqSendLog.setConfigId(configId);
|
|
- numList.add(mqSendLog.getNum());
|
|
|
|
|
|
+ contentList.add(mqSendLog.getContent());
|
|
}
|
|
}
|
|
List<MqQueueConfig> queueConfigList = queueConfigService.list();
|
|
List<MqQueueConfig> queueConfigList = queueConfigService.list();
|
|
rabbitMqService.getMqMsgMap(queueConfigList);
|
|
rabbitMqService.getMqMsgMap(queueConfigList);
|