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

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV562.java

@@ -11,7 +11,6 @@ import com.tzld.piaoquan.recommend.server.service.rank.RankParam;
 import com.tzld.piaoquan.recommend.server.service.rank.bo.UserSRBO;
 import com.tzld.piaoquan.recommend.server.service.rank.bo.UserShareReturnProfile;
 import com.tzld.piaoquan.recommend.server.service.rank.extractor.ExtractVideoMergeCate;
-import com.tzld.piaoquan.recommend.server.service.rank.extractor.ExtractorUtils;
 import com.tzld.piaoquan.recommend.server.service.rank.tansform.FeatureV6;
 import com.tzld.piaoquan.recommend.server.service.recall.strategy.*;
 import com.tzld.piaoquan.recommend.server.service.score.ScorerUtils;
@@ -22,7 +21,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.math3.util.Pair;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
@@ -346,6 +344,16 @@ public class RankStrategy4RegionMergeModelV562 extends RankStrategy4RegionMergeM
             } catch (Exception e) {
                 log.error("get feature error", e);
             }
+            // 超时后取消
+            for (Future<Integer> future : futures) {
+                try {
+                    if (!future.isDone()) {
+                        future.cancel(true);
+                    }
+                } catch (Exception e) {
+                    log.error("cancel feature error", e);
+                }
+            }
         }
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV564.java

@@ -303,6 +303,16 @@ public class RankStrategy4RegionMergeModelV564 extends RankStrategy4RegionMergeM
             } catch (Exception e) {
                 log.error("get feature error", e);
             }
+            // 超时后取消
+            for (Future<Integer> future : futures) {
+                try {
+                    if (!future.isDone()) {
+                        future.cancel(true);
+                    }
+                } catch (Exception e) {
+                    log.error("cancel feature error", e);
+                }
+            }
         }
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV566.java

@@ -329,6 +329,16 @@ public class RankStrategy4RegionMergeModelV566 extends RankStrategy4RegionMergeM
             } catch (Exception e) {
                 log.error("get feature error", e);
             }
+            // 超时后取消
+            for (Future<Integer> future : futures) {
+                try {
+                    if (!future.isDone()) {
+                        future.cancel(true);
+                    }
+                } catch (Exception e) {
+                    log.error("cancel feature error", e);
+                }
+            }
         }
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV567.java

@@ -329,6 +329,16 @@ public class RankStrategy4RegionMergeModelV567 extends RankStrategy4RegionMergeM
             } catch (Exception e) {
                 log.error("get feature error", e);
             }
+            // 超时后取消
+            for (Future<Integer> future : futures) {
+                try {
+                    if (!future.isDone()) {
+                        future.cancel(true);
+                    }
+                } catch (Exception e) {
+                    log.error("cancel feature error", e);
+                }
+            }
         }
     }
 

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/strategy/RankStrategy4RegionMergeModelV568.java

@@ -303,6 +303,16 @@ public class RankStrategy4RegionMergeModelV568 extends RankStrategy4RegionMergeM
             } catch (Exception e) {
                 log.error("get feature error", e);
             }
+            // 超时后取消
+            for (Future<Integer> future : futures) {
+                try {
+                    if (!future.isDone()) {
+                        future.cancel(true);
+                    }
+                } catch (Exception e) {
+                    log.error("cancel feature error", e);
+                }
+            }
         }
     }