fix

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/redis/AdOwnRedisHelper.java

@@ -5,7 +5,6 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Component;
-import org.springframework.stereotype.Service;
 import org.springframework.util.CollectionUtils;
 
 import javax.annotation.Resource;
@@ -27,7 +26,7 @@ public class AdOwnRedisHelper {
     private RedisTemplate<String, String> adOwnRedisTemplate;
 
 
-    public boolean contantinsKey(String key) {
+    public boolean containsKey(String key) {
         return adOwnRedisTemplate.hasKey(key);
     }
 
@@ -76,7 +75,7 @@ public class AdOwnRedisHelper {
             expireTime = AD_FILTER_DEFAULT_EXPIRE_TIME;
         }
         // 只在第一次进行设置过期时间
-        if (!contantinsKey(key)) {
+        if (!containsKey(key)) {
             adOwnRedisTemplate.opsForValue().increment(key, value);
             adOwnRedisTemplate.expire(key, expireTime, TimeUnit.SECONDS);
         } else {
@@ -96,7 +95,7 @@ public class AdOwnRedisHelper {
             expireTime = AD_FILTER_DEFAULT_EXPIRE_TIME;
         }
         // 只在第一次进行设置过期时间
-        if (!contantinsKey(key)) {
+        if (!containsKey(key)) {
             adOwnRedisTemplate.opsForValue().increment(key, value);
             adOwnRedisTemplate.expire(key, expireTime, TimeUnit.SECONDS);
         } else {
@@ -112,7 +111,7 @@ public class AdOwnRedisHelper {
         return Integer.valueOf(obj.toString());
     }
 
-    public void putDealyQueueMsg(String key, String value) {
+    public void putDelayQueueMsg(String key, String value) {
         adOwnRedisTemplate.opsForZSet().add(key, value, System.currentTimeMillis() + AD_FILTER_DELAY_QUEUE_EXPIRETIME);
     }
 

ad-engine-commons/src/main/java/com/tzld/piaoquan/ad/engine/commons/redis/AlgorithmRedisHelper.java

@@ -27,7 +27,7 @@ public class AlgorithmRedisHelper {
 
 
 
-    public boolean contantinsKey(String key) {
+    public boolean containsKey(String key) {
         return redisTemplate.hasKey(key);
     }
 
@@ -80,7 +80,7 @@ public class AlgorithmRedisHelper {
             expireTime = AD_FILTER_DEFAULT_EXPIRE_TIME;
         }
         // 只在第一次进行设置过期时间
-        if (!contantinsKey(key)) {
+        if (!containsKey(key)) {
             redisTemplate.opsForValue().increment(key, value);
             redisTemplate.expire(key, expireTime, TimeUnit.SECONDS);
         } else {
@@ -100,7 +100,7 @@ public class AlgorithmRedisHelper {
             expireTime = AD_FILTER_DEFAULT_EXPIRE_TIME;
         }
         // 只在第一次进行设置过期时间
-        if (!contantinsKey(key)) {
+        if (!containsKey(key)) {
             redisTemplate.opsForValue().increment(key, value);
             redisTemplate.expire(key, expireTime, TimeUnit.SECONDS);
         } else {
@@ -116,7 +116,7 @@ public class AlgorithmRedisHelper {
         return Integer.valueOf(obj.toString());
     }
 
-    public void putDealyQueueMsg(String key, String value) {
+    public void putDelayQueueMsg(String key, String value) {
         redisTemplate.opsForZSet().add(key, value, System.currentTimeMillis() + AD_FILTER_DELAY_QUEUE_EXPIRETIME);
     }
 

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/model/threshold/RoiThresholdPredictModel.java

@@ -1,7 +1,6 @@
 package com.tzld.piaoquan.ad.engine.service.predict.model.threshold;
 
 import com.tzld.piaoquan.ad.engine.commons.enums.AppTypeEnum;
-import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
 import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.config.RoiModelConfig;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
@@ -49,7 +48,7 @@ public class RoiThresholdPredictModel extends ThresholdPredictModel{
         String shareUserRuleKey = (String) userParams.get("rule");
 
         String groupShareRateKeyWithAd = RuleRedisKeyConst.KEY_NAME_PREFIX_GROUP_WITH_AD + shareUserDataKey + ":" + shareUserRuleKey + ":" + nowDt;
-        if (!redisHelper.contantinsKey(groupShareRateKeyWithAd)) {
+        if (!redisHelper.containsKey(groupShareRateKeyWithAd)) {
             groupShareRateKeyWithAd = RuleRedisKeyConst.KEY_NAME_PREFIX_GROUP_WITH_AD + shareUserDataKey + ":" + shareUserRuleKey + ":" + previousDt;
         }
         Double groupShareRateWithAd = redisHelper.zScore(groupShareRateKeyWithAd, modelParam.getMid());
@@ -57,7 +56,7 @@ public class RoiThresholdPredictModel extends ThresholdPredictModel{
         Map<String, Object> videoParams = ( Map<String, Object>) ((Map<String,Object>)roiModelConfig.get(AppTypeEnum.valueOf(modelParam.getAppType()).name())).get("video");
         String shareVideoDataKey = (String) videoParams.get("data");
         String videoShareRateKeyWithAd = RuleRedisKeyConst.KEY_NAME_PREFIX_VIDEO_WITH_AD + shareVideoDataKey + ":" + nowDt;
-        if (!redisHelper.contantinsKey(videoShareRateKeyWithAd)) {
+        if (!redisHelper.containsKey(videoShareRateKeyWithAd)) {
             videoShareRateKeyWithAd = RuleRedisKeyConst.KEY_NAME_PREFIX_VIDEO_WITH_AD + shareVideoDataKey + ":" + previousDt;
         }
         Double videoShareRateWithAd = redisHelper.zScore(videoShareRateKeyWithAd,modelParam.getVideoId().toString());
@@ -66,13 +65,13 @@ public class RoiThresholdPredictModel extends ThresholdPredictModel{
         }
 
         String groupShareRateKeyNoAd = RuleRedisKeyConst.KEY_NAME_PREFIX_GROUP_NO_AD + shareUserDataKey + ":" + shareUserRuleKey + ":" + nowDt;
-        if (!redisHelper.contantinsKey(groupShareRateKeyNoAd)) {
+        if (!redisHelper.containsKey(groupShareRateKeyNoAd)) {
             groupShareRateKeyNoAd = RuleRedisKeyConst.KEY_NAME_PREFIX_GROUP_NO_AD + shareUserDataKey + ":" + shareUserRuleKey + ":" + previousDt;
         }
         Double groupShareRateNoAd = redisHelper.zScore(groupShareRateKeyNoAd, modelParam.getMidGroup());
 
         String videoShareRateKeyNoAd = RuleRedisKeyConst.KEY_NAME_PREFIX_VIDEO_NO_AD + shareVideoDataKey + ":" + nowDt;
-        if (!redisHelper.contantinsKey(videoShareRateKeyNoAd)) {
+        if (!redisHelper.containsKey(videoShareRateKeyNoAd)) {
             videoShareRateKeyNoAd = RuleRedisKeyConst.KEY_NAME_PREFIX_VIDEO_NO_AD + shareVideoDataKey + ":" + previousDt;
         }
         Double videoShareRateNoAd = redisHelper.zScore(videoShareRateKeyNoAd,modelParam.getVideoId().toString());

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/param/RuleParamHelper.java

@@ -1,6 +1,5 @@
 package com.tzld.piaoquan.ad.engine.service.predict.param;
 
-import com.tzld.piaoquan.ad.engine.commons.redis.AdOwnRedisHelper;
 import com.tzld.piaoquan.ad.engine.commons.redis.AlgorithmRedisHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.constant.RuleRedisKeyConst;
 import org.apache.commons.lang3.StringUtils;
@@ -31,7 +30,7 @@ public class RuleParamHelper {
                         .getOrDefault("user",defaultMap)).get("rule");
         String groupShareRateKey = RuleRedisKeyConst.KEY_NAME_PREFIX_AD_GROUP + shareUserDataKey + ":" + shareUserRuleKey + ":" + nowDt;
 
-        if (StringUtils.isEmpty(shareUserDataKey)||StringUtils.isEmpty(shareUserRuleKey)|| !redisHelper.contantinsKey(groupShareRateKey)) {
+        if (StringUtils.isEmpty(shareUserDataKey)||StringUtils.isEmpty(shareUserRuleKey)|| !redisHelper.containsKey(groupShareRateKey)) {
             Calendar cal = Calendar.getInstance();
             cal.setTime(nowDate);
             cal.add(Calendar.DATE, -1);
@@ -54,7 +53,7 @@ public class RuleParamHelper {
                 ((Map<String,Object>)abTestParam.getOrDefault("user",defaultMap)).get("rule");
         String groupShareRateKey = RuleRedisKeyConst.KEY_NAME_PREFIX_AD_GROUP + shareUserDataKey + ":" + shareUserRuleKey + ":" + nowDt;
 
-        if (StringUtils.isEmpty(shareUserDataKey)||StringUtils.isEmpty(shareUserRuleKey)|| !redisHelper.contantinsKey(groupShareRateKey)) {
+        if (StringUtils.isEmpty(shareUserDataKey)||StringUtils.isEmpty(shareUserRuleKey)|| !redisHelper.containsKey(groupShareRateKey)) {
             Calendar cal = Calendar.getInstance();
             cal.setTime(nowDate);
             cal.add(Calendar.DATE, -1);
@@ -77,7 +76,7 @@ public class RuleParamHelper {
                         .getOrDefault("video",defaultMap)).get("data");
         String videoShareRateKey = RuleRedisKeyConst.KEY_NAME_PREFIX_AD_VIDEO + shareVideoDataKey + ":" + nowDt;
 
-        if (StringUtils.isEmpty(shareVideoDataKey)||!redisHelper.contantinsKey(videoShareRateKey)) {
+        if (StringUtils.isEmpty(shareVideoDataKey)||!redisHelper.containsKey(videoShareRateKey)) {
             Calendar cal = Calendar.getInstance();
             cal.setTime(nowDate);
             cal.add(Calendar.DATE, -1);
@@ -104,7 +103,7 @@ public class RuleParamHelper {
                         .getOrDefault("video",defaultMap)).get("data");
         String videoShareRateKey = RuleRedisKeyConst.KEY_NAME_PREFIX_AD_VIDEO + shareVideoDataKey + ":" + nowDt;
 
-        if (StringUtils.isEmpty(shareVideoDataKey)||!redisHelper.contantinsKey(videoShareRateKey)) {
+        if (StringUtils.isEmpty(shareVideoDataKey)||!redisHelper.containsKey(videoShareRateKey)) {
             Calendar cal = Calendar.getInstance();
             cal.setTime(nowDate);
             cal.add(Calendar.DATE, -1);
@@ -134,7 +133,7 @@ public class RuleParamHelper {
         String groupOutRateKey = RuleRedisKeyConst.KEY_NAME_PREFIX_AD_GROUP + outUserDataKey + ":" + outUserRuleKey + ":" + nowDt;
 
         if (StringUtils.isEmpty(outUserDataKey)||StringUtils.isEmpty(outUserRuleKey)
-                ||!redisHelper.contantinsKey(groupOutRateKey)) {
+                ||!redisHelper.containsKey(groupOutRateKey)) {
             Calendar cal = Calendar.getInstance();
             cal.setTime(nowDate);
             cal.add(Calendar.DATE, -1);
@@ -155,7 +154,7 @@ public class RuleParamHelper {
                 ((Map<String,Object>)abTestParam.getOrDefault("out",defaultMap)).getOrDefault("video",defaultMap)).get("data");
         String videoOutRateKey = RuleRedisKeyConst.KEY_NAME_PREFIX_AD_VIDEO + outVideoDataKey + ":" + nowDt;
 
-        if (StringUtils.isEmpty(outVideoDataKey)||!redisHelper.contantinsKey(videoOutRateKey)) {
+        if (StringUtils.isEmpty(outVideoDataKey)||!redisHelper.containsKey(videoOutRateKey)) {
             Calendar cal = Calendar.getInstance();
             cal.setTime(nowDate);
             cal.add(Calendar.DATE, -1);