From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容

---
 src/main/java/com/yeshi/buwan/service/imp/juhe/FunTVService.java |   12 +++++++-----
 1 files changed, 7 insertions(+), 5 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 5300d01..757489f 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
@@ -155,7 +155,7 @@
                     // 鑾峰彇鏈�鏂颁竴闆嗙殑淇℃伅
                     List<FunTVVideo> plist = funTVVideoDao.listByAid(p.getAid(), "num", Sort.Direction.DESC, 0, 1);
                     if (plist.size() > 0) {
-                        List<VideoDetailInfo> detailList = new ArrayList<VideoDetailInfo>();
+                        List<VideoDetailInfo> detailList = new ArrayList<>();
                         detailList.add(FunTVUtil.convertFunTVVideoToVideoDetail(plist.get(0), p));
                         vi.setVideoDetailList(detailList);
                     }
@@ -309,7 +309,7 @@
 
         final VideoInfo info = FunTVUtil.convertFunTVAlbumToVideoInfo(p);
         // 绫诲瀷璁$畻
-        final List<Integer> typeList = new ArrayList<Integer>();
+        final List<Integer> typeList = new ArrayList<>();
 
         int type = FunTVUtil.getFunTVAlbumType(p);
         boolean exist = false;
@@ -386,7 +386,7 @@
                     return;
                 } else {// 闇�瑕佹柊鍔犲叆videoinfo
                     Serializable id = addVideoInfo(info, p);
-                    List<Integer> typeList = new ArrayList<Integer>();
+                    List<Integer> typeList = new ArrayList<>();
                     typeList = FunTVUtil.getShortVideoType(p, p.getCate(), p.getSubCate());
 
                     if (typeList == null || typeList.size() <= 0)
@@ -507,14 +507,14 @@
                 return detailList;
             } else if (vft.getVid() != null) {// 鍗曚釜瑙嗛
                 FunTVVideo pv = funTVVideoDao.get(vft.getVid());
-                List<VideoDetailInfo> detailList = new ArrayList<VideoDetailInfo>();
+                List<VideoDetailInfo> detailList = new ArrayList<>();
                 VideoDetailInfo detail = new VideoDetailInfo();
                 detail.setId(Long.parseLong(pv.getVid()));
                 detail.setExtraId(pv.getId() + "");
                 detail.setName(pv.getTitle());
                 detail.setTag(pv.getDesc());
                 detail.setType("funtvvideo");
-                List<VideoUrl> urlList = new ArrayList<VideoUrl>();
+                List<VideoUrl> urlList = new ArrayList<>();
                 VideoUrl vu = new VideoUrl();
                 vu.setAdmin(null);
                 vu.setBaseUrl(pv.getPlayUrl());
@@ -526,6 +526,8 @@
                 detailList.add(detail);
                 return detailList;
             }
+        }else{//鍒犻櫎鏉ユ簮
+            resourceVideoService.delete(videoid,FunTVUtil.RESOURCE_ID+"");
         }
 
         return null;

--
Gitblit v1.8.0