From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播

---
 src/main/java/com/yeshi/buwan/service/imp/juhe/IqiyiService.java |   43 +++++--------------------------------------
 1 files changed, 5 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/juhe/IqiyiService.java b/src/main/java/com/yeshi/buwan/service/imp/juhe/IqiyiService.java
index c2b125b..b0beb4b 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/juhe/IqiyiService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/juhe/IqiyiService.java
@@ -26,10 +26,10 @@
 import com.yeshi.buwan.domain.VideoResource;
 import com.yeshi.buwan.domain.VideoType;
 import com.yeshi.buwan.domain.push.VideoPushHistory;
-import com.yeshi.buwan.iqiyi.entity.IqiyiAlbum;
-import com.yeshi.buwan.iqiyi.entity.IqiyiVideoInfo;
-import com.yeshi.buwan.iqiyi.entity.VideoIqiyi;
-import com.yeshi.buwan.iqiyi.util.IqiyiUtil;
+import com.yeshi.buwan.videos.iqiyi.entity.IqiyiAlbum;
+import com.yeshi.buwan.videos.iqiyi.entity.IqiyiVideoInfo;
+import com.yeshi.buwan.videos.iqiyi.entity.VideoIqiyi;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil;
 import com.yeshi.buwan.log.LogHelper;
 import com.yeshi.buwan.service.imp.StatisticsService;
 import com.yeshi.buwan.service.imp.push.PushService;
@@ -53,37 +53,6 @@
 	@Resource
 	private ResourceVideoDao resourceVideoDao;
 
-	public PushService getPushService() {
-		return pushService;
-	}
-
-	public void setPushService(PushService pushService) {
-		this.pushService = pushService;
-	}
-
-	public StatisticsService getStatisticsService() {
-		return statisticsService;
-	}
-
-	public void setStatisticsService(StatisticsService statisticsService) {
-		this.statisticsService = statisticsService;
-	}
-
-	public VideoIqiyiDao getVideoIqiyiDao() {
-		return videoIqiyiDao;
-	}
-
-	public void setVideoIqiyiDao(VideoIqiyiDao videoIqiyiDao) {
-		this.videoIqiyiDao = videoIqiyiDao;
-	}
-
-	public IqiyiVideoInfoDao getIqiyiVideoInfoDao() {
-		return iqiyiVideoInfoDao;
-	}
-
-	public void setIqiyiVideoInfoDao(IqiyiVideoInfoDao iqiyiVideoInfoDao) {
-		this.iqiyiVideoInfoDao = iqiyiVideoInfoDao;
-	}
 
 	static {
 		// PropertyConfigurator.configure(".\\src\\log4j.properties");
@@ -154,7 +123,6 @@
 					logger.error("saveVideoInfo");
 					logger.error(e.getMessage());
 					e.printStackTrace();
-					if (session.getTransaction().isActive())
 						session.getTransaction().rollback();
 				}
 				return null;
@@ -420,7 +388,7 @@
 									list.get(0).getVideo().setTag(tag);
 									if (ilist != null && ilist.size() > 0) {
 										updateVideo = list.get(0).getVideo();
-										List<VideoDetailInfo> detailList = new ArrayList<VideoDetailInfo>();
+										List<VideoDetailInfo> detailList = new ArrayList<>();
 										detailList.add(convertVideoinfoToDetail(album, ilist.get(0)));
 										updateVideo.setVideoDetailList(detailList);
 									}
@@ -595,7 +563,6 @@
 				} catch (Exception e) {
 					logger.error("insertAlbumToVideoInfo");
 					logger.error(e.getMessage());
-					if (session.getTransaction().isActive())
 						session.getTransaction().rollback();
 					e.printStackTrace();
 				}

--
Gitblit v1.8.0