From d3ebf5b103d4deebd6ffb75f4471a6fddab8d764 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 05 九月 2020 17:30:30 +0800
Subject: [PATCH] '微信登录'

---
 src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil2.java |   40 ++++++++++++++++++++++++++++------------
 1 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil2.java b/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil2.java
index a685c5b..9055086 100644
--- a/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil2.java
+++ b/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil2.java
@@ -1,31 +1,28 @@
 package com.yeshi.buwan.iqiyi.util;
 
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
 import com.yeshi.buwan.dao.VideoInfoDao;
 import com.yeshi.buwan.dao.juhe.iqiyi.IqiyiAlbum2Dao;
 import com.yeshi.buwan.dao.juhe.iqiyi.VideoIqiyi2Dao;
+import com.yeshi.buwan.dao.video.AlbumVideoMapDao;
 import com.yeshi.buwan.domain.*;
 import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.iqiyi.IqiYiAPI;
+import com.yeshi.buwan.domain.video.AlbumVideoMap;
 import com.yeshi.buwan.iqiyi.IqiYiNewAPI;
-import com.yeshi.buwan.iqiyi.entity.*;
+import com.yeshi.buwan.iqiyi.entity.IqiyiAlbum2;
+import com.yeshi.buwan.iqiyi.entity.VideoIqiyi2;
 import com.yeshi.buwan.iqiyi.vo.IqiyiAlbumListResult;
-import com.yeshi.buwan.log.LogHelper;
 import com.yeshi.buwan.service.imp.CategoryVideoService;
 import com.yeshi.buwan.service.imp.ResourceVideoService;
 import com.yeshi.buwan.service.imp.VideoInfoService;
 import com.yeshi.buwan.service.imp.VideoResourceService;
-import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.util.TimeUtil;
+import com.yeshi.buwan.util.mq.CMQManager;
 import com.yeshi.buwan.util.video.VideoConstant;
-import net.sf.json.JSONArray;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.List;
@@ -61,6 +58,9 @@
 
     @Resource
     private VideoResourceService videoResourceService;
+
+    @Resource
+    private AlbumVideoMapDao albumVideoMapDao;
 
     private void saveAlbumAndVideo(List<IqiyiAlbum2> list) {
         if (list == null)
@@ -113,12 +113,12 @@
 
     //拉取所有的动漫
     public void syncAllDongMan() {
-        syncAlbumAndVideo(IqiYiNewAPI.TYPE_DONGMAN, true, null);
+        syncAlbumAndVideo(IqiYiNewAPI.TYPE_DONGMAN, true, 217289601L);
     }
 
     //拉取所有的综艺
     public void syncAllZongYi() {
-        syncAlbumAndVideo(IqiYiNewAPI.TYPE_ZONGYI, true, null);
+        syncAlbumAndVideo(IqiYiNewAPI.TYPE_ZONGYI, true, 246881501L);
     }
 
     //更新专辑
@@ -153,12 +153,18 @@
         }
 
         //只缓存有效的
-        if(album.getEffect()==0)
+        if (album.getEffect() == 0)
             return;
 
         //只缓存正片
-        if(album.getContentType()!=1)
+        if (album.getContentType() != 1)
             return;
+
+        //综艺必须要有内容
+        if (album.getChannelId() == 6) {
+            if (album.getTvQipuIds().size() == 0)
+                return;
+        }
 
         VideoInfo newVideoInfo = convertAlbumToVideoInfo(album);
         VideoIqiyi2 videoIqiyi2 = videoIqiyi2Dao.selectByIqiyiId(album.getId());
@@ -202,6 +208,14 @@
                 videoInfoDao.update(oldVideo);
             }
 
+            //加入专辑视频映射
+            AlbumVideoMap map = new AlbumVideoMap();
+            map.setCreateTime(new Date());
+            map.setVideoId(newVideoInfo.getId());
+            map.setRootVideoType(newVideoInfo.getVideoType().getId());
+            map.setVideoCount(newVideoInfo.getVideocount());
+            albumVideoMapDao.save(map);
+
             //加入映射
             VideoIqiyi2 vi = new VideoIqiyi2();
             vi.setIqiyiId(album.getId());
@@ -213,6 +227,8 @@
             resourceVideoService.addVideoResource(newVideoInfo.getId(), RESOURCE_ID + "");
             //添加视频分类映射
             categoryVideoService.addCategoryVideo(newVideoInfo.getId(), newVideoInfo.getVideoType().getId());
+
+            CMQManager.getInstance().addSolrMsg(newVideoInfo.getId());
         }
 
 

--
Gitblit v1.8.0