Merge branch 'feature_gufengshou_20240107_predict_abInfo' into test

ad-engine-server/src/main/java/com/tzld/piaoquan/ad/engine/server/controller/ControllerAspect.java

@@ -5,6 +5,7 @@ import com.tzld.piaoquan.ad.engine.commons.util.JSONUtils;
 import com.tzld.piaoquan.ad.engine.commons.util.TraceUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.AfterThrowing;
 import org.aspectj.lang.annotation.Around;
 import org.aspectj.lang.annotation.Aspect;
 import org.aspectj.lang.annotation.Pointcut;
@@ -42,11 +43,13 @@ public class ControllerAspect {
                 JSONUtils.toJson(pjp.getArgs()));
         Object result = pjp.proceed();
         if (result != null && result instanceof String) {
-            log.info("response result=[{}] cost=[{}]", result, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
+            log.info("request method=[{}]  param=[{}] result=[{}] cost=[{}]", signature.getName(),JSONUtils.toJson(pjp.getArgs()),result, stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         } else {
-            log.info("response result=[{}] cost=[{}]", JSONUtils.toJson(result), stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
+            log.info("request method=[{}]  param=[{}] result=[{}] cost=[{}]", signature.getName(),JSONUtils.toJson(pjp.getArgs()), JSONUtils.toJson(result), stopwatch.stop().elapsed(TimeUnit.MILLISECONDS));
         }
         TraceUtils.removeMDC();
         return result;
     }
+
+
 }

ad-engine-service/src/main/java/com/tzld/piaoquan/ad/engine/service/predict/container/AbTestConfigContainer.java

@@ -5,6 +5,9 @@ import com.tzld.piaoquan.ad.engine.commons.feign.CommonResponse;
 import com.tzld.piaoquan.ad.engine.commons.feign.longvideo.abtest.LongVideoFeign;
 import com.tzld.piaoquan.ad.engine.commons.feign.longvideo.abtest.request.AbTestConfigRequest;
 import com.tzld.piaoquan.ad.engine.commons.math.Tuple;
+import com.tzld.piaoquan.ad.engine.service.predict.impl.PredictModelServiceImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Component;
@@ -14,6 +17,7 @@ import java.util.*;
 
 @Component
 public class AbTestConfigContainer {
+    private final static Logger log = LoggerFactory.getLogger(PredictModelServiceImpl.class);
     @Autowired
     LongVideoFeign longVideoFeign;
     @Value("${ad.abtest.time.plan.code:555}")
@@ -30,6 +34,7 @@ public class AbTestConfigContainer {
             public void run() {
                 try {
                     initMap(null,"ab_test002");
+                    log.info("svc=refresh_adTimePlanMap adTimePlanMap={}",JSONObject.toJSONString(adTimePlanMap));
                 }catch (Exception e){
                     e.printStackTrace();
                 }
@@ -72,12 +77,14 @@ public class AbTestConfigContainer {
     }
 
     public Boolean inAdTimeTest(JSONObject abExpInfo){
+        //todo youhua
         List<Map<String,Object>> mapList=(List)abExpInfo.get("ab_test002");
         for(Map<String,Object> map:mapList){
             if(adTestCode.equals(map.getOrDefault("abExpCode",""))){
                 return true;
             }
         }
+        //
         return false;
     }
 

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

@@ -17,6 +17,8 @@ import com.tzld.piaoquan.ad.engine.service.predict.param.RuleParamHelper;
 import com.tzld.piaoquan.ad.engine.service.predict.param.ThresholdPredictModelParam;
 import com.tzld.piaoquan.ad.engine.service.predict.param.request.RoiPredictModelRequestParam;
 import com.tzld.piaoquan.ad.engine.service.predict.param.request.ThresholdPredictModelRequestParam;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -26,7 +28,7 @@ import java.util.*;
 
 @Service
 public class PredictModelServiceImpl implements PredictModelService {
-
+    private final static Logger log = LoggerFactory.getLogger(PredictModelServiceImpl.class);
     @Value("${ad.own.experiment.tier:ab_test002}")
     private String adOwnExperimentTier;
 
@@ -59,11 +61,14 @@ public class PredictModelServiceImpl implements PredictModelService {
                 &&
                 abTestConfigContainer.inWithoutAdTime(requestParam.getAbTestCode(),hourOfDay)){
             result.put("ad_predict", 1);
-            result.put("no_ad_strategy","no_ad_time");
+            result.put("no_ad_strategy","no_ad_time_with_time_plan");
             return result;
-        }else  if((!condition1||(condition1&&!condition2))&&(hourOfDay<8&&hourOfDay>=0)){
+        }else  if(
+                (!condition1 ||(condition1&&!condition2))
+                &&
+                        (hourOfDay<12&&hourOfDay>=0)){
             result.put("ad_predict", 1);
-            result.put("no_ad_strategy","no_ad_time");
+            result.put("no_ad_strategy","no_ad_time_with_fixed_time");
             return result;
         }