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

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/rank/processor/RankProcessorInsert.java

@@ -28,20 +28,20 @@ public class RankProcessorInsert {
         for (Map.Entry<String, Map<String, String>> entry : rulesMap.entrySet()) {
             Map<String, String> value = entry.getValue();
 
-            if ("小年".equals(entry.getKey())){
-                String provinceCn = param.getProvince();
-                if (provinceCn == null){
-                    provinceCn = "中国";
-                }else{
-                    provinceCn = provinceCn.replaceAll("省$", "");
-                }
-                boolean ifNorth = NORTHERN_PROVINCES.contains(provinceCn);
-                Calendar calendar = Calendar.getInstance();
-                String date = new SimpleDateFormat("yyyyMMdd").format(calendar.getTime());
-                if (ifNorth && date.compareTo("20240202")>0){
-                    continue;
-                }
-            }
+//            if ("小年".equals(entry.getKey())){
+//                String provinceCn = param.getProvince();
+//                if (provinceCn == null){
+//                    provinceCn = "中国";
+//                }else{
+//                    provinceCn = provinceCn.replaceAll("省$", "");
+//                }
+//                boolean ifNorth = NORTHERN_PROVINCES.contains(provinceCn);
+//                Calendar calendar = Calendar.getInstance();
+//                String date = new SimpleDateFormat("yyyyMMdd").format(calendar.getTime());
+//                if (ifNorth && date.compareTo("20240202")>0){
+//                    continue;
+//                }
+//            }
 
             if (value.containsKey("insert")) {
                 insertRules = value.get("insert");

recommend-server-service/src/main/java/com/tzld/piaoquan/recommend/server/service/score4recall/strategy/FestivalRecallScore.java

@@ -118,9 +118,9 @@ public class FestivalRecallScore extends AbstractScorer4Recall {
                     "00:00~2026-02-16 08:00"));
             put("立春", Arrays.asList("2024-02-03 15:00~2024-02-04 20:00", "2025-02-01 00:00~2025-02-03 08:00",
                     "2026-02-02 00:00~2026-02-04 08:00"));
-            put("北小年", Arrays.asList("2024-01-29 00:00~2024-02-02 20:00", "2025-01-18 00:00~2025-01-22 10:00", "2026-02-06 " +
-                    "00:00~2026-02-10 10:00"));
-            put("南小年", Arrays.asList("2024-01-30 00:00~2024-02-03 20:00", "2025-01-19 00:00~2025-01-23 10:00", "2026-02-07 " +
+//            put("北小年", Arrays.asList("2024-01-29 00:00~2024-02-02 20:00", "2025-01-18 00:00~2025-01-22 10:00", "2026-02-06 " +
+//                    "00:00~2026-02-10 10:00"));
+            put("小年", Arrays.asList("2024-01-30 00:00~2024-02-03 20:00", "2025-01-19 00:00~2025-01-23 10:00", "2026-02-07 " +
                     "00:00~2026-02-11 10:00"));
             put("大寒", Arrays.asList("2024-01-18 00:00~2024-01-20 08:00", "2025-01-18 00:00~2025-01-20 08:00", "2026-01-18 " +
                     "00:00~2026-01-20 08:00"));
@@ -166,14 +166,14 @@ public class FestivalRecallScore extends AbstractScorer4Recall {
         for (Map.Entry<String, List<String>> entry : YEARLY_FESTIVAL_TIME_MAP.entrySet()) {
             String festival = entry.getKey();
             List<String> timeRangeList = entry.getValue();
-            if (festival.contains("小年")){
-                if ("北小年".contains(festival) && !ifNorth){
-                    continue;
-                } else if ("南小年".contains(festival) && ifNorth) {
-                    continue;
-                }
-                festival = "小年";
-            }
+//            if (festival.contains("小年")){
+//                if ("北小年".contains(festival) && !ifNorth){
+//                    continue;
+//                } else if ("南小年".contains(festival) && ifNorth) {
+//                    continue;
+//                }
+//                festival = "小年";
+//            }
 
             if (isFestivalTime(now, timeRangeList)) {
                 Pair<LocalDateTime, LocalDateTime> startTimeAndEndTime = getStartTimeAndEndTime(timeRangeList.get(0));