feat:去除测试代码

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/log/LogHubService.java

@@ -9,5 +9,5 @@ import java.util.List;
 
 public interface LogHubService {
 
-    void scoreLogUpload(ScoreParam param, List<AdPlatformCreativeDTO> adIdList, List<AdRankItem> rankItems, RecommendRequestParam requestParam, String scoreStrategy, String abCode);
+    void scoreLogUpload(ScoreParam param, List<AdPlatformCreativeDTO> adIdList, List<AdRankItem> rankItems, RecommendRequestParam requestParam, String abCode);
 }

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/log/impl/LogHubServiceImpl.java

@@ -40,7 +40,7 @@ public class LogHubServiceImpl implements LogHubService {
     private static final Set<String> FEATURE_FIELD_SET = Sets.newHashSet();
 
     @Override
-    public void scoreLogUpload(ScoreParam param, List<AdPlatformCreativeDTO> adIdList, List<AdRankItem> rankItems, RecommendRequestParam requestParam, String scoreStrategy, String abCode) {
+    public void scoreLogUpload(ScoreParam param, List<AdPlatformCreativeDTO> adIdList, List<AdRankItem> rankItems, RecommendRequestParam requestParam, String abCode) {
         logUploadThreadPool.execute(new Runnable() {
             @Override
             public void run() {

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

@@ -91,24 +91,24 @@ public class RankServiceImpl implements RankService {
     private AdRankItem rankBy680(RankRecommendRequestParam request) {
         ScoreParam scoreParam = RequestConvert.requestConvert(request);
         List<AdRankItem> adRankItems = fmRankService.adItemRank(request, scoreParam);
-        for (AdRankItem adRankItem : adRankItems) {
-            JSONObject json = new JSONObject();
-            json.put("scoreMap", adRankItem.getScoreMap());
-            json.put("allfeature", adRankItem.getFeatureMap());
-            json.put("metafeaturemap", adRankItem.getMetaFeatureMap());
-            json.put("cid", adRankItem.getId());
-            json.put("adverid", adRankItem.getAdVerId());
-            json.put("score", adRankItem.getScore());
-            log.info("adRankItem: {}", JSON.toJSONString(json));
-        }
-        logHubService.scoreLogUpload(scoreParam, request.getAdIdList(), adRankItems, request, "LRModelScore", "680");
+        // for (AdRankItem adRankItem : adRankItems) {
+        //     JSONObject json = new JSONObject();
+        //     json.put("scoreMap", adRankItem.getScoreMap());
+        //     json.put("allfeature", adRankItem.getFeatureMap());
+        //     json.put("metafeaturemap", adRankItem.getMetaFeatureMap());
+        //     json.put("cid", adRankItem.getAdId());
+        //     json.put("adverid", adRankItem.getAdVerId());
+        //     json.put("score", adRankItem.getScore());
+        //     log.info("adRankItem: {}", JSON.toJSONString(json));
+        // }
+        logHubService.scoreLogUpload(scoreParam, request.getAdIdList(), adRankItems, request, "680");
         return adRankItems.get(0);
     }
 
     private AdRankItem rankBy679(RankRecommendRequestParam requestParam) {
         ScoreParam scoreParam = RequestConvert.requestConvert(requestParam);
         List<AdRankItem> adRankItems = tacticsAndFmModelScoreRankService.adItemRank(requestParam, scoreParam);
-        logHubService.scoreLogUpload(scoreParam, requestParam.getAdIdList(), adRankItems, requestParam, "directionAndLRModelScore", "679");
+        logHubService.scoreLogUpload(scoreParam, requestParam.getAdIdList(), adRankItems, requestParam, "679");
         double score = adRankItems.get(0).getScore();
         if (score > 0) {
             return adRankItems.get(0);
@@ -235,12 +235,8 @@ public class RankServiceImpl implements RankService {
                 log.info("svc=pid_log obj={}", JSONObject.toJSONString(object));
             }
 
-            for (AdRankItem adRankItem : rankResult) {
-                // adRankItem.getItemFeature().put("userAdFeature", JSON.toJSONString(userAdFeature));
-            }
             // 日志上报
-            logHubService.scoreLogUpload(param, request.getAdIdList(), rankResult, request,
-                    inCvrAdjustingExp ? "cvr_adjusting" : "base_line", "531");
+            logHubService.scoreLogUpload(param, request.getAdIdList(), rankResult, request, "531");
 
             return rankResult.get(0);
         } else {
@@ -261,13 +257,6 @@ public class RankServiceImpl implements RankService {
         param.getRequestContext().setDay(currentTime.format(dateFormatter));
 
         Set<String> expCodes = new HashSet<>();
-        // if (request.getAdAbExpArr() != null && request.getAdAbExpArr().size() != 0) {
-        //     for (Map<String, Object> map : request.getAdAbExpArr()) {
-        //         String expCode = map.getOrDefault("abExpCode", "").toString();
-        //         expCodes.add(expCode);
-        //     }
-        // }
-
         if (CollectionUtils.isNotEmpty(request.getAdAbExpArr())) {
             expCodes = request.getAdAbExpArr().stream()
                     .map(m -> m.get("abExpCode"))
@@ -324,7 +313,7 @@ public class RankServiceImpl implements RankService {
         }
 
         // 日志上报
-        logHubService.scoreLogUpload(param, request.getAdIdList(), rankResult, request, "video_ad_thompson", abCode);
+        logHubService.scoreLogUpload(param, request.getAdIdList(), rankResult, request, abCode);
 
         if (!CollectionUtils.isEmpty(rankResult)) {
             JSONObject object = new JSONObject();