From d7a3014c38dbb1061cba70e7dbb49d58831e6399 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 08 四月 2021 19:05:52 +0800
Subject: [PATCH] PPTV解析优化

---
 src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java |   63 +++++++++++++++++++++++++------
 1 files changed, 50 insertions(+), 13 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java b/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
index 13a8ddf..cef5cd4 100644
--- a/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
+++ b/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
@@ -1,18 +1,38 @@
 package com.yeshi.buwan.vo.video;
 
-import com.yeshi.buwan.domain.SolrVideo;
+import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
 import com.yeshi.buwan.domain.VideoInfo;
 import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.util.TimeUtil;
+import com.yeshi.buwan.util.video.VideoConstant;
 
 public class VideoAdminInfoVO {
 
     private String id;
     private String name;
-    private String picture;
+    private String hpicture;
+    private String vpicture;
     private String updatetime;
     private String show;
     private String tag;
+    private Integer freeType;
+    private String area;
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+    public Integer getFreeType() {
+        return freeType;
+    }
+
+    public void setFreeType(Integer freeType) {
+        this.freeType = freeType;
+    }
 
     public void setShow(String show) {
         this.show = show;
@@ -34,7 +54,12 @@
         VideoAdminInfoVO vo = new VideoAdminInfoVO();
         vo.setId(video.getId());
         vo.setName(video.getName());
-        vo.setPicture(video.getHpicture());
+        if (video.getVideoType() != null && VideoConstant.isMainCategory(video.getVideoType().getId()))
+            vo.setVpicture(video.getVpicture());
+        else
+            vo.setHpicture(video.getHpicture());
+
+
         vo.setShow(video.getShow() + "");
         vo.setUpdatetime(TimeUtil.getGernalTime(
                 Long.parseLong(
@@ -45,17 +70,22 @@
     }
 
 
-    public static VideoAdminInfoVO create(SolrVideo solrVideo) {
+    public static VideoAdminInfoVO create(SolrAlbumVideo solrVideo) {
         VideoAdminInfoVO vo = new VideoAdminInfoVO();
         vo.setId(solrVideo.getId());
         vo.setName(solrVideo.getName());
-        vo.setPicture(solrVideo.getHpicture());
+        if (VideoConstant.isMainCategory(solrVideo.getRootVideoType()))
+            vo.setVpicture(solrVideo.getPicture());
+        else
+            vo.setHpicture(solrVideo.getHpicture());
         vo.setShow(solrVideo.getShow() + "");
         vo.setUpdatetime(TimeUtil.getGernalTime(
                 Long.parseLong(
                         StringUtil.isNullOrEmpty(solrVideo.getUpdatetime() + "") ? "0" : solrVideo.getUpdatetime() + ""),
                 "yyyy-MM-dd"));
         vo.setTag(solrVideo.getTag());
+        vo.setFreeType(solrVideo.getFreeType());
+        vo.setArea(solrVideo.getArea());
         return vo;
     }
 
@@ -75,14 +105,6 @@
         this.name = name;
     }
 
-    public String getPicture() {
-        return picture;
-    }
-
-    public void setPicture(String picture) {
-        this.picture = picture;
-    }
-
     public String getUpdatetime() {
         return updatetime;
     }
@@ -91,4 +113,19 @@
         this.updatetime = updatetime;
     }
 
+    public String getHpicture() {
+        return hpicture;
+    }
+
+    public void setHpicture(String hpicture) {
+        this.hpicture = hpicture;
+    }
+
+    public String getVpicture() {
+        return vpicture;
+    }
+
+    public void setVpicture(String vpicture) {
+        this.vpicture = vpicture;
+    }
 }

--
Gitblit v1.8.0