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/PPTVServiceImpl.java |   43 +++++++++++++++++++++++++++++++++++++++----
 1 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/juhe/PPTVServiceImpl.java b/src/main/java/com/yeshi/buwan/service/imp/juhe/PPTVServiceImpl.java
index 79c066d..8dfeec4 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/juhe/PPTVServiceImpl.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/juhe/PPTVServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.yeshi.buwan.dao.VideoInfoDao;
 import com.yeshi.buwan.dao.VideoResourceMapExtraInfoDao;
+import com.yeshi.buwan.dao.VideoTypeDao;
 import com.yeshi.buwan.dao.juhe.pptv.PPTVProgramDao;
 import com.yeshi.buwan.dao.juhe.pptv.PPTVSeriesDao;
 import com.yeshi.buwan.dao.juhe.pptv.PPTVSeriesProgramMapDao;
@@ -9,7 +10,9 @@
 import com.yeshi.buwan.dao.video.AlbumVideoMapDao;
 import com.yeshi.buwan.domain.VideoInfo;
 import com.yeshi.buwan.domain.VideoResourceMapExtraInfo;
+import com.yeshi.buwan.domain.VideoType;
 import com.yeshi.buwan.domain.video.AlbumVideoMap;
+import com.yeshi.buwan.dto.mq.PPTVMQMsg;
 import com.yeshi.buwan.pptv.PPTVQuery;
 import com.yeshi.buwan.pptv.PPTVUtil;
 import com.yeshi.buwan.pptv.entity.PPTVProgram;
@@ -19,6 +22,7 @@
 import com.yeshi.buwan.service.imp.CategoryVideoService;
 import com.yeshi.buwan.service.imp.ResourceVideoService;
 import com.yeshi.buwan.service.imp.VideoInfoService;
+import com.yeshi.buwan.service.imp.VideoTypeService;
 import com.yeshi.buwan.service.inter.juhe.PPTVService;
 import com.yeshi.buwan.util.mq.CMQManager;
 import org.springframework.stereotype.Service;
@@ -49,6 +53,9 @@
     private CategoryVideoService categoryVideoService;
 
     @Resource
+    private VideoTypeService videoTypeService;
+
+    @Resource
     private VideoResourceMapExtraInfoDao videoResourceMapExtraInfoDao;
 
 
@@ -59,6 +66,11 @@
             return;
 
         VideoInfo newVideoInfo = PPTVUtil.convertToVideoInfo(series);
+        if (newVideoInfo == null)
+            return;
+//        if (newVideoInfo.getVideoType() != null) {
+//            newVideoInfo.setVideoType(videoTypeService.getVideoType(newVideoInfo.getVideoType().getId()));
+//        }
         VideoPPTVMap videoPPTV = videoPPTVMapDao.selectByInfoId(series.getInfoID());
         if (videoPPTV != null) {//娓犻亾瑙嗛宸茬粡瀛樺湪
             VideoInfo videoInfo = videoInfoService.getVideoInfo(videoPPTV.getVideoId() + "");
@@ -79,7 +91,7 @@
             }
         } else {//瑙嗛涓嶅瓨鍦�
             //鍒ゆ柇2涓棰戝疄浣撴槸鍚︿负鍚屼竴瑙嗛
-            VideoInfo oldVideo = videoInfoService.getExistSameVideo(newVideoInfo);
+            VideoInfo oldVideo = videoInfoService.getExistSameVideoWithDirector(newVideoInfo);
             if (oldVideo == null) {
                 //娣诲姞瑙嗛
                 Serializable id = videoInfoDao.save(newVideoInfo);
@@ -99,6 +111,7 @@
 
             //鍔犲叆涓撹緫瑙嗛鏄犲皠
             AlbumVideoMap map = new AlbumVideoMap();
+            map.setId(newVideoInfo.getId());
             map.setCreateTime(new Date());
             map.setVideoId(newVideoInfo.getId());
             map.setRootVideoType(newVideoInfo.getVideoType().getId());
@@ -139,7 +152,7 @@
         VideoPPTVMap map = videoPPTVMapDao.selectByInfoId(infoId);
         if (map == null)
             return;
-        videoPPTVMapDao.delete(map.getVideoId());
+        videoPPTVMapDao.deleteByPrimaryKey(map.getVideoId());
         resourceVideoService.delete(map.getVideoId() + "", PPTVUtil.RESOURCE_ID + "");
     }
 
@@ -201,7 +214,7 @@
                     series.setCreateTime(new Date());
                     pptvSeriesDao.save(series);
                     //澶勭悊鏂板/鏀瑰彉鐨勫墽闆嗕俊鎭�
-//                    CMQManager.getInstance().addPPTVSeriesUpdateMsg(new PPTVMQMsg(series.getInfoID(), PPTVMQMsg.TYPE_ADD_OR_UPDATE));
+                    CMQManager.getInstance().addPPTVSeriesUpdateMsg(new PPTVMQMsg(series.getInfoID(), PPTVMQMsg.TYPE_ADD_OR_UPDATE));
                 }
 
                 break;
@@ -222,7 +235,7 @@
 
         for (String id : infoIds) {
             //澶勭悊鍒犻櫎鐨勫墽闆嗕俊鎭�
-//            CMQManager.getInstance().addPPTVSeriesUpdateMsg(new PPTVMQMsg(id, PPTVMQMsg.TYPE_DELETE));
+            CMQManager.getInstance().addPPTVSeriesUpdateMsg(new PPTVMQMsg(id, PPTVMQMsg.TYPE_DELETE));
         }
 
 
@@ -237,6 +250,28 @@
         return getSeriesDetail(map.getInfoId());
     }
 
+    @Override
+    public PPTVProgram selectProgramById(String id) {
+        return pptvProgramDao.get(id);
+    }
+
+    @Override
+    public PPTVSeriesProgramMap selectMapByCode(String seriesCode, String programCode) {
+        PPTVQuery query = new PPTVQuery();
+        query.programCode = programCode;
+        query.seriesCode = seriesCode;
+        query.count = 1;
+        List<PPTVSeriesProgramMap> list = pptvSeriesProgramMapDao.list(query);
+        if (list == null || list.size() == 0)
+            return null;
+        return list.get(0);
+    }
+
+    @Override
+    public VideoPPTVMap selectVideoPPTVMapByInfoId(String infoId) {
+        return videoPPTVMapDao.selectByInfoId(infoId);
+    }
+
     /**
      * 鍒犻櫎鍓ч泦
      *

--
Gitblit v1.8.0