Merge branch 'feature-20240424-sunxy-modFilterParam' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/filter/AbstractFilterService.java

@@ -8,7 +8,6 @@ import com.tzld.piaoquan.recommend.server.service.ServiceBeanFactory;
 import com.tzld.piaoquan.recommend.server.service.ViewedService;
 import com.tzld.piaoquan.recommend.server.service.filter.strategy.*;
 import com.tzld.piaoquan.recommend.server.util.CommonCollectionUtils;
-import com.tzld.piaoquan.recommend.server.util.JSONUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -72,7 +71,7 @@ public abstract class AbstractFilterService {
         } else {
             videoIds = filterByViewed(param, videoIds);
         }
-        log.info("viewFilterOld after {}", JSONUtils.toJson(videoIds));
+//        log.info("viewFilterOld after {}", JSONUtils.toJson(videoIds));
         return videoIds;
     }
 
@@ -98,9 +97,11 @@ public abstract class AbstractFilterService {
     }
 
     private List<Long> filterByViewedConcurrent(FilterParam param, List<Long> videoIds) {
-        // TODO uid为空时，还需要过滤么？
-        if (StringUtils.isBlank(param.getMid())
-                || CollectionUtils.isEmpty(videoIds)) {
+//        if (StringUtils.isBlank(param.getMid())
+//                || CollectionUtils.isEmpty(videoIds)) {
+//            return videoIds;
+//        }
+        if (CollectionUtils.isEmpty(videoIds)) {
             return videoIds;
         }
 
@@ -146,8 +147,11 @@ public abstract class AbstractFilterService {
 
     private List<Long> filterByViewed(FilterParam param, List<Long> videoIds) {
         // TODO uid为空时，还需要过滤么？
-        if (StringUtils.isBlank(param.getMid())
-                || CollectionUtils.isEmpty(videoIds)) {
+//        if (StringUtils.isBlank(param.getMid())
+//                || CollectionUtils.isEmpty(videoIds)) {
+//            return videoIds;
+//        }
+        if (CollectionUtils.isEmpty(videoIds)) {
             return videoIds;
         }
         return viewedService.filterViewedVideo(param.getAppType(), param.getMid(), param.getUid(), videoIds, param.getCityCode(),