|
|
@ -77,9 +77,9 @@ public class QueueServiceImpl implements QueueService {
|
|
|
|
queueIdWhere.append(where);
|
|
|
|
queueIdWhere.append(where);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
queueIdWhere.append(String.format(" order by %s asc limit %s", queueIdColumnName, limit));
|
|
|
|
queueIdWhere.append(String.format(" order by %s asc limit %s", queueIdColumnName, limit));
|
|
|
|
log.info("whereStr: " + queueIdWhere);
|
|
|
|
// log.info("whereStr: " + queueIdWhere);
|
|
|
|
List<Map<String, Object>> queueList = queueMapper.select(queueName, queueIdWhere.toString());
|
|
|
|
List<Map<String, Object>> queueList = queueMapper.select(queueName, queueIdWhere.toString());
|
|
|
|
log.info("queueList size: " + queueList.size());
|
|
|
|
// log.info("queueList size: " + queueList.size());
|
|
|
|
if (ObjectUtil.isEmpty(queueList)) {
|
|
|
|
if (ObjectUtil.isEmpty(queueList)) {
|
|
|
|
break;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
@ -100,12 +100,10 @@ public class QueueServiceImpl implements QueueService {
|
|
|
|
Set<String> tempRedisIds = new HashSet<>();
|
|
|
|
Set<String> tempRedisIds = new HashSet<>();
|
|
|
|
tempRedisIds.addAll(redisIds);
|
|
|
|
tempRedisIds.addAll(redisIds);
|
|
|
|
tempRedisIds.addAll(newRedisIds);
|
|
|
|
tempRedisIds.addAll(newRedisIds);
|
|
|
|
log.info("allQueueList count: " + allQueueList.size());
|
|
|
|
// log.info("allQueueList count: " + allQueueList.size());
|
|
|
|
log.info("tempRedisIds count: " + tempRedisIds.size());
|
|
|
|
// log.info("tempRedisIds count: " + tempRedisIds.size());
|
|
|
|
for (Map<String, Object> queue : allQueueList) {
|
|
|
|
for (Map<String, Object> queue : allQueueList) {
|
|
|
|
String queueIdStr = queue.get(queueIdColumnName).toString();
|
|
|
|
String queueIdStr = queue.get(queueIdColumnName).toString();
|
|
|
|
Long queueId = Long.valueOf(queueIdStr);
|
|
|
|
|
|
|
|
log.info("queueId: " + queueId);
|
|
|
|
|
|
|
|
if (redisIds.contains(queueIdStr)) {
|
|
|
|
if (redisIds.contains(queueIdStr)) {
|
|
|
|
continue;
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
}
|
|
|
|