Merge branch 'rank_expand_feature_v6' of algorithm/ad-engine into master

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/util/RootSessionIdTailUtil.java

@@ -0,0 +1,20 @@
+package com.tzld.piaoquan.ad.engine.commons.util;
+
+import org.apache.commons.lang3.StringUtils;
+
+public class RootSessionIdTailUtil {
+    public static String getNthCharFromEnd(String rootSessionId, int nFromEnd) {
+        if (StringUtils.isBlank(rootSessionId) || nFromEnd < 1) {
+            return null;
+        }
+
+        // 计算开始位置
+        int position = rootSessionId.length() - nFromEnd;
+
+        // 检查位置是否有效
+        if (position < 0) {
+            return null;
+        }
+        return String.valueOf(rootSessionId.charAt(position));
+    }
+}

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/score/impl/RankServiceImpl.java

@@ -6,7 +6,7 @@ import com.tzld.piaoquan.ad.engine.commons.dto.AdPlatformCreativeDTO;
 import com.tzld.piaoquan.ad.engine.commons.param.RankRecommendRequestParam;
 import com.tzld.piaoquan.ad.engine.commons.score.ScoreParam;
 import com.tzld.piaoquan.ad.engine.commons.score.ScorerUtils;
-import com.tzld.piaoquan.ad.engine.commons.util.RootSessionIdUtil;
+import com.tzld.piaoquan.ad.engine.commons.util.RootSessionIdTailUtil;
 import com.tzld.piaoquan.ad.engine.service.entity.RootSessionIdExpConfig;
 import com.tzld.piaoquan.ad.engine.service.log.LogHubService;
 import com.tzld.piaoquan.ad.engine.service.predict.helper.NewExpInfoHelper;
@@ -56,8 +56,6 @@ public class RankServiceImpl implements RankService {
     private LogHubService logHubService;
     @Autowired
     private AdCreativeFeatureContainer adCreativeFeatureContainer;
-    @Autowired
-    private RootSessionIdUtil rootSessionIdUtil;
 
     @Autowired
     private RankStrategyBy680 rankStrategyBy680;
@@ -143,7 +141,7 @@ public class RankServiceImpl implements RankService {
                 Long appType = scoreParam.getAppType();
                 String rootSessionId = scoreParam.getRootSessionId();
                 if (null != appType && null != rootSessionId) {
-                    String tail = rootSessionIdUtil.getTail(rootSessionId);
+                    String tail = RootSessionIdTailUtil.getNthCharFromEnd(rootSessionId, 6);
                     if (null != tail) {
                         for (RootSessionIdExpConfig item : rankRootSessionIdConfig) {
                             if (null != item.getAppType() && null != item.getTail()) {