本地演出双循环判断导致演出重复

liquidnet-bus-service/liquidnet-service-kylin/liquidnet-service-kylin-impl/src/main/java/com/liquidnet/service/kylin/service/impl/KylinPerformancesServiceImpl.java

@@ -65,6 +65,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
 
         // 判断搜索 处理新数据
         List<KylinPerformanceVo> performancesListNew = new ArrayList<>();
+        List<String> performancesIds = new ArrayList<>();
         for (KylinPerformanceVo info : performancesList) {
             boolean isShow = true;
             if (type > 0) {
@@ -78,35 +79,32 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
                 }
             }
             if (isShow) {
+                performancesIds.add(info.getPerformancesId());
                 performancesListNew.add(info);
             }
         }
 
-//        List<String> ids = Arrays.asList("");
 
         // 推荐
         int is_native = 1;
         int recommend = performancesListNew.size();
-        List<KylinPerformanceVo> performancesListNewUnqui = new ArrayList<>();
-        performancesListNewUnqui.addAll(performancesListNew);
         if (recommend <= 2) {
             List<KylinPerformanceVo> performancesListRecommend = dataUtils.getPerformancesListIsSystemRecommend();
 
-            /*List<KylinPerformanceVo> collect = performancesListRecommend.stream().filter(r -> !ids.contains(r.getPerformancesId())).collect(Collectors.toList());
-            performancesListNew.addAll(collect);*/
-
             if (!CollectionUtils.isEmpty(performancesListRecommend)) {
                 is_native = 0;
                 if(recommend > 0) {// 去重
-                    for(KylinPerformanceVo recommendInfo : performancesListRecommend) {
+                    List<KylinPerformanceVo> collect = performancesListRecommend.stream().filter(r -> !performancesIds.contains(r.getPerformancesId())).collect(Collectors.toList());
+                    performancesListNew.addAll(collect);
+                    /*for(KylinPerformanceVo recommendInfo : performancesListRecommend) {
                         for(KylinPerformanceVo info : performancesListNew) {
                             if (!recommendInfo.getPerformancesId().equals(info.getPerformancesId())) {
                                 performancesListNewUnqui.add(recommendInfo);
                             }
                         }
-                    }
+                    }*/
                 } else {
-                    performancesListNewUnqui.addAll(performancesListRecommend);
+                    performancesListNew.addAll(performancesListRecommend);
                 }
             }
         }
@@ -116,7 +114,7 @@ public class KylinPerformancesServiceImpl extends ServiceImpl<KylinPerformancesM
         info.put("is_native", is_native); // 本地演出少是否推荐了其他演出 0有推荐 1没有
         info.put("recommend", recommend); // 从第几个开始是其他推荐演出 后台设置的那个推荐
         info.put("total", 0);
-        info.put("list", performancesListNewUnqui);
+        info.put("list", performancesListNew);
 
         return info;
     }