hard code

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

@@ -320,6 +320,8 @@ public class RecommendService {
                 ? param.getCityCode()
                 : "";
         recallParam.setRegionCode(cityCodes.contains(cityCode) ? cityCode : provinceCode);
+        // hard code  如果region为空，python任务会按照-1处理
+
 
         recallParam.setRuleKey(param.getRuleKey());
         recallParam.setDataKey(param.getDataKey());

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/Region24HRecallStrategy.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,7 +21,9 @@ public class Region24HRecallStrategy extends AbstractRegionRecallStrategy {
 
     @Override
     protected String poolKey(RecallParam param, String now_dt, int h) {
-        return String.format("recall:item:score:region:dup1:region24h:%s:%s:%s:%s:%s", param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
+        return String.format("recall:item:score:region:dup1:region24h:%s:%s:%s:%s:%s",
+                StringUtils.isBlank(param.getRegionCode()) ? -1 : param.getRegionCode(),
+                param.getDataKey(), param.getRuleKey(), now_dt, h);
     }
 
     @Override

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionHRecallStrategy.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,7 +21,7 @@ public class RegionHRecallStrategy extends AbstractRegionRecallStrategy {
 
     @Override
     protected String poolKey(RecallParam param, String now_dt, int h) {
-        return String.format("recall:item:score:region:h:%s:%s:%s:%s:%s", param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
+        return String.format("recall:item:score:region:h:%s:%s:%s:%s:%s", StringUtils.isBlank(param.getRegionCode()) ? -1 : param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
     }
 
     @Override

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRelative24HDupRecallStrategy.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,7 +21,7 @@ public class RegionRelative24HDupRecallStrategy extends AbstractRegionRecallStra
 
     @Override
     protected String poolKey(RecallParam param, String now_dt, int h) {
-        return String.format("recall:item:score:region:dup3:24h:%s:%s:%s:%s:%s", param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
+        return String.format("recall:item:score:region:dup3:24h:%s:%s:%s:%s:%s", StringUtils.isBlank(param.getRegionCode()) ? -1 : param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
     }
 
     @Override

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRelative24HRecallStrategy.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -20,7 +21,7 @@ public class RegionRelative24HRecallStrategy extends AbstractRegionRecallStrateg
 
     @Override
     protected String poolKey(RecallParam param, String now_dt, int h) {
-        return String.format("recall:item:score:region:dup2:24h:%s:%s:%s:%s:%s", param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
+        return String.format("recall:item:score:region:dup2:24h:%s:%s:%s:%s:%s", StringUtils.isBlank(param.getRegionCode()) ? -1 : param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
     }
 
     @Override

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRelative48HDupRecallStrategy.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,7 +20,7 @@ public class RegionRelative48HDupRecallStrategy extends AbstractRegionRecallStra
 
     @Override
     protected String poolKey(RecallParam param, String now_dt, int h) {
-        return String.format("recall:item:score:region:dup3:48h:%s:%s:%s:%s:%s", param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
+        return String.format("recall:item:score:region:dup3:48h:%s:%s:%s:%s:%s", StringUtils.isBlank(param.getRegionCode()) ? -1 : param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
     }
 
     @Override

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/recall/strategy/RegionRelative48HRecallStrategy.java

@@ -1,6 +1,7 @@
 package com.tzld.piaoquan.recommend.server.service.recall.strategy;
 
 import com.tzld.piaoquan.recommend.server.service.recall.RecallParam;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 /**
@@ -19,7 +20,7 @@ public class RegionRelative48HRecallStrategy extends AbstractRegionRecallStrateg
 
     @Override
     protected String poolKey(RecallParam param, String now_dt, int h) {
-        return String.format("recall:item:score:region:dup2:48h:%s:%s:%s:%s:%s", param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
+        return String.format("recall:item:score:region:dup2:48h:%s:%s:%s:%s:%s", StringUtils.isBlank(param.getRegionCode()) ? -1 : param.getRegionCode(), param.getDataKey(), param.getRuleKey(), now_dt, h);
     }
 
     @Override