12
0

2 Ревизии 731a588ac3 ... 5c24592a45

Автор SHA1 Съобщение Дата
  jiandong.liu 5c24592a45 Merge branch 'ljd/feature-morning-abtest' into pre-master преди 4 дни
  jiandong.liu 05e55d85ca 下线5-6点实验 преди 4 дни
променени са 1 файла, в които са добавени 12 реда и са изтрити 7 реда
  1. 12 7
      ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

+ 12 - 7
ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/impl/PredictModelServiceImpl.java

@@ -134,6 +134,9 @@ public class PredictModelServiceImpl implements PredictModelService {
     @Value("${experiment.morning56.ad.hour:5,6}")
     private String experimentMorning56WithAdHour;
 
+    @Value("${experiment.morning56.switch:false}")
+    private String experimentMorning56Switch;
+
     @Autowired
     private AdRedisHelper adRedisHelper;
 
@@ -208,15 +211,17 @@ public class PredictModelServiceImpl implements PredictModelService {
             if ( 0 <= hourOfDay && hourOfDay < 8 && !isAdvanceShowAd() ) {
                 // 0点到8点 && 不是节日
 
-                // 判断是否在morning56时间范围(5-6点)
                 boolean isInMorning56Time = false;
-                try{
-                    String[] split = experimentMorning56WithAdHour.split(",");
-                    if ( Integer.parseInt(split[0]) <= hourOfDay && hourOfDay < Integer.parseInt(split[1]) ) {
-                        isInMorning56Time = true;
+                if (StringUtils.isNotBlank(experimentMorning56Switch) && Objects.equals("true", experimentMorning56Switch)) {
+                    // 判断是否在morning56时间范围(5-6点)
+                    try {
+                        String[] split = experimentMorning56WithAdHour.split(",");
+                        if (Integer.parseInt(split[0]) <= hourOfDay && hourOfDay < Integer.parseInt(split[1])) {
+                            isInMorning56Time = true;
+                        }
+                    } catch (Exception e) {
+                        log.error("experimentMorning56WithAdHour配置异常", e);
                     }
-                }catch (Exception e){
-                    log.error("experimentMorning56WithAdHour配置异常", e);
                 }
 
                 // 判断是否在817时间范围