匹配小程序服务代码迁移

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/entity/longArticle/LongArticlesMatchVideo.java

@@ -105,4 +105,8 @@ public class LongArticlesMatchVideo {
 
     @Column(name = "publish_flag")
     private Integer publishFlag = 1;
+
+
+    @Column(name = "video_pool_trace_id")
+    private String videoPoolTraceId;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/model/param/SearchVideoParam.java

@@ -22,4 +22,6 @@ public class SearchVideoParam {
     private Integer publishFlag;
 
     private String channelContentId;
+
+    private String videoPoolTraceId;
 }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/impl/CardGeneratorServiceImpl.java

@@ -94,6 +94,12 @@ public class CardGeneratorServiceImpl implements CardGeneratorService {
                 case 5:
                     rootSourceId = "gzhhzdx_" + generateSourceId();
                     break;
+                case 6:
+                    rootSourceId = "fwhhzdyy_" + generateSourceId();
+                    break;
+                case 7:
+                    rootSourceId = "fwhtouliu_" + ghId + "_" + generateSourceId();
+                    break;
                 default:
                     rootSourceId = "Error mini_program_type " + miniProgramType;
             }

long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/video/impl/MatchVideoServiceImpl.java

@@ -99,6 +99,7 @@ public class MatchVideoServiceImpl implements MatchVideoService {
         } else {
             longArticlesMatchVideo.setPublishFlag(searchVideoParam.getPublishFlag());
         }
+        longArticlesMatchVideo.setVideoPoolTraceId(searchVideoParam.getVideoPoolTraceId());
         longArticlesMatchVideoRepository.save(longArticlesMatchVideo);
 
 
@@ -135,12 +136,7 @@ public class MatchVideoServiceImpl implements MatchVideoService {
             return res;
         }
         String ghId = chooseMinigramParam.getGhId();
-        if (ghId != null && EXPERIMENT_27_GH_ID_SET.contains(ghId)) {
-            res.put("programAvatar", MinigramEnum.XYMHFQDD_27.getAvatar());
-            res.put("programId", MinigramEnum.XYMHFQDD_27.getId());
-            res.put("programName", MinigramEnum.XYMHFQDD_27.getName());
-            res.put("trace_id", chooseMinigramParam.getTraceId());
-        } else if (ghId != null && ghIdInPqVideo.contains(ghId)) {
+        if (ghId != null && ghIdInPqVideo.contains(ghId)) {
             res.put("programAvatar", MinigramEnum.PQSP4.getAvatar());
             res.put("programId", MinigramEnum.PQSP4.getId());
             res.put("programName", MinigramEnum.PQSP4.getName());
@@ -211,7 +207,7 @@ public class MatchVideoServiceImpl implements MatchVideoService {
     }
 
     @Override
-    public JSONObject recallVideos(RecallVideosParam recallVideosParam){
+    public JSONObject recallVideos(RecallVideosParam recallVideosParam) {
         JSONObject res = new JSONObject();
         String traceId = recallVideosParam.getTraceId();
         Integer miniprogramUseType = recallVideosParam.getMiniprogramUseType();