Merge branch 'feature_log' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/common/enums/AppTypeEnum.java

@@ -50,10 +50,10 @@ public enum AppTypeEnum {
     ADMIN_CRAWLER(888888, "后台-爬虫"),
     OTHERS(999999, "其他的调用方，比如后台管理系统");
 
-    private Integer code;
+    private int code;
     private String desc;
 
-    public Integer getCode() {
+    public int getCode() {
         return code;
     }
 
@@ -65,16 +65,4 @@ public enum AppTypeEnum {
         this.code = code;
         this.desc = desc;
     }
-
-    public static AppTypeEnum valueOf(Integer code) {
-        if (code == null) {
-            return null;
-        }
-        for (AppTypeEnum appTypeEnum : AppTypeEnum.values()) {
-            if (appTypeEnum.getCode().intValue() == code.intValue()) {
-                return appTypeEnum;
-            }
-        }
-        return null;
-    }
 }

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

@@ -9,7 +9,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;
@@ -225,8 +224,6 @@ public abstract class AbstractFilterService {
         param.setVideoIds(riskVideoIds);
 
         List<FilterStrategy> strategies = getStrategies(param);
-        log.info("filter strategies {}", JSONUtils.toJson(CommonCollectionUtils.toList(strategies,
-                o -> o.getClass().getSimpleName())));
         CountDownLatch cdl = new CountDownLatch(strategies.size());
         List<Future<List<Long>>> futures = new ArrayList<>();
         for (final FilterStrategy strategy : strategies) {
@@ -234,10 +231,6 @@ public abstract class AbstractFilterService {
                 Stopwatch stopwatch = Stopwatch.createStarted();
                 List<Long> result = strategy.filter(param);
                 cdl.countDown();
-                log.info("{} param {} result {} cost {} ms", strategy.getClass().getSimpleName(),
-                        JSONUtils.toJson(param.getVideoIds()),
-                        JSONUtils.toJson(result),
-                        stopwatch.elapsed(TimeUnit.MILLISECONDS));
                 return result;
             });
             futures.add(future);
@@ -264,7 +257,6 @@ public abstract class AbstractFilterService {
         for (int i = 0; i < videoIds.size(); ++i) {
             result.retainAll(videoIds.get(i));
         }
-        log.info("filter result {}", JSONUtils.toJson(result));
         return result;
     }
 

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

@@ -81,7 +81,6 @@ public class AllowListStrategy implements FilterStrategy {
                 }
             }
         } else if (param.getAppType() == AppTypeEnum.WAN_NENG_VIDEO.getCode()
-                || param.getAppType() == AppTypeEnum.LAO_HAO_KAN_VIDEO.getCode()
                 || param.getAppType() == AppTypeEnum.ZUI_JING_QI.getCode()
                 || param.getAppType() == AppTypeEnum.H5.getCode()) {
             Iterator<Long> iterator = param.getVideoIds().iterator();