注释掉部分无用代码

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

@@ -44,7 +44,7 @@ public class PredictController {
 
     @RequestMapping("/test")
     public void test(Integer appType,String typeValue){
-        adTestConfigContainer.initMap(appType,typeValue);
+//        adTestConfigContainer.initMap(appType,typeValue);
     }
 
 }

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

@@ -28,64 +28,64 @@ public class AbTestConfigContainer {
     //List<Tuple<Integer>>
     Map<String,List<JSONObject>> adTimePlanMap=new HashMap<>();
 //    Map<Integer,Map<String,List<JSONObject>>> appAdTimePlanMap=new ConcurrentHashMap<>() ;
-    @PostConstruct
-    public void initContainer(){
-        Timer timer = new Timer();
-        timer.schedule(new TimerTask() {
-            @Override
-            public void run() {
-                try {
-//                    for (Integer appType:appAdTimePlanMap.keySet()){
-//                        initMap(appType,"ab_test002");
-//                    }
-                    initMap(3,"ab_test002");
-//                    log.info("svc=refresh_adTimePlanMap appAdTimePlanMap={}",JSONObject.toJSONString(appAdTimePlanMap));
-                    log.info("svc=refresh_adTimePlanMap adTimePlanMap={}",JSONObject.toJSONString(adTimePlanMap));
-                }catch (Exception e){
-                    e.printStackTrace();
-                }
-            }
-        }, 0, 1000*30);
-    }
+//    @PostConstruct
+//    public void initContainer(){
+//        Timer timer = new Timer();
+//        timer.schedule(new TimerTask() {
+//            @Override
+//            public void run() {
+//                try {
+////                    for (Integer appType:appAdTimePlanMap.keySet()){
+////                        initMap(appType,"ab_test002");
+////                    }
+//                    initMap(3,"ab_test002");
+////                    log.info("svc=refresh_adTimePlanMap appAdTimePlanMap={}",JSONObject.toJSONString(appAdTimePlanMap));
+//                    log.info("svc=refresh_adTimePlanMap adTimePlanMap={}",JSONObject.toJSONString(adTimePlanMap));
+//                }catch (Exception e){
+//                    e.printStackTrace();
+//                }
+//            }
+//        }, 0, 1000*30);
+//    }
 
-    public void initMap(Integer appType,String typeValue){
-        AbTestConfigRequest request=new  AbTestConfigRequest();
-        if(appType==null){
-            request.setAppType(0);
-        }else{
-            request.setAppType(appType);
-        }
-        request.setTypeValue(typeValue);
-        CommonResponse<JSONObject> response=longVideoFeign.getAbTestConfig(request);
-        log.info("svc=initAdTimePlanMap_getConfigFromLongVideoApi response={}",JSONObject.toJSONString(response));
-        JSONObject object=response.getData();
-        for(Map.Entry<String,Object> entry:object.getInnerMap().entrySet()){
-            for(Map<String,Object> map:(List<Map>)entry.getValue()){
-                if(adTestCode.equals(map.get("abExpCode").toString())){
-                    adTimePlanMap=JSONObject.parseObject(map.get("configValue").toString(),Map.class);
-                    break;
-                }
-            }
-        }
-    }
+//    public void initMap(Integer appType,String typeValue){
+//        AbTestConfigRequest request=new  AbTestConfigRequest();
+//        if(appType==null){
+//            request.setAppType(0);
+//        }else{
+//            request.setAppType(appType);
+//        }
+//        request.setTypeValue(typeValue);
+//        CommonResponse<JSONObject> response=longVideoFeign.getAbTestConfig(request);
+//        log.info("svc=initAdTimePlanMap_getConfigFromLongVideoApi response={}",JSONObject.toJSONString(response));
+//        JSONObject object=response.getData();
+//        for(Map.Entry<String,Object> entry:object.getInnerMap().entrySet()){
+//            for(Map<String,Object> map:(List<Map>)entry.getValue()){
+//                if(adTestCode.equals(map.get("abExpCode").toString())){
+//                    adTimePlanMap=JSONObject.parseObject(map.get("configValue").toString(),Map.class);
+//                    break;
+//                }
+//            }
+//        }
+//    }
 
-    public Boolean containsCode(String code){
-        return adTimePlanMap.keySet().contains(code);
-    }
+//    public Boolean containsCode(String code){
+//        return adTimePlanMap.keySet().contains(code);
+//    }
 
     public Boolean containsCode(Map<String,List<JSONObject>> configMap,String code){
         return configMap.keySet().contains(code);
     }
 
-    public Boolean inWithoutAdTime(String code,Integer hourOfDay){
-        Boolean flag=false;
-        for(JSONObject object:adTimePlanMap.getOrDefault(code,new ArrayList<>())){
-            if(object.getInteger("x")<=hourOfDay&&hourOfDay<object.getInteger("y")){
-                return true;
-            }
-        }
-        return flag;
-    }
+//    public Boolean inWithoutAdTime(String code,Integer hourOfDay){
+//        Boolean flag=false;
+//        for(JSONObject object:adTimePlanMap.getOrDefault(code,new ArrayList<>())){
+//            if(object.getInteger("x")<=hourOfDay&&hourOfDay<object.getInteger("y")){
+//                return true;
+//            }
+//        }
+//        return flag;
+//    }
 
     public Boolean inWithoutAdTime(Map<String,List<JSONObject>> abConfigMap,String code,Integer hourOfDay){
         Boolean flag=false;
@@ -110,13 +110,4 @@ public class AbTestConfigContainer {
         return false;
     }
 
-
-    public static void main(String[] args){
-        Map<String, Tuple<Integer>> map =new HashMap<>();
-        Tuple<Integer> t=new Tuple<>();
-        t.setX(1);
-        t.setY(2);
-        map.put("sk",t);
-        System.out.println(JSONObject.toJSONString(map));
-    }
 }

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

@@ -30,7 +30,7 @@ import java.util.concurrent.TimeUnit;
 public class PidLambdaContainer {
     private final static Logger log = LoggerFactory.getLogger(PidLambdaContainer.class);
 
-    private static final int SCHEDULE_PERIOD = 10;
+    private static final int SCHEDULE_PERIOD = 1;
     private static final ScheduledExecutorService scheduler = Executors.newScheduledThreadPool(1);
     @Value("${model.oss.internal.endpoint:oss-cn-hangzhou.aliyuncs.com}")
     String endpoint = "";
@@ -41,19 +41,19 @@ public class PidLambdaContainer {
     @Value("${model.oss.bucketName:art-recommend}")
     String bucketName = "";
 
-    @Value("${model.oss.pid.filename.lambda:}")
+    @Value("${model.oss.pid.filename.lambda:pid/lambda}")
     String lambdaFileName = "";
 
-    @Value("${model.oss.pid.filename.dCpa:art-recommend}")
+    @Value("${model.oss.pid.filename.dCpa:pid/dCpa}")
     String dCpaFileName = "";
 
-    @Value("${ad.model.pid.kp:0}")
+    @Value("${ad.model.pid.kp:0.5}")
     Double kp = 0d;
 
-    @Value("${ad.model.pid.ki:0}")
+    @Value("${ad.model.pid.ki:0.05}")
     Double ki = 0d;
 
-    @Value("${ad.model.pid.kd:0}")
+    @Value("${ad.model.pid.kd:0.005}")
     Double kd = 0d;
 
     OSS client;