From f537abe9f3646c739beaf15076246a2f71a347e9 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 20 二月 2025 16:57:55 +0800
Subject: [PATCH] IOS广告增加区域屏蔽
---
src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java | 135 +++++++++++++++++++++++++++++++++++++++++----
1 files changed, 123 insertions(+), 12 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 99f36d3..e5b3da7 100644
--- a/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
+++ b/src/main/java/com/yeshi/buwan/vo/video/VideoAdminInfoVO.java
@@ -2,18 +2,37 @@
import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
import com.yeshi.buwan.domain.VideoInfo;
+import com.yeshi.buwan.domain.solr.SolrShortVideo;
+import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.TimeUtil;
+import com.yeshi.buwan.util.video.VideoConstant;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
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;
+ private List<String> resourceList;
+ private String createTime;
+
+ public String getArea() {
+ return area;
+ }
+
+ public void setArea(String area) {
+ this.area = area;
+ }
public Integer getFreeType() {
return freeType;
@@ -43,22 +62,28 @@
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(
StringUtil.isNullOrEmpty(video.getCreatetime() + "") ? "0" : video.getCreatetime() + ""),
"yyyy-MM-dd"));
vo.setTag(video.getTag());
+ vo.setCreateTime(TimeUtil.getGernalTime(video.getCreatetime(), "yyyy-MM-dd"));
return vo;
}
- public static VideoAdminInfoVO create(SolrAlbumVideo solrVideo) {
+ public static VideoAdminInfoVO create(SolrAlbumVideo solrVideo, Map<Long, String> resourceNameMap) {
VideoAdminInfoVO vo = new VideoAdminInfoVO();
vo.setId(solrVideo.getId());
vo.setName(solrVideo.getName());
- vo.setPicture(solrVideo.getHpicture());
+ vo.setVpicture(solrVideo.getVpicture());
vo.setShow(solrVideo.getShow() + "");
vo.setUpdatetime(TimeUtil.getGernalTime(
Long.parseLong(
@@ -66,8 +91,71 @@
"yyyy-MM-dd"));
vo.setTag(solrVideo.getTag());
vo.setFreeType(solrVideo.getFreeType());
+ vo.setArea(solrVideo.getArea());
+ vo.setHpicture(solrVideo.getHpicture());
+ List<String> resources = new ArrayList<>();
+ if (solrVideo.getResourceIds() != null) {
+ String[] rids = solrVideo.getResourceIds().split(",");
+ for (String rid : rids) {
+ resources.add(resourceNameMap.get(Long.parseLong(rid)));
+ }
+ }
+ vo.setResourceList(resources);
+ vo.setCreateTime(TimeUtil.getGernalTime(Long.parseLong(solrVideo.getCreatetime()), "yyyy-MM-dd"));
return vo;
}
+
+
+ public static VideoAdminInfoVO create(InternetSearchVideo solrVideo, Map<Long, String> resourceNameMap) {
+ VideoAdminInfoVO vo = new VideoAdminInfoVO();
+ vo.setId(solrVideo.getId());
+ vo.setName(solrVideo.getName());
+ vo.setVpicture(solrVideo.getVpicture());
+ vo.setShow(true + "");
+ vo.setUpdatetime(TimeUtil.getGernalTime(
+ Long.parseLong(
+ StringUtil.isNullOrEmpty(solrVideo.getUpdateTime().getTime() + "") ? "0" : solrVideo.getUpdateTime().getTime() + ""),
+ "yyyy-MM-dd"));
+ vo.setTag(solrVideo.getTag());
+ vo.setFreeType(0);
+ vo.setArea(solrVideo.getArea());
+ vo.setHpicture(solrVideo.getHpicture());
+ List<String> resources = new ArrayList<>();
+ if (solrVideo.getResourceIds() != null) {
+ String[] rids = solrVideo.getResourceIds().split(",");
+ for (String rid : rids) {
+ resources.add(resourceNameMap.get(Long.parseLong(rid)));
+ }
+ }
+ vo.setResourceList(resources);
+ if (solrVideo.getCreateTime() != null)
+ vo.setCreateTime(TimeUtil.getGernalTime(solrVideo.getCreateTime().getTime(), "yyyy-MM-dd"));
+ else
+ vo.setCreateTime(TimeUtil.getGernalTime(solrVideo.getUpdateTime().getTime(), "yyyy-MM-dd"));
+ return vo;
+ }
+
+
+ public static VideoAdminInfoVO create(SolrShortVideo solrVideo, Map<Long, String> resourceNameMap) {
+ VideoAdminInfoVO vo = new VideoAdminInfoVO();
+ vo.setId(solrVideo.getId());
+ vo.setName(solrVideo.getName());
+ vo.setShow(true + "");
+ vo.setUpdatetime(TimeUtil.getGernalTime(solrVideo.getLocalUpdateTime(),
+ "yyyy-MM-dd"));
+ vo.setTag(solrVideo.getTag());
+ vo.setFreeType(0);
+ vo.setArea(solrVideo.getArea());
+ vo.setHpicture(solrVideo.getPicture());
+ List<String> resources = new ArrayList<>();
+ if (solrVideo.getResourceId() != null) {
+ resources.add(resourceNameMap.get(Long.parseLong(solrVideo.getResourceId() + "")));
+ }
+ vo.setResourceList(resources);
+ vo.setCreateTime(TimeUtil.getGernalTime(solrVideo.getThirdUpdateTime(), "yyyy-MM-dd"));
+ return vo;
+ }
+
public String getId() {
return id;
@@ -85,14 +173,6 @@
this.name = name;
}
- public String getPicture() {
- return picture;
- }
-
- public void setPicture(String picture) {
- this.picture = picture;
- }
-
public String getUpdatetime() {
return updatetime;
}
@@ -101,4 +181,35 @@
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;
+ }
+
+ public List<String> getResourceList() {
+ return resourceList;
+ }
+
+ public void setResourceList(List<String> resourceList) {
+ this.resourceList = resourceList;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
}
--
Gitblit v1.8.0