From ad3ac53da1c3a11a96ae62d790aa61a81b9eab91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 20 三月 2021 18:47:23 +0800
Subject: [PATCH] 完善APP首页顶部标签栏兼容，初步处理推送
---
src/main/java/com/yeshi/buwan/service/imp/juhe/FunTV2ServiceImpl.java | 26 +++++---------------------
1 files changed, 5 insertions(+), 21 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 acc2d64..d11fe9d 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
@@ -107,7 +107,7 @@
}
} else {//瑙嗛涓嶅瓨鍦�
//鍒ゆ柇2涓棰戝疄浣撴槸鍚︿负鍚屼竴瑙嗛
- VideoInfo oldVideo = videoInfoService.getExistSameVideo(newVideoInfo);
+ VideoInfo oldVideo = videoInfoService.getExistSameVideoWithTime(newVideoInfo);
if (oldVideo == null) {
//娣诲姞瑙嗛
Serializable id = videoInfoDao.save(newVideoInfo);
@@ -127,6 +127,7 @@
//鍔犲叆涓撹緫瑙嗛鏄犲皠
AlbumVideoMap map = new AlbumVideoMap();
+ map.setId(newVideoInfo.getId());
map.setCreateTime(new Date());
map.setVideoId(newVideoInfo.getId());
map.setRootVideoType(newVideoInfo.getVideoType().getId());
@@ -227,7 +228,7 @@
pu.setResource(vr);
pu.setAid(video2.getMediaId());
pu.setVid(video2.getId());
-
+ pu.setCode(video2.getCeCode());
if (t == FunTVUtil2.PLAY_NONE) {
pu.setUrl("");
} else {
@@ -257,25 +258,8 @@
VideoFunTV2 videoFunTV2 = videoFunTV2Dao.selectByMediaId(mediaId);
if (videoFunTV2 == null)
return;
-
- List<ResourceVideo> resourceVideoList = resourceVideoService.getResourceList(videoFunTV2.getVideoId() + "");
- for (int i = 0; i < resourceVideoList.size(); i++) {
- ResourceVideo rv = resourceVideoList.get(i);
- if (rv.getResource() != null && Integer.parseInt(rv.getResource().getId()) == FunTVUtil2.RESOURCE_ID) {
- //鍒犻櫎璧勬簮鏄犲皠
- resourceVideoService.delete(rv);
- resourceVideoList.remove(i);
- i--;
- }
- }
-
- if (resourceVideoList.size() == 0) {
- //闅愯棌瑙嗛
- videoInfoService.hiddenVideo(videoFunTV2.getVideoId() + "");
- //鏇存柊鎼滅储寮曟搸
- CMQManager.getInstance().addSolrMsg(videoFunTV2.getVideoId() + "");
- }
-
+ videoFunTV2Dao.deleteByVideoId(videoFunTV2.getVideoId());
+ resourceVideoService.delete(videoFunTV2.getVideoId()+"",FunTVUtil2.RESOURCE_ID+"");
//鍒犻櫎濯掍綋涓庡獟浣撳搴旂殑瑙嗛
funTVAlbum2Dao.delete(mediaId);
List<FunTVVideo2> video2List = listAllEpisodeList(mediaId);
--
Gitblit v1.8.0