Merge branch 'dev-xym-log2' of algorithm/ad-engine into master

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/param/RankRecommendRequestParam.java

@@ -3,11 +3,13 @@ package com.tzld.piaoquan.ad.engine.commons.param;
 import com.tzld.piaoquan.ad.engine.commons.dto.AdPlatformCreativeDTO;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
+import lombok.ToString;
 
 import java.util.List;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
 public class RankRecommendRequestParam extends RecommendRequestParam{
      List<AdPlatformCreativeDTO> adIdList;
      String sessionId;

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy680.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.ad.engine.service.score.strategy;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.commons.score.ScorerUtils;
@@ -110,7 +111,7 @@ public class RankStrategyBy680 extends RankStrategyBasic {
                         .filter(e -> !Objects.equals(e.getProfession(), "兴趣教育")).collect(Collectors.toList());
                 request.setAdIdList(filteredAdList);
             }
-            log.info("excludeExp filtered request={}", request);
+            log.info("excludeExp filtered request={}", JSONObject.toJSONString(request));
         }
 
         List<TupleMapEntry<Tuple5>> midActionList = this.handleC1Feature(c1Feature, userFeatureMap);

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/strategy/RankStrategyBy688.java

@@ -1,5 +1,6 @@
 package com.tzld.piaoquan.ad.engine.service.score.strategy;
 
+import com.alibaba.fastjson.JSONObject;
 import com.ctrip.framework.apollo.spring.annotation.ApolloJsonValue;
 import com.tzld.piaoquan.ad.engine.commons.dto.AdPlatformCreativeDTO;
 import com.tzld.piaoquan.ad.engine.commons.helper.DnnCidDataHelper;
@@ -117,7 +118,7 @@ public class RankStrategyBy688 extends RankStrategyBasic {
                         .filter(e -> !Objects.equals(e.getProfession(), "兴趣教育")).collect(Collectors.toList());
                 request.setAdIdList(filteredAdList);
             }
-            log.info("excludeExp filtered request={}", request);
+            log.info("excludeExp filtered request={}", JSONObject.toJSONString(request));
         }
 
         List<TupleMapEntry<Tuple5>> midActionList = this.handleC1Feature(c1Feature, userFeatureMap);