Merge branch 'feature/enhance_str_ros_v2' of algorithm/recommend-server into master

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/tansform/FeatureV6.java

@@ -18,8 +18,8 @@ public class FeatureV6 {
     private static final List<String> c1Periods = Arrays.asList("72h", "168h");
     private static final List<String> b0Periods = Arrays.asList("1h", "3h", "6h", "12h");
     private static final List<String> b1Periods = Arrays.asList("1h", "3h", "6h", "24h", "72h", "168h");
-    private static final List<String> b2Periods = Arrays.asList("1h", "3h", "24h");
-    private static final List<String> b3Periods = Arrays.asList("24h", "72h", "168h");
+    private static final List<String> b2Periods = Arrays.asList("1h", "3h", "6h", "24h");
+    private static final List<String> b3Periods = Arrays.asList("1h", "3h", "6h", "24h", "72h");
     private static final List<String> b4Periods = Arrays.asList("1h", "3h", "6h", "12h");
     private static final List<String> b5Periods = Arrays.asList("1h", "3h", "6h", "12h", "24h", "72h");
     private static final List<String> b6Periods = Arrays.asList("1h", "24h");

recommend-server-service/src/main/resources/feeds_score_config_fm_xgb_20250729.conf

@@ -7,9 +7,9 @@ scorer-config = {
   nor-score-config = {
     scorer-name = "com.tzld.piaoquan.recommend.server.service.score.NorXGBRegressionScorer"
     scorer-priority = 97
-    model-path = "zhangbo/model_xgb_for_recsys_v1_nor.tar.gz"
+    model-path = "zhangbo/model_xgb_for_recsys_v1_ros.tar.gz"
     param = {
-      localDir = "xgboost/recsys_v1_nor"
+      localDir = "xgboost/recsys_v1_ros"
       features = [
       "b0_12h@ros1_#",
       "b0_12h@ros_#",
@@ -20,7 +20,6 @@ scorer-config = {
       "b0_12h@ros_one",
       "b0_12h@rovn1_#",
       "b0_12h@rovn_#",
-      "b0_1h@return_1_uv",
       "b0_1h@ros1_#",
       "b0_1h@ros_#",
       "b0_1h@ros_minus1_#",
@@ -30,7 +29,6 @@ scorer-config = {
       "b0_1h@ros_one",
       "b0_1h@rovn1_#",
       "b0_1h@rovn_#",
-      "b0_3h@return_1_uv",
       "b0_3h@ros1_#",
       "b0_3h@ros_#",
       "b0_3h@ros_minus1_#",
@@ -40,7 +38,6 @@ scorer-config = {
       "b0_3h@ros_one",
       "b0_3h@rovn1_#",
       "b0_3h@rovn_#",
-      "b0_6h@return_1_uv",
       "b0_6h@ros1_#",
       "b0_6h@ros_#",
       "b0_6h@ros_minus1_#",
@@ -50,6 +47,8 @@ scorer-config = {
       "b0_6h@ros_one",
       "b0_6h@rovn1_#",
       "b0_6h@rovn_#",
+      "b10_12h@is_share",
+      "b10_12h@return_n_uv",
       "b10_12h@ros_#",
       "b10_12h@ros_minus_#",
       "b10_12h@rovn_#",
@@ -62,42 +61,88 @@ scorer-config = {
       "b10_1h@rovn_#",
       "b10_1h@str",
       "b10_1h@str_plus",
+      "b11_12h@is_share",
+      "b11_12h@return_n_uv",
       "b11_12h@ros_#",
       "b11_12h@ros_minus_#",
       "b11_12h@rovn_#",
       "b11_12h@str",
       "b11_12h@str_plus",
+      "b13_1h@exp",
+      "b13_1h@ros_#",
+      "b13_1h@ros_minus_#",
+      "b13_1h@ros_n_#",
+      "b13_1h@ros_one",
+      "b13_1h@rovn_#",
+      "b13_1h@str",
+      "b13_1h@str_plus",
+      "b13_24h@exp",
+      "b13_24h@ros_#",
+      "b13_24h@ros_minus_#",
+      "b13_24h@ros_n_#",
+      "b13_24h@ros_one",
+      "b13_24h@rovn_#",
+      "b13_24h@str",
+      "b13_24h@str_plus",
+      "b13_3h@exp",
+      "b13_3h@ros_#",
+      "b13_3h@ros_minus_#",
+      "b13_3h@ros_n_#",
+      "b13_3h@ros_one",
+      "b13_3h@rovn_#",
+      "b13_3h@str",
+      "b13_3h@str_plus",
+      "b13_72h@exp",
+      "b13_72h@ros_#",
+      "b13_72h@ros_minus_#",
+      "b13_72h@ros_n_#",
+      "b13_72h@ros_one",
+      "b13_72h@rovn_#",
+      "b13_72h@str",
+      "b13_72h@str_plus",
+      "b1_1h@exp",
       "b1_1h@ros_#",
       "b1_1h@ros_minus_#",
       "b1_1h@ros_n_#",
       "b1_1h@ros_one",
       "b1_1h@rovn_#",
+      "b1_24h@exp",
       "b1_24h@ros_#",
       "b1_24h@ros_minus_#",
       "b1_24h@ros_n_#",
       "b1_24h@ros_one",
       "b1_24h@rovn_#",
+      "b1_3h@exp",
       "b1_3h@ros_#",
       "b1_3h@ros_minus_#",
       "b1_3h@ros_n_#",
       "b1_3h@ros_one",
       "b1_3h@rovn_#",
+      "b1_72h@exp",
       "b1_72h@ros_#",
       "b1_72h@ros_minus_#",
       "b1_72h@ros_n_#",
       "b1_72h@ros_one",
       "b1_72h@rovn_#",
+      "b2_24h@exp",
       "b2_24h@ros_#",
       "b2_24h@ros_minus_#",
       "b2_24h@ros_n_#",
       "b2_24h@ros_one",
       "b2_24h@rovn_#",
-      "b2_3h@return_n_uv",
+      "b2_3h@exp",
       "b2_3h@ros_#",
       "b2_3h@ros_minus_#",
       "b2_3h@ros_n_#",
       "b2_3h@ros_one",
       "b2_3h@rovn_#",
+      "b2_6h@exp",
+      "b2_6h@ros_#",
+      "b2_6h@ros_minus_#",
+      "b2_6h@ros_n_#",
+      "b2_6h@ros_one",
+      "b2_6h@rovn_#",
+      "b3_24h@is_share",
       "b3_24h@ros_#",
       "b3_24h@ros_minus_#",
       "b3_24h@ros_n_#",
@@ -105,13 +150,24 @@ scorer-config = {
       "b3_24h@rovn_#",
       "b3_24h@str",
       "b3_24h@str_plus",
-      "b3_72h@ros_#",
-      "b3_72h@ros_minus_#",
-      "b3_72h@ros_n_#",
-      "b3_72h@ros_one",
-      "b3_72h@rovn_#",
-      "b3_72h@str",
-      "b3_72h@str_plus",
+      "b3_3h@is_share",
+      "b3_3h@ros_#",
+      "b3_3h@ros_minus_#",
+      "b3_3h@ros_n_#",
+      "b3_3h@ros_one",
+      "b3_3h@rovn_#",
+      "b3_3h@str",
+      "b3_3h@str_plus",
+      "b3_6h@is_share",
+      "b3_6h@ros_#",
+      "b3_6h@ros_minus_#",
+      "b3_6h@ros_n_#",
+      "b3_6h@ros_one",
+      "b3_6h@rovn_#",
+      "b3_6h@str",
+      "b3_6h@str_plus",
+      "b4_12h@is_share",
+      "b4_12h@return_n_uv",
       "b4_12h@ros_#",
       "b4_12h@ros_minus_#",
       "b4_12h@ros_n_#",
@@ -138,11 +194,15 @@ scorer-config = {
       "b4_6h@ros_n_#",
       "b4_6h@ros_one",
       "b4_6h@rovn_#",
+      "b5_12h@exp",
+      "b5_12h@is_share",
+      "b5_12h@return_n_uv",
       "b5_12h@ros_#",
       "b5_12h@ros_minus_#",
       "b5_12h@ros_n_#",
       "b5_12h@ros_one",
       "b5_12h@rovn_#",
+      "b5_12h@share_cnt",
       "b5_12h@str",
       "b5_12h@str_plus",
       "b5_1h@exp",
@@ -153,8 +213,11 @@ scorer-config = {
       "b5_1h@ros_n_#",
       "b5_1h@ros_one",
       "b5_1h@rovn_#",
+      "b5_1h@share_cnt",
       "b5_1h@str",
       "b5_1h@str_plus",
+      "b5_24h@exp",
+      "b5_24h@is_share",
       "b5_24h@ros_#",
       "b5_24h@ros_minus_#",
       "b5_24h@ros_n_#",
@@ -170,6 +233,7 @@ scorer-config = {
       "b5_3h@ros_n_#",
       "b5_3h@ros_one",
       "b5_3h@rovn_#",
+      "b5_3h@share_cnt",
       "b5_3h@str",
       "b5_3h@str_plus",
       "b5_6h@exp",
@@ -180,8 +244,11 @@ scorer-config = {
       "b5_6h@ros_n_#",
       "b5_6h@ros_one",
       "b5_6h@rovn_#",
+      "b5_6h@share_cnt",
       "b5_6h@str",
       "b5_6h@str_plus",
+      "b5_72h@exp",
+      "b5_72h@is_share",
       "b5_72h@ros_#",
       "b5_72h@ros_minus_#",
       "b5_72h@ros_n_#",
@@ -198,6 +265,7 @@ scorer-config = {
       "b6_1h@rovn_#",
       "b6_1h@str",
       "b6_1h@str_plus",
+      "b6_24h@is_share",
       "b6_24h@ros_#",
       "b6_24h@ros_minus_#",
       "b6_24h@ros_n_#",
@@ -205,6 +273,9 @@ scorer-config = {
       "b6_24h@rovn_#",
       "b6_24h@str",
       "b6_24h@str_plus",
+      "b7_12h@exp",
+      "b7_12h@is_share",
+      "b7_12h@return_n_uv",
       "b7_12h@ros_#",
       "b7_12h@ros_minus_#",
       "b7_12h@ros_n_#",
@@ -212,6 +283,7 @@ scorer-config = {
       "b7_12h@rovn_#",
       "b7_12h@str",
       "b7_12h@str_plus",
+      "b7_1h@exp",
       "b7_1h@is_share",
       "b7_1h@return_n_uv",
       "b7_1h@ros_#",
@@ -221,6 +293,8 @@ scorer-config = {
       "b7_1h@rovn_#",
       "b7_1h@str",
       "b7_1h@str_plus",
+      "b7_24h@exp",
+      "b7_24h@is_share",
       "b7_24h@ros_#",
       "b7_24h@ros_minus_#",
       "b7_24h@ros_n_#",
@@ -228,6 +302,7 @@ scorer-config = {
       "b7_24h@rovn_#",
       "b7_24h@str",
       "b7_24h@str_plus",
+      "b7_3h@exp",
       "b7_3h@is_share",
       "b7_3h@return_n_uv",
       "b7_3h@ros_#",
@@ -237,6 +312,7 @@ scorer-config = {
       "b7_3h@rovn_#",
       "b7_3h@str",
       "b7_3h@str_plus",
+      "b7_6h@exp",
       "b7_6h@is_share",
       "b7_6h@return_n_uv",
       "b7_6h@ros_#",
@@ -246,6 +322,8 @@ scorer-config = {
       "b7_6h@rovn_#",
       "b7_6h@str",
       "b7_6h@str_plus",
+      "b7_72h@exp",
+      "b7_72h@is_share",
       "b7_72h@ros_#",
       "b7_72h@ros_minus_#",
       "b7_72h@ros_n_#",
@@ -253,13 +331,7 @@ scorer-config = {
       "b7_72h@rovn_#",
       "b7_72h@str",
       "b7_72h@str_plus",
-      "b8_1h@is_share",
-      "b8_1h@return_n_uv",
-      "b8_1h@ros_#",
-      "b8_1h@ros_minus_#",
-      "b8_1h@rovn_#",
-      "b8_1h@str",
-      "b8_1h@str_plus",
+      "b8_24h@is_share",
       "b8_24h@ros_#",
       "b8_24h@ros_minus_#",
       "b8_24h@rovn_#",
@@ -272,13 +344,7 @@ scorer-config = {
       "b8_3h@rovn_#",
       "b8_3h@str",
       "b8_3h@str_plus",
-      "b9_1h@is_share",
-      "b9_1h@return_n_uv",
-      "b9_1h@ros_#",
-      "b9_1h@ros_minus_#",
-      "b9_1h@rovn_#",
-      "b9_1h@str",
-      "b9_1h@str_plus",
+      "b9_24h@is_share",
       "b9_24h@ros_#",
       "b9_24h@ros_minus_#",
       "b9_24h@rovn_#",