|
@@ -177,17 +177,24 @@ public class VideoPoolAuditService {
|
|
|
}
|
|
|
}
|
|
|
if (limit > 0) {
|
|
|
- List<String> entries = redisTemplate.opsForList().range(inAuditListRedisKey, 0, -1);
|
|
|
List<String> excludeContentIds = new ArrayList<>();
|
|
|
- if (CollectionUtils.isNotEmpty(entries)) {
|
|
|
- excludeContentIds = entries.stream().map(o -> {
|
|
|
- JSONObject json = JSONObject.parseObject(o);
|
|
|
- return json.getString("id");
|
|
|
- }).collect(Collectors.toList());
|
|
|
+ String auditAccountListKey = "video-pool-audit-account-list-" + dateStr;
|
|
|
+ Set<String> auditAccountList = redisTemplate.opsForSet().members(auditAccountListKey);
|
|
|
+ if (CollectionUtils.isNotEmpty(auditAccountList)) {
|
|
|
+ for (String auditAccount : auditAccountList) {
|
|
|
+ String inAuditAccountListRedisKey = "video-pool-in-audit-list-" + auditAccount;
|
|
|
+ List<String> entries = redisTemplate.opsForList().range(inAuditAccountListRedisKey, 0, -1);
|
|
|
+ if (CollectionUtils.isNotEmpty(entries)) {
|
|
|
+ excludeContentIds.addAll(entries.stream().map(o -> {
|
|
|
+ JSONObject json = JSONObject.parseObject(o);
|
|
|
+ return json.getString("id");
|
|
|
+ }).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
objs.addAll(videoPoolAuditMapper.articleVideoAuditNext(param.getContentId(),
|
|
|
param.getStatus(), param.getTitle(), param.getAuditAccount(), null,
|
|
|
- excludeContentIds, limit - objs.size()));
|
|
|
+ excludeContentIds, limit));
|
|
|
}
|
|
|
// 添加到超时队列
|
|
|
if (CollectionUtils.isNotEmpty(objs)) {
|