From 2778cf2a16823f9b1153a0549b47f7b503176a17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 九月 2020 18:04:43 +0800
Subject: [PATCH] 爱奇艺正片,搜索引擎

---
 src/main/java/com/yeshi/buwan/service/imp/juhe/FunTVService.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTVService.java b/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTVService.java
index 57996cd..6c4217f 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTVService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/juhe/FunTVService.java
@@ -37,6 +37,7 @@
 
     @Resource
     private FunTVVideoDao funTVVideoDao;
+
     @Resource
     private FunTVAlbumDao funTVAlbumDao;
     @Resource
@@ -469,26 +470,36 @@
         if (list != null && list.size() > 0) {
             final VideoFunTV vft = list.get(0);
             if (vft != null && vft.getAid() != null) {// 鎸夎妭鐩煡鎵捐棰�
-                FunTVAlbum album = funTVAlbumDao.get(vft.getAid());
-                List<FunTVVideo> videoList = funTVVideoDao.listByAid(album.getAid(), "num", Sort.Direction.ASC, 0, 1000);
+                String aid = vft.getAid();
+                FunTVAlbum album = funTVAlbumDao.get(aid);
+
+                List<FunTVVideo> videoList = funTVVideoDao.listByAid(aid, "num", Sort.Direction.ASC, 0, 1000);
+                if (album == null && videoList.size() > 0) {//澶勭悊鐢靛奖
+                    album = new FunTVAlbum();
+                    album.setTitle(videoList.get(0).getTitle());
+                    album.setVideoType(videoList.get(0).getCate());
+                }
+
+                final String type=album.getVideoType();
                 Comparator<FunTVVideo> cp = new Comparator<FunTVVideo>() {
                     public int compare(FunTVVideo o1, FunTVVideo o2) {
 
                         long t1 = o1.getNum();
                         long t2 = o2.getNum();
-                        if (album.getVideoType().contains("鐢靛奖")) {
+                        if (type.contains("鐢靛奖")) {
                             return (int) (t2 - t1);
-                        } else if (album.getVideoType().contains("鐢佃鍓�")) {
+                        } else if (type.contains("鐢佃鍓�")) {
                             return (int) (t1 - t2);
-                        } else if (album.getVideoType().contains("缁艰壓")) {
+                        } else if (type.contains("缁艰壓")) {
                             return (int) (t2 - t1);
-                        } else if (album.getVideoType().contains("鍔ㄦ极")) {
+                        } else if (type.contains("鍔ㄦ极")) {
                             return (int) (t1 - t2);
                         } else
                             return (int) (t2 - t1);
                     }
                 };
-                Collections.sort(videoList, cp);
+                if (videoList.size() > 0)
+                    Collections.sort(videoList, cp);
 
                 List<VideoDetailInfo> detailList = new ArrayList<>();
                 for (FunTVVideo pv : videoList)

--
Gitblit v1.8.0