fix

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/BuckStrategyV1.java

@@ -267,21 +267,10 @@ public class BuckStrategyV1 implements ReplyStrategyService {
                 if ("base".equals(key)) {
                     continue;
                 }
-                List<Long> videoIds = new ArrayList<>();
-                List<CgiReplyBucketData> collect = new ArrayList<>();
-                for (CgiReplyBucketData data : smallDataCgiReplyList) {
-                    if (!data.getStrategy().equals(key)) {
-                        continue;
-                    }
-                    if (!data.getGhId().equals(bucketDataParam.getGhId())) {
-                        continue;
-                    }
-                    if (videoIds.contains(data.getMiniVideoId())) {
-                        continue;
-                    }
-                    videoIds.add(data.getMiniVideoId());
-                    collect.add(data);
-                }
+                List<CgiReplyBucketData> collect = smallDataCgiReplyList.stream()
+                        .filter(x -> x.getStrategy().equals(key))
+                        .filter(x -> x.getGhId().equals(bucketDataParam.getGhId()))
+                        .collect(Collectors.toList());
                 if (CollectionUtils.isEmpty(collect)) {
                     log.error("insertSmallData 算法排序数据异常，data：" + JSON.toJSONString(smallDataCgiReplyList));
                     continue;

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/ThirdPartyPushMessageStrategyV1.java

@@ -172,21 +172,10 @@ public class ThirdPartyPushMessageStrategyV1 implements ReplyStrategyService {
                 if ("base".equals(key)) {
                     continue;
                 }
-                List<Long> videoIds = new ArrayList<>();
-                List<CgiReplyBucketData> collect = new ArrayList<>();
-                for (CgiReplyBucketData data : smallDataCgiReplyList) {
-                    if (!data.getStrategy().equals(key)) {
-                        continue;
-                    }
-                    if (!data.getGhId().equals(bucketDataParam.getGhId())) {
-                        continue;
-                    }
-                    if (videoIds.contains(data.getMiniVideoId())) {
-                        continue;
-                    }
-                    videoIds.add(data.getMiniVideoId());
-                    collect.add(data);
-                }
+                List<CgiReplyBucketData> collect = smallDataCgiReplyList.stream()
+                        .filter(x -> x.getStrategy().equals(key))
+                        .filter(x -> x.getGhId().equals(bucketDataParam.getGhId()))
+                        .collect(Collectors.toList());
                 if (CollectionUtils.isEmpty(collect)) {
                     log.error("ThirdPartyPushMessageStrategyV1 insertSmallData 算法排序数据异常 ，key：" + key +
                             "，data：" + JSON.toJSONString(smallDataCgiReplyList) + "，ghId：" + bucketDataParam.getGhId());

api-module/src/main/java/com/tzld/piaoquan/api/service/strategy/impl/WeComPushMessageStrategyV1.java

@@ -147,21 +147,10 @@ public class WeComPushMessageStrategyV1 implements ReplyStrategyService {
             if ("base".equals(key)) {
                 continue;
             }
-            List<Long> videoIds = new ArrayList<>();
-            List<CgiReplyBucketData> collect = new ArrayList<>();
-            for (CgiReplyBucketData data : smallDataCgiReplyList) {
-                if (!data.getStrategy().equals(key)) {
-                    continue;
-                }
-                if (!data.getGhId().equals(bucketDataParam.getGhId())) {
-                    continue;
-                }
-                if (videoIds.contains(data.getMiniVideoId())) {
-                    continue;
-                }
-                videoIds.add(data.getMiniVideoId());
-                collect.add(data);
-            }
+            List<CgiReplyBucketData> collect = smallDataCgiReplyList.stream()
+                    .filter(x -> x.getStrategy().equals(key))
+                    .filter(x -> x.getGhId().equals(bucketDataParam.getGhId()))
+                    .collect(Collectors.toList());
             if (CollectionUtils.isEmpty(collect)) {
                 log.error("ThirdPartyPushMessageStrategyV1 insertSmallData 算法排序数据异常，data：" + JSON.toJSONString(smallDataCgiReplyList));
                 continue;