From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽

---
 src/main/java/com/yeshi/buwan/service/imp/juhe/FunTV2ServiceImpl.java |   29 +++++++++++++++++------------
 1 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTV2ServiceImpl.java b/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTV2ServiceImpl.java
index 717c7ee..6af9446 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTV2ServiceImpl.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTV2ServiceImpl.java
@@ -12,16 +12,16 @@
 import com.yeshi.buwan.domain.entity.PlayUrl;
 import com.yeshi.buwan.domain.system.DetailSystemConfig;
 import com.yeshi.buwan.domain.video.AlbumVideoMap;
+import com.yeshi.buwan.service.imp.*;
+import com.yeshi.buwan.service.inter.juhe.FunTV2Service;
+import com.yeshi.buwan.util.StringUtil;
+import com.yeshi.buwan.util.mq.rabbit.RabbitmqManager;
+import com.yeshi.buwan.util.video.VideoConstant;
 import com.yeshi.buwan.videos.funtv.FunTVUtil2;
 import com.yeshi.buwan.videos.funtv.entity.FunTVAlbum2;
 import com.yeshi.buwan.videos.funtv.entity.FunTVShortVideo2;
 import com.yeshi.buwan.videos.funtv.entity.FunTVVideo2;
 import com.yeshi.buwan.videos.funtv.entity.VideoFunTV2;
-import com.yeshi.buwan.service.imp.*;
-import com.yeshi.buwan.service.inter.juhe.FunTV2Service;
-import com.yeshi.buwan.util.StringUtil;
-import com.yeshi.buwan.util.mq.CMQManager;
-import com.yeshi.buwan.util.video.VideoConstant;
 import com.yeshi.buwan.vo.AcceptData;
 import net.sf.json.JSONObject;
 import org.springframework.stereotype.Service;
@@ -29,7 +29,9 @@
 
 import javax.annotation.Resource;
 import java.io.Serializable;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
 
 @Service
 public class FunTV2ServiceImpl implements FunTV2Service {
@@ -66,6 +68,9 @@
 
     @Resource
     private DetailSystemConfigService detailSystemConfigService;
+
+    @Resource
+    private RabbitmqManager rabbitmqManager;
 
 
     @Override
@@ -105,14 +110,14 @@
                 videoInfo.setVpicture(newVideoInfo.getVpicture());
                 videoInfo.setShow(newVideoInfo.getShow());
                 videoInfo.setVideoType(newVideoInfo.getVideoType());
-                videoInfoDao.update(videoInfo);
+                videoInfoService.update(videoInfo);
             }
         } else {//瑙嗛涓嶅瓨鍦�
             //鍒ゆ柇2涓棰戝疄浣撴槸鍚︿负鍚屼竴瑙嗛
             VideoInfo oldVideo = videoInfoService.getExistSameVideoWithTime(newVideoInfo);
             if (oldVideo == null) {
                 //娣诲姞瑙嗛
-                Serializable id = videoInfoDao.save(newVideoInfo);
+                Serializable id = videoInfoService.save(newVideoInfo);
                 newVideoInfo.setId(id + "");
             } else {//涓哄悓涓�瑙嗛
                 //鏇存柊tag
@@ -124,7 +129,7 @@
                 oldVideo.setVpicture(newVideoInfo.getVpicture());
                 oldVideo.setShow(newVideoInfo.getShow());
                 oldVideo.setVideoType(newVideoInfo.getVideoType());
-                videoInfoDao.update(oldVideo);
+                videoInfoService.update(oldVideo);
             }
 
             //鍔犲叆涓撹緫瑙嗛鏄犲皠
@@ -147,7 +152,7 @@
         resourceVideoService.addVideoResource(newVideoInfo.getId(), FunTVUtil2.RESOURCE_ID + "");
         //娣诲姞瑙嗛鍒嗙被鏄犲皠
         categoryVideoService.addCategoryVideo(newVideoInfo.getId(), newVideoInfo.getVideoType().getId());
-        CMQManager.getInstance().addSolrMsg(newVideoInfo.getId());
+        rabbitmqManager.addSolrMsg(newVideoInfo.getId());
     }
 
     @Override
@@ -225,7 +230,7 @@
         DetailSystemConfig config = detailSystemConfigService.getConfigByKey("funshion_sdk_player", acceptData.getDetailSystem(), acceptData.getVersion());
         //榛樿SDK鎾斁
         if (config == null)
-            return FunTVUtil2.PLAY_SDK;
+            return FunTVUtil2.PLAY_HTML;
 
         String channel = acceptData.getChannel();
         if (StringUtil.isNullOrEmpty(channel)) {
@@ -273,7 +278,7 @@
         int t = getPlayType(acceptData, video2);
         PlayUrl pu = new PlayUrl();
         pu.setParams("");
-        pu.setPlayType(t);
+        pu.setPlayType(1);
         pu.setResource(vr);
         pu.setAid(video2.getMediaId());
         pu.setVid(video2.getId());

--
Gitblit v1.8.0