From 2a593ddac16e06f1ff55edca22ea568f07b068ba Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 四月 2021 19:15:18 +0800
Subject: [PATCH] 3.9.0bug修改

---
 src/main/java/com/yeshi/buwan/service/imp/juhe/PPTVServiceImpl.java |   38 ++++++++++++++++++++++++++++++++++----
 1 files changed, 34 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 3dfc8f4..4354cd5 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,6 +10,7 @@
 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;
@@ -20,8 +22,11 @@
 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.data.mongodb.core.query.Criteria;
+import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -50,6 +55,9 @@
     private CategoryVideoService categoryVideoService;
 
     @Resource
+    private VideoTypeService videoTypeService;
+
+    @Resource
     private VideoResourceMapExtraInfoDao videoResourceMapExtraInfoDao;
 
 
@@ -60,6 +68,13 @@
             return;
 
         VideoInfo newVideoInfo = PPTVUtil.convertToVideoInfo(series);
+        if (newVideoInfo == null)
+            return;
+
+        VideoType videoType = videoTypeService.getVideoType(newVideoInfo.getVideoType().getId());
+        if (videoType.getParent() != null)
+            newVideoInfo.setVideoType(videoType.getParent());
+
         VideoPPTVMap videoPPTV = videoPPTVMapDao.selectByInfoId(series.getInfoID());
         if (videoPPTV != null) {//娓犻亾瑙嗛宸茬粡瀛樺湪
             VideoInfo videoInfo = videoInfoService.getVideoInfo(videoPPTV.getVideoId() + "");
@@ -100,6 +115,7 @@
 
             //鍔犲叆涓撹緫瑙嗛鏄犲皠
             AlbumVideoMap map = new AlbumVideoMap();
+            map.setId(newVideoInfo.getId());
             map.setCreateTime(new Date());
             map.setVideoId(newVideoInfo.getId());
             map.setRootVideoType(newVideoInfo.getVideoType().getId());
@@ -130,7 +146,7 @@
         //娣诲姞瑙嗛鏉ユ簮鏄犲皠
         resourceVideoService.addVideoResource(newVideoInfo.getId(), PPTVUtil.RESOURCE_ID + "");
         //娣诲姞瑙嗛鍒嗙被鏄犲皠
-        categoryVideoService.addCategoryVideo(newVideoInfo.getId(), newVideoInfo.getVideoType().getId());
+        categoryVideoService.addCategoryVideo(newVideoInfo.getId(), videoType.getId());
         CMQManager.getInstance().addSolrMsg(newVideoInfo.getId());
     }
 
@@ -183,7 +199,11 @@
     @Override
     public void save(List<PPTVSeries> seriesList) {
         for (PPTVSeries series : seriesList) {
-            save(series);
+            try {
+                save(series);
+            } catch (Exception e) {
+
+            }
         }
     }
 
@@ -205,9 +225,12 @@
                     CMQManager.getInstance().addPPTVSeriesUpdateMsg(new PPTVMQMsg(series.getInfoID(), PPTVMQMsg.TYPE_ADD_OR_UPDATE));
                 }
 
+                System.out.println("addorupdate:" + series.getName());
+
                 break;
             //鍒犻櫎
             case "del":
+                System.out.println("delete:" + series.getName());
                 deleteSeries(series);
                 infoIds.add(series.getInfoID());
                 break;
@@ -260,6 +283,13 @@
         return videoPPTVMapDao.selectByInfoId(infoId);
     }
 
+    @Override
+    public PPTVSeries selectSeriesBySeriesCode(String cid) {
+        Query query = new Query();
+        query.addCriteria(new Criteria().where("seriesCode").is(cid));
+        return pptvSeriesDao.findOne(query);
+    }
+
     /**
      * 鍒犻櫎鍓ч泦
      *
@@ -269,7 +299,7 @@
         PPTVQuery query = new PPTVQuery();
         query.seriesCode = series.getSeriesCode();
         Set<String> seriesCodeSet = deleteMap(query);
-        pptvSeriesDao.delete(series.getInfoID());
+        pptvSeriesDao.deleteByPrimaryKey(series.getInfoID());
     }
 
 
@@ -308,7 +338,7 @@
         PPTVQuery query = new PPTVQuery();
         query.programCode = program.getProgramCode();
         Set<String> infoIdSet = deleteMap(query);
-        pptvProgramDao.delete(program.getProgramCode());
+        pptvProgramDao.deleteByPrimaryKey(program.getProgramCode());
         return infoIdSet;
     }
 

--
Gitblit v1.8.0