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/domain/VideoInfo.java |  854 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 465 insertions(+), 389 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/domain/VideoInfo.java b/src/main/java/com/yeshi/buwan/domain/VideoInfo.java
index 99e22ab..ace27f1 100644
--- a/src/main/java/com/yeshi/buwan/domain/VideoInfo.java
+++ b/src/main/java/com/yeshi/buwan/domain/VideoInfo.java
@@ -10,523 +10,599 @@
 import javax.persistence.Transient;
 
 import com.google.gson.annotations.Expose;
+import org.springframework.data.annotation.Id;
 
 /**
  * 瑙嗛淇℃伅
- * 
+ *
  * @author Administrator
- * 
  */
 @Entity
 public class VideoInfo implements Serializable, Comparable {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+    //0-鍏嶈垂  1-VIP  2-鐢ㄥ埜
+    //鍏嶈垂
+    public final static int FREE_TYPE_FREE = 0;
+    //VIP
+    public final static int FREE_TYPE_VIP = 1;
+    //鐢ㄥ埜
+    public final static int FREE_TYPE_COUPON = 2;
 
-	@Expose
-	// @Field
-	private String id;
 
-	@Expose
-	// @Field
-	private String picture;
+    /**
+     *
+     */
+    private static final long serialVersionUID = 1L;
 
-	@Expose
-	// @Field
-	private String name;
+    @Id
+    @Expose
+    private String id;
 
-	@Expose
-	private String introduction;
-	@Expose
-	private String duration;
+    @Expose
+    private String tag;
 
-	@Expose
-	// @Field
-	private String mainActor;
-	@Expose
-	private String year;
-	@Expose
-	private VideoType videoType;
-	private String orderby;
-	@Expose
-	private String thirdType = "0";
+    private String totalNumber;// 鎵�鏈夐泦鏁�
 
-	private AdminInfo admin;
-	@Expose
-	private String beizhu;
-	@Expose
-	private String qulity;
-	@Expose
-	private long createtime;
+    @Expose
+    private Long createtime;
 
-	@Expose
-	// @Field
-	private String score;
-	@Expose
-	private String watchCount;
-	private String show;
-	@Expose
-	private String nowNumber;// 鏇存柊鍒颁簡绗嚑闆�
-	@Expose
-	private String finish;// 鏄惁鏇存柊瀹屼簡锛�0-娌℃湁 1-鏇存柊瀹屼簡
-	private String baseurl;// 涓撹緫鐨勫湴鍧�c
+    private String updatetime;
 
-	@Expose
-	// @Field
-	private String share;// 鏄惁蹇呴』鍒嗕韩
-	private String totalNumber;// 鎵�鏈夐泦鏁�
+    @Expose
+    private String picture;
 
-	@Expose
-	// @Field
-	private String tag;
+    @Expose
+    private String name;
 
-	@Expose
-	// @Field
-	private boolean canSave;// 0-涓嶈兘缂撳瓨 1-鑳界紦瀛�
-	@Expose
-	private String area;// 鍦板尯
+    @Expose
+    private String introduction;
+    @Expose
+    private String duration;
 
-	@Expose
-	private int commentCount;
+    @Expose
+    private String mainActor;
+    @Expose
+    private String year;
+    @Expose
+    private String beizhu;
+    @Expose
+    private String qulity;
+    @Expose
+    private String score;
+    @Expose
+    private String share;// 鏄惁蹇呴』鍒嗕韩
 
-	// @Field
-	private String updatetime;
-	private String month;
-	private String day;
+    private String show;
+    @Expose
+    private String watchCount;
+    private String orderby;
+    @Expose
+    private String nowNumber;// 鏇存柊鍒颁簡绗嚑闆�
+    @Expose
+    private String finish;// 鏄惁鏇存柊瀹屼簡锛�0-娌℃湁 1-鏇存柊瀹屼簡
+    private String baseurl;// 涓撹緫鐨勫湴鍧�c
+    private String month;
+    private String day;
+    @Expose
+    private String area;// 鍦板尯
+    private String focus;// 鐪嬬偣
+    private String leafctgs;
+    private String director;
+    private String keyword;
+    @Expose
+    private String vpicture;
+    @Expose
+    private String hpicture;
+    private String latestVpicture;
+    private String latestHpicture;
+    // 鍐呭绫诲瀷
+    private Integer contentType;
+    @Expose
+    private Boolean canSave;// 0-涓嶈兘缂撳瓨 1-鑳界紦瀛�
+    private AdminInfo admin;
+    @Expose
+    private VideoType videoType;
+    @Expose
+    private Integer commentCount;
+    private Integer latestWatchCount;
+    private Integer videocount;
 
-	@Expose
-	private List<VideoResource> resourceList;
-	private List<VideoType> typeList;
 
-	private String focus;// 鐪嬬偣
-	private String leafctgs;
+    //闈炴暟鎹簱缂撳瓨鏁版嵁
+    @Expose
+    private String thirdType = "0";
+    @Expose
+    private List<VideoResource> resourceList;
+    private List<VideoType> typeList;
+    @Expose
+    private int showType;// 1-闀挎潯 2-鐭潯
+    @Expose
+    private String playPicture;
+    //0-鍏嶈垂  1-VIP  2-鐢ㄥ埜
+    //鍏嶈垂绫诲瀷
+    @Expose
+    @Transient
+    private int free;
 
-	private String keyword;
 
-	// 鍐呭绫诲瀷
-	private int contentType;
-	@Expose
-	private int showType;// 1-闀挎潯 2-鐭潯
+    //0-鏅竻 1-楂樻竻
+    @Expose
+    @Transient
+    private int definition;
 
-	@Expose
-	private String playPicture;
+    //鎼滅储缁撴灉閫傜敤
+    @Expose
+    private VideoAlbumMoreInfo albumMoreInfo;
 
-	@Expose
-	private String vpicture;
-	@Expose
-	private String hpicture;
+    //鍓ч泦缈婚〉鏃舵瘡涓�椤电殑澶у皬
+    @Expose
+    private Integer pageSize;
 
-	private String latestVpicture;
-	private String latestHpicture;
 
-	private int latestWatchCount;
-	private int videocount;
+    public Integer getPageSize() {
+        return pageSize;
+    }
 
-	@Transient
-	private VideoResourceMapExtraInfo videoResourceMapExtraInfo;
+    public void setPageSize(Integer pageSize) {
+        this.pageSize = pageSize;
+    }
 
+    @Transient
+    private VideoResourceMapExtraInfo videoResourceMapExtraInfo;
 
-	public VideoResourceMapExtraInfo getVideoResourceMapExtraInfo() {
-		return videoResourceMapExtraInfo;
-	}
 
-	public void setVideoResourceMapExtraInfo(VideoResourceMapExtraInfo videoResourceMapExtraInfo) {
-		this.videoResourceMapExtraInfo = videoResourceMapExtraInfo;
-	}
+    public VideoResourceMapExtraInfo getVideoResourceMapExtraInfo() {
+        return videoResourceMapExtraInfo;
+    }
 
-	public int getVideocount() {
-		return videocount;
-	}
+    public void setVideoResourceMapExtraInfo(VideoResourceMapExtraInfo videoResourceMapExtraInfo) {
+        this.videoResourceMapExtraInfo = videoResourceMapExtraInfo;
+    }
 
-	public void setVideocount(int videocount) {
-		this.videocount = videocount;
-	}
+    public VideoAlbumMoreInfo getAlbumMoreInfo() {
+        return albumMoreInfo;
+    }
 
-	public int getLatestWatchCount() {
-		return latestWatchCount;
-	}
+    public void setAlbumMoreInfo(VideoAlbumMoreInfo albumMoreInfo) {
+        this.albumMoreInfo = albumMoreInfo;
+    }
 
-	public void setLatestWatchCount(int latestWatchCount) {
-		this.latestWatchCount = latestWatchCount;
-	}
+    public Integer getVideocount() {
+        return videocount;
+    }
 
-	public String getLatestVpicture() {
-		return latestVpicture;
-	}
+    public void setVideocount(Integer videocount) {
+        this.videocount = videocount;
+    }
 
-	public void setLatestVpicture(String latestVpicture) {
-		this.latestVpicture = latestVpicture;
-	}
+    public Integer getLatestWatchCount() {
+        return latestWatchCount;
+    }
 
-	public String getLatestHpicture() {
-		return latestHpicture;
-	}
+    public void setLatestWatchCount(Integer latestWatchCount) {
+        this.latestWatchCount = latestWatchCount;
+    }
 
-	public void setLatestHpicture(String latestHpicture) {
-		this.latestHpicture = latestHpicture;
-	}
+    public String getLatestVpicture() {
+        return latestVpicture;
+    }
 
-	public String getVpicture() {
-		return vpicture;
-	}
+    public void setLatestVpicture(String latestVpicture) {
+        this.latestVpicture = latestVpicture;
+    }
 
-	public void setVpicture(String vpicture) {
-		this.vpicture = vpicture;
-	}
+    public String getLatestHpicture() {
+        return latestHpicture;
+    }
 
-	public String getHpicture() {
-		return hpicture;
-	}
+    public void setLatestHpicture(String latestHpicture) {
+        this.latestHpicture = latestHpicture;
+    }
 
-	public void setHpicture(String hpicture) {
-		this.hpicture = hpicture;
-	}
+    public String getVpicture() {
+        return vpicture;
+    }
 
-	public String getPlayPicture() {
-		return playPicture;
-	}
+    public void setVpicture(String vpicture) {
+        this.vpicture = vpicture;
+    }
 
-	public void setPlayPicture(String playPicture) {
-		this.playPicture = playPicture;
-	}
+    public String getHpicture() {
+        return hpicture;
+    }
 
-	public int getShowType() {
-		return showType;
-	}
+    public void setHpicture(String hpicture) {
+        this.hpicture = hpicture;
+    }
 
-	public void setShowType(int showType) {
-		this.showType = showType;
-	}
+    public String getPlayPicture() {
+        return playPicture;
+    }
 
-	public int getContentType() {
-		return contentType;
-	}
+    public void setPlayPicture(String playPicture) {
+        this.playPicture = playPicture;
+    }
 
-	public void setContentType(int contentType) {
-		this.contentType = contentType;
-	}
+    public int getShowType() {
+        return showType;
+    }
 
-	public String getKeyword() {
-		return keyword;
-	}
+    public void setShowType(int showType) {
+        this.showType = showType;
+    }
 
-	public void setKeyword(String keyword) {
-		this.keyword = keyword;
-	}
+    public Integer getContentType() {
+        return contentType;
+    }
 
-	public String getFocus() {
-		return focus;
-	}
+    public void setContentType(Integer contentType) {
+        this.contentType = contentType;
+    }
 
-	public void setFocus(String focus) {
-		this.focus = focus;
-	}
+    public String getKeyword() {
+        return keyword;
+    }
 
-	public String getLeafctgs() {
-		return leafctgs;
-	}
+    public void setKeyword(String keyword) {
+        this.keyword = keyword;
+    }
 
-	public void setLeafctgs(String leafctgs) {
-		this.leafctgs = leafctgs;
-	}
+    public String getFocus() {
+        return focus;
+    }
 
-	public List<VideoResource> getResourceList() {
-		return resourceList;
-	}
+    public void setFocus(String focus) {
+        this.focus = focus;
+    }
 
-	public void setResourceList(List<VideoResource> resourceList) {
-		this.resourceList = resourceList;
-	}
+    public String getLeafctgs() {
+        return leafctgs;
+    }
 
-	public List<VideoType> getTypeList() {
-		return typeList;
-	}
+    public void setLeafctgs(String leafctgs) {
+        this.leafctgs = leafctgs;
+    }
 
-	public void setTypeList(List<VideoType> typeList) {
-		this.typeList = typeList;
-	}
+    public List<VideoResource> getResourceList() {
+        return resourceList;
+    }
+
+    public void setResourceList(List<VideoResource> resourceList) {
+        this.resourceList = resourceList;
+    }
+
+    public List<VideoType> getTypeList() {
+        return typeList;
+    }
+
+    public void setTypeList(List<VideoType> typeList) {
+        this.typeList = typeList;
+    }
+
+    public Integer getCommentCount() {
+        return commentCount;
+    }
+
+    public void setCommentCount(Integer commentCount) {
+        this.commentCount = commentCount;
+    }
+
+    public String getArea() {
+        return area;
+    }
+
+    public void setArea(String area) {
+        this.area = area;
+    }
+
+
+    public String getDirector() {
+        return director;
+    }
+
+    public void setDirector(String director) {
+        this.director = director;
+    }
+
+    public String getMonth() {
+        return month;
+    }
+
+    public void setMonth(String month) {
+        this.month = month;
+    }
+
+    public String getDay() {
+        return day;
+    }
+
+    public void setDay(String day) {
+        this.day = day;
+    }
+
+    public String getUpdatetime() {
+        return updatetime;
+    }
+
+    public void setUpdatetime(String updatetime) {
+        this.updatetime = updatetime;
+    }
 
-	public int getCommentCount() {
-		return commentCount;
-	}
+    public static long getSerialversionuid() {
+        return serialVersionUID;
+    }
 
-	public void setCommentCount(int commentCount) {
-		this.commentCount = commentCount;
-	}
 
-	public String getArea() {
-		return area;
-	}
+    public Boolean getCanSave() {
+        return canSave;
+    }
 
-	public void setArea(String area) {
-		this.area = area;
-	}
+    public void setCanSave(Boolean canSave) {
+        this.canSave = canSave;
+    }
 
-	private String director;
+    public String getTag() {
+        return tag;
+    }
 
-	public String getDirector() {
-		return director;
-	}
+    public void setTag(String tag) {
+        this.tag = tag;
+    }
 
-	public void setDirector(String director) {
-		this.director = director;
-	}
+    public String getTotalNumber() {
+        return totalNumber;
+    }
 
-	public String getMonth() {
-		return month;
-	}
+    public void setTotalNumber(String totalNumber) {
+        this.totalNumber = totalNumber;
+    }
 
-	public void setMonth(String month) {
-		this.month = month;
-	}
+    public String getShare() {
+        return share;
+    }
 
-	public String getDay() {
-		return day;
-	}
+    public void setShare(String share) {
+        this.share = share;
+    }
 
-	public void setDay(String day) {
-		this.day = day;
-	}
+    public VideoInfo() {
+    }
 
-	public String getUpdatetime() {
-		return updatetime;
-	}
+    public VideoInfo(String id) {
+        this.id = id;
+    }
 
-	public void setUpdatetime(String updatetime) {
-		this.updatetime = updatetime;
-	}
+    public String getBaseurl() {
+        return baseurl;
+    }
 
-	public static long getSerialversionuid() {
-		return serialVersionUID;
-	}
+    public void setBaseurl(String baseurl) {
+        this.baseurl = baseurl;
+    }
 
-	public boolean isCanSave() {
-		return canSave;
-	}
+    public String getNowNumber() {
+        return nowNumber;
+    }
 
-	public void setCanSave(boolean canSave) {
-		this.canSave = canSave;
-	}
+    public void setNowNumber(String nowNumber) {
+        this.nowNumber = nowNumber;
+    }
 
-	public String getTag() {
-		return tag;
-	}
+    public String getFinish() {
+        return finish;
+    }
 
-	public void setTag(String tag) {
-		this.tag = tag;
-	}
+    public void setFinish(String finish) {
+        this.finish = finish;
+    }
 
-	public String getTotalNumber() {
-		return totalNumber;
-	}
+    public String getId() {
+        return id;
+    }
 
-	public void setTotalNumber(String totalNumber) {
-		this.totalNumber = totalNumber;
-	}
+    public void setId(String id) {
+        this.id = id;
+    }
 
-	public String getShare() {
-		return share;
-	}
+    public String getThirdType() {
+        return thirdType;
+    }
 
-	public void setShare(String share) {
-		this.share = share;
-	}
+    public void setThirdType(String thirdType) {
+        this.thirdType = thirdType;
+    }
 
-	public VideoInfo() {
-	}
+    public String getOrderby() {
+        return orderby;
+    }
 
-	public VideoInfo(String id) {
-		this.id = id;
-	}
+    public void setOrderby(String orderby) {
+        this.orderby = orderby;
+    }
 
-	public String getBaseurl() {
-		return baseurl;
-	}
+    public String getMainActor() {
+        return mainActor;
+    }
 
-	public void setBaseurl(String baseurl) {
-		this.baseurl = baseurl;
-	}
+    public void setMainActor(String mainActor) {
+        this.mainActor = mainActor;
+    }
 
-	public String getNowNumber() {
-		return nowNumber;
-	}
+    @ManyToOne
+    public VideoType getVideoType() {
+        return videoType;
+    }
 
-	public void setNowNumber(String nowNumber) {
-		this.nowNumber = nowNumber;
-	}
+    public void setVideoType(VideoType videoType) {
+        this.videoType = videoType;
+    }
 
-	public String getFinish() {
-		return finish;
-	}
+    public String getWatchCount() {
+        return watchCount;
+    }
 
-	public void setFinish(String finish) {
-		this.finish = finish;
-	}
+    public void setWatchCount(String watchCount) {
+        this.watchCount = watchCount;
+    }
 
-	public String getId() {
-		return id;
-	}
+    public String getShow() {
+        return show;
+    }
 
-	public void setId(String id) {
-		this.id = id;
-	}
+    public void setShow(String show) {
+        this.show = show;
+    }
 
-	public String getThirdType() {
-		return thirdType;
-	}
+    @Expose
+    private List<VideoDetailInfo> videoDetailList = new ArrayList<VideoDetailInfo>();
 
-	public void setThirdType(String thirdType) {
-		this.thirdType = thirdType;
-	}
+    @OneToMany
+    public List<VideoDetailInfo> getVideoDetailList() {
+        return videoDetailList;
+    }
 
-	public String getOrderby() {
-		return orderby;
-	}
+    public void setVideoDetailList(List<VideoDetailInfo> videoDetailList) {
+        this.videoDetailList = videoDetailList;
+    }
 
-	public void setOrderby(String orderby) {
-		this.orderby = orderby;
-	}
+    public String getScore() {
+        return score;
+    }
 
-	public String getMainActor() {
-		return mainActor;
-	}
+    public void setScore(String score) {
+        this.score = score;
+    }
 
-	public void setMainActor(String mainActor) {
-		this.mainActor = mainActor;
-	}
+    public String getPicture() {
+        return picture;
+    }
 
-	@ManyToOne
-	public VideoType getVideoType() {
-		return videoType;
-	}
+    public void setPicture(String picture) {
+        this.picture = picture;
+    }
 
-	public void setVideoType(VideoType videoType) {
-		this.videoType = videoType;
-	}
+    public String getName() {
+        return name;
+    }
 
-	public String getWatchCount() {
-		return watchCount;
-	}
+    public void setName(String name) {
+        this.name = name;
+    }
 
-	public void setWatchCount(String watchCount) {
-		this.watchCount = watchCount;
-	}
+    public String getIntroduction() {
+        return introduction;
+    }
 
-	public String getShow() {
-		return show;
-	}
+    public void setIntroduction(String introduction) {
+        this.introduction = introduction;
+    }
 
-	public void setShow(String show) {
-		this.show = show;
-	}
+    public String getDuration() {
+        return duration;
+    }
 
-	@Expose
-	private List<VideoDetailInfo> videoDetailList = new ArrayList<VideoDetailInfo>();
+    public void setDuration(String duration) {
+        this.duration = duration;
+    }
 
-	@OneToMany
-	public List<VideoDetailInfo> getVideoDetailList() {
-		return videoDetailList;
-	}
+    public String getYear() {
+        return year;
+    }
 
-	public void setVideoDetailList(List<VideoDetailInfo> videoDetailList) {
-		this.videoDetailList = videoDetailList;
-	}
+    public void setYear(String year) {
+        this.year = year;
+    }
 
-	public String getScore() {
-		return score;
-	}
+    @ManyToOne
+    public AdminInfo getAdmin() {
+        return admin;
+    }
 
-	public void setScore(String score) {
-		this.score = score;
-	}
+    public void setAdmin(AdminInfo admin) {
+        this.admin = admin;
+    }
 
-	public String getPicture() {
-		return picture;
-	}
+    public String getBeizhu() {
+        return beizhu;
+    }
 
-	public void setPicture(String picture) {
-		this.picture = picture;
-	}
+    public void setBeizhu(String beizhu) {
+        this.beizhu = beizhu;
+    }
 
-	public String getName() {
-		return name;
-	}
+    public String getQulity() {
+        return qulity;
+    }
 
-	public void setName(String name) {
-		this.name = name;
-	}
+    public void setQulity(String qulity) {
+        this.qulity = qulity;
+    }
 
-	public String getIntroduction() {
-		return introduction;
-	}
+    public Long getCreatetime() {
+        return createtime;
+    }
 
-	public void setIntroduction(String introduction) {
-		this.introduction = introduction;
-	}
+    public void setCreatetime(Long createtime) {
+        this.createtime = createtime;
+    }
 
-	public String getDuration() {
-		return duration;
-	}
+    // 鐢ㄤ綔鍒嗛绲辫▓
 
-	public void setDuration(String duration) {
-		this.duration = duration;
-	}
+    private String type;
 
-	public String getYear() {
-		return year;
-	}
+    public String getType() {
+        return type;
+    }
 
-	public void setYear(String year) {
-		this.year = year;
-	}
+    public void setType(String type) {
+        this.type = type;
+    }
 
-	@ManyToOne
-	public AdminInfo getAdmin() {
-		return admin;
-	}
+    public int compareTo(Object o) {
+        return 0;
+    }
 
-	public void setAdmin(AdminInfo admin) {
-		this.admin = admin;
-	}
+    public int getFree() {
+        return free;
+    }
 
-	public String getBeizhu() {
-		return beizhu;
-	}
+    public void setFree(int free) {
+        this.free = free;
+    }
 
-	public void setBeizhu(String beizhu) {
-		this.beizhu = beizhu;
-	}
 
-	public String getQulity() {
-		return qulity;
-	}
+    public int getDefinition() {
+        return definition;
+    }
 
-	public void setQulity(String qulity) {
-		this.qulity = qulity;
-	}
+    public void setDefinition(int definition) {
+        this.definition = definition;
+    }
 
-	public long getCreatetime() {
-		return createtime;
-	}
+    public static class VideoAlbumMoreInfo implements Serializable{
+        @Expose
+        private String name;
+        @Expose
+        private int jumpPosition;
 
-	public void setCreatetime(long createtime) {
-		this.createtime = createtime;
-	}
+        public VideoAlbumMoreInfo(String name, int jumpPosition) {
+            this.name = name;
+            this.jumpPosition = jumpPosition;
+        }
 
-	// 鐢ㄤ綔鍒嗛绲辫▓
-	// @Field
-	private String type;
+        public String getName() {
+            return name;
+        }
 
-	public String getType() {
-		return type;
-	}
+        public void setName(String name) {
+            this.name = name;
+        }
 
-	public void setType(String type) {
-		this.type = type;
-	}
+        public int getJumpPosition() {
+            return jumpPosition;
+        }
 
-	public int compareTo(Object o) {
-		return 0;
-	}
+        public void setJumpPosition(int jumpPosition) {
+            this.jumpPosition = jumpPosition;
+        }
+    }
 }

--
Gitblit v1.8.0