From 1d28c69a351ae108f4116a10f19f615c89a660a2 Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期四, 01 四月 2021 01:58:43 +0800
Subject: [PATCH] 首页数据修改

---
 src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil.java |  133 ++++++++++----------------------------------
 1 files changed, 30 insertions(+), 103 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil.java b/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil.java
index d4569c5..a610b18 100644
--- a/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil.java
+++ b/src/main/java/com/yeshi/buwan/iqiyi/util/IqiyiUtil.java
@@ -1,29 +1,5 @@
 package com.yeshi.buwan.iqiyi.util;
 
-import java.io.IOException;
-import java.io.Serializable;
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Map;
-import java.util.Timer;
-import java.util.TimerTask;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.annotation.Resource;
-
-import org.apache.log4j.Logger;
-import org.hibernate.HibernateException;
-import org.hibernate.Session;
-import org.jsoup.Jsoup;
-import org.jsoup.nodes.Document;
-import org.jsoup.select.Elements;
-import org.springframework.orm.hibernate4.HibernateCallback;
-import org.springframework.stereotype.Component;
-
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.yeshi.buwan.dao.VideoResourceDao;
@@ -35,19 +11,25 @@
 import com.yeshi.buwan.domain.VideoType;
 import com.yeshi.buwan.domain.entity.PlayUrl;
 import com.yeshi.buwan.iqiyi.IqiYiAPI;
-import com.yeshi.buwan.iqiyi.entity.IqiyiAlbum;
-import com.yeshi.buwan.iqiyi.entity.IqiyiChannel;
-import com.yeshi.buwan.iqiyi.entity.IqiyiVideoInfo;
-import com.yeshi.buwan.iqiyi.entity.PlayControls;
-import com.yeshi.buwan.iqiyi.entity.VideoIqiyi;
+import com.yeshi.buwan.iqiyi.entity.*;
 import com.yeshi.buwan.log.LogHelper;
 import com.yeshi.buwan.service.imp.juhe.IqiyiService;
 import com.yeshi.buwan.util.JuheVideoUtil;
 import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.util.TimeUtil;
-
 import net.sf.json.JSONArray;
-import net.sf.json.JSONObject;
+import org.apache.log4j.Logger;
+import org.hibernate.HibernateException;
+import org.hibernate.Session;
+import org.springframework.orm.hibernate4.HibernateCallback;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.math.BigInteger;
+import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 @Component
 public class IqiyiUtil {
@@ -210,20 +192,6 @@
         return categoryId;
     }
 
-    // 鏇存柊鑱氬悎褰㈠紡鐨勪笓杈�
-    public void updateSourceAlbum() {
-        List<List<String>> list = iqiyiService.getSourceAlbumList();
-        for (int i = 0; i < list.size(); i++) {
-            Map<String, Object> map = IqiYiAPI.getAlbumList(list.get(i).get(1), list.get(i).get(0), 1, 1, -1);// addAlbum
-            int count = Integer.parseInt(map.get("count") + "");
-            for (int n = 1; n < count / 100 + 2; n++) {
-                map = IqiYiAPI.getAlbumList(list.get(i).get(1), list.get(i).get(0), n, 100, -1);
-                List<IqiyiAlbum> dataList = (List<IqiyiAlbum>) map.get("data");
-                if (dataList != null && dataList.size() > 0)
-                    addAlbum(dataList);
-            }
-        }
-    }
 
     // 鏇存柊鑱氬悎褰㈠紡鐨勪笓杈�
     public void updateSourceAlbum(String sourceId) {
@@ -250,50 +218,23 @@
         addAlbum(dataAllList);
     }
 
-    /**
-     * 鏇存柊鎵�鏈夌殑涓撹緫
-     */
-    public void updateAllAlbum() {
-        List<IqiyiChannel> chalList = IqiYiAPI.getChannelList();
-        for (int c = 0; c < chalList.size(); c++) {
-            final String channelId = chalList.get(c).getCategoryId();
-            new Timer().schedule(new TimerTask() {
-
-                @SuppressWarnings("unchecked")
-                @Override
-                public void run() {// 涓や釜灏忔椂鏇存柊涓�娆�
-                    long endt = System.currentTimeMillis();
-                    Map<String, Object> map = IqiYiAPI.updateAlbum(
-                            TimeUtil.getGernalTime(endt - 1000 * 60 * 150L, "yyyyMMddHHmmss"),
-                            TimeUtil.getGernalTime(endt, "yyyyMMddHHmmss"), null, 100, Integer.parseInt(channelId), 0);
-                    int count = Integer.parseInt(map.get("count") + "");
-                    List<IqiyiAlbum> list = (List<IqiyiAlbum>) map.get("data");
-                    addAlbum(list);
-                    list.clear();
-
-                    if (count > 100) {
-                        for (int i = 2; i < count / 100 + 2; i++) {
-                            map = IqiYiAPI.updateAlbum(
-                                    TimeUtil.getGernalTime(endt - 1000 * 60 * 60 * 3, "yyyyMMddHHmmss"),
-                                    TimeUtil.getGernalTime(endt, "yyyyMMddHHmmss"),
-                                    list.get(list.size() - 1).getAlbumId(), 100, Integer.parseInt(channelId), 0);
-                            list = (List<IqiyiAlbum>) map.get("data");
-                            addAlbum(list);
-                        }
-                    }
-                }
-            }, 0, 1000 * 60 * 60 * 2L);
-        }
-    }
-
     public void updateAll(final String key) {
         List<IqiyiChannel> chalList = IqiYiAPI.getChannelList();
         LogHelper.iqiyi("鏇存柊" + chalList.size() + "涓垎绫�");
         for (int c = 0; c < chalList.size(); c++) {
             final String channelId = chalList.get(c).getCategoryId();
             final IqiyiChannel channel = chalList.get(c);
-//			if (!channel.getCategoryId().equalsIgnoreCase("1"))
-//				continue;
+            //鎺掗櫎姝g墖鐨勬洿鏂�
+            boolean update = true;
+            String[] channelIds = new String[]{"1", "2", "4", "6"};
+            for (String cId : channelIds)
+                if (cId.equalsIgnoreCase(channelId)) {
+                    update = false;
+                    break;
+                }
+            if (!update)
+                break;
+
             LogHelper.iqiyi("鏇存柊" + channel.getCategoryName());
             new Timer().schedule(new TimerTask() {
 
@@ -1608,10 +1549,6 @@
 
     }
 
-    public String getHighVerPicture(String org) {
-        return org.replace(".jpg", "_260_360.jpg");
-    }
-
     @SuppressWarnings("rawtypes")
     public void updateIqiyiAvaiable() {
         iqiyiVideoInfoDao.excute(new HibernateCallback() {
@@ -1661,19 +1598,6 @@
 
     }
 
-    @SuppressWarnings("unchecked")
-    public List<IqiyiAlbum> getIqiyiAlbumByCatoryIdAndContentType(final int cid, final int ctype) {
-        return (List<IqiyiAlbum>) videoIqiyiDao.excute(new HibernateCallback<List<IqiyiAlbum>>() {
-
-            @Override
-            public List<IqiyiAlbum> doInHibernate(Session session) throws HibernateException {
-                return session
-                        .createQuery("from IqiyiAlbum a where a.categoryId=" + cid + " and a.contentType=" + ctype)
-                        .list();
-            }
-        });
-    }
-
     /**
      * 鏇存柊鍘熸潵灞炰簬鐖卞鑹篤IP鐨勮棰�
      */
@@ -1695,10 +1619,11 @@
         }
 
     }
+
     /**
      * 娣诲姞鐖卞鑹哄皬瑙嗛
      *
-     * @param aid
+     * @param albumId
      */
     public void addShortVideo(String albumId) {
         IqiyiAlbum album = IqiYiAPI.getAlbumDetail(albumId);
@@ -1714,8 +1639,10 @@
 
     }
 
+    //http://pic7.iqiyipic.com/image/20201029/c8/70/a_100417138_m_601_m12.jpg
+//http://pic7.iqiyipic.com/image/20201027/68/fb/v_154231741_m_601.jpg
     public static String getHPicture(String url) {
-        String regex = "_m[0-9]+\\.jpg";
+        String regex = "(_m[0-9]+\\.jpg)|(_m_[0-9]+\\.jpg)";
         Pattern p = Pattern.compile(regex);
         Matcher m = p.matcher(url);
         if (m.find()) {
@@ -1726,7 +1653,7 @@
     }
 
     public static String getVPicture(String url) {
-        String regex = "_m[0-9]+\\.jpg";
+        String regex = "(_m[0-9]+\\.jpg)|(_m_[0-9]+\\.jpg)";
         Pattern p = Pattern.compile(regex);
         Matcher m = p.matcher(url);
         if (m.find()) {

--
Gitblit v1.8.0