Merge branch 'feature_20240925_zhaohaipeng_ad_time' into pre-master

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

@@ -373,15 +373,23 @@ public class PredictModelServiceImpl implements PredictModelService {
         return false;
     }
 
+    /**
+     * 是否提前出广告
+     *
+     * @return true-提前出，false-不提前出
+     */
     private boolean isAdvanceShowAd() {
+        // 提前出广告是否生效，不生效表示不用提前出广告，返回false。默认生效
         if (!advanceShowAdSwitch) {
             return false;
         }
 
+        // 提前出广告全局开关，如果开启不走定时任务的判断
         if (advanceShowAdGlobalFlag) {
             return true;
         }
 
+        // 提前出广告标识，由ad后端的定时任务写入，为1表示提前出广告
         String day = DateTimeFormatter.ofPattern("yyyyMMdd").format(LocalDateTime.now());
         String redisKey = String.format(RedisPrefixEnum.ADVANCE_SHOW_AD_FLAG.getPrefix(), day);
         String flag = adRedisHelper.get(redisKey);

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

@@ -567,7 +567,7 @@ public class RankService680 extends RankStrategyXGBBasic {
             return;
         }
         synchronized (this) {
-            InputStream resourceStream = RankService687.class.getClassLoader().getResourceAsStream("20240718_ad_bucket_688.txt");
+            InputStream resourceStream = RankService680.class.getClassLoader().getResourceAsStream("20240718_ad_bucket_688.txt");
             if (resourceStream != null) {
                 try (BufferedReader reader = new BufferedReader(new InputStreamReader(resourceStream))) {
                     Map<String, double[]> bucketsMap = new HashMap<>();

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

@@ -559,7 +559,7 @@ public class RankStrategyXGBAutoUpdateModel688 extends RankStrategyXGBBasic {
             return;
         }
         synchronized (this) {
-            InputStream resourceStream = RankService687.class.getClassLoader().getResourceAsStream("20240718_ad_bucket_688.txt");
+            InputStream resourceStream = RankStrategyXGBAutoUpdateModel688.class.getClassLoader().getResourceAsStream("20240718_ad_bucket_688.txt");
             if (resourceStream != null) {
                 try (BufferedReader reader = new BufferedReader(new InputStreamReader(resourceStream))) {
                     Map<String, double[]> bucketsMap = new HashMap<>();