From 56481656c7de11cdca69c1a7dd69db176ffd9ecd Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 08 五月 2021 12:49:30 +0800
Subject: [PATCH] 华为屏蔽金币任务中的看海量视频,新增广告平台概率控制
---
src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java | 117 +---------------------------------------------------------
1 files changed, 2 insertions(+), 115 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java b/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
index 801b765..8719787 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
@@ -66,7 +66,7 @@
resourceWhere = resourceWhere.substring(0, resourceWhere.length() - 2);
List resultList = session
.createSQLQuery(
- "SELECT ht.`id` as htid,ht.`name` as htname,ht.`columns` as htcolumns ,ht.`hasmore`,ht.`activity` ,ht.`params` ,ht.`ioscontrol`,ht.number,hvideo.id as hvid,hvideo.`videoid` AS hvvideoid,hvideo.`picture`as hvpicture ,hvideo.`tag` as hvtag, v.`id` as vid ,v.`picture` as vpicture ,v.`name` as vname ,v.`tag` as vtag ,v.`hpicture` as vhpicture ,v.`latest_hpicture` as vlatest_hpicture ,v.`watchcount` as vwatchcount,v.commentcount,ht.icon as hicon,ht.orderby as htorder,hvideo.orderby as hvorder,need_ad,big_picture,refresh_position,more_tag FROM (SELECT hv.* FROM `wk_resource_video` rv LEFT JOIN `wk_video_homevideo` hv ON rv.`videoid` =hv.`videoid` LEFT JOIN `wk_video_video` v ON v.`id` =hv.`videoid` LEFT JOIN `wk_video_banquan_video` bv ON bv.`videoid`=hv.`videoid` AND bv.`detailsystemid`="
+ "SELECT ht.`id` as htid,ht.`name` as htname,ht.`columns` as htcolumns ,ht.`hasmore`,ht.`activity` ,ht.`params` ,ht.`ioscontrol`,ht.number,hvideo.id as hvid,hvideo.`videoid` AS hvvideoid,hvideo.`picture`as hvpicture ,hvideo.`tag` as hvtag, v.`id` as vid ,v.`picture` as vpicture ,v.`name` as vname ,v.`tag` as vtag ,v.`hpicture` as vhpicture ,v.`latest_hpicture` as vlatest_hpicture ,v.`watchcount` as vwatchcount,v.commentcount,ht.icon as hicon,ht.orderby as htorder,hvideo.orderby as hvorder,need_ad,hvideo.big_picture,refresh_position,more_tag FROM (SELECT hv.* FROM `wk_resource_video` rv LEFT JOIN `wk_video_homevideo` hv ON rv.`videoid` =hv.`videoid` LEFT JOIN `wk_video_video` v ON v.`id` =hv.`videoid` LEFT JOIN `wk_video_banquan_video` bv ON bv.`videoid`=hv.`videoid` AND bv.`detailsystemid`="
+ detailSystem
+ " AND bv.`show`=1 LEFT JOIN `wk_video_hometype` ht ON ht.id=hv.hometype WHERE (hv.`id`>0 AND v.`show` =1 AND ht.special_data_key='"
+ dataKey + "' AND (" + resourceWhere
@@ -96,7 +96,7 @@
hv.setId(obj[8] + "");
hv.setPicture(obj[10] + "");
hv.setTag(obj[11] + "");
- hv.setBigPicture(Integer.parseInt(obj[24] + "") > 0);
+// hv.setBigPicture(Integer.parseInt(obj[24] + "") > 0);
VideoInfo video = new VideoInfo();
video.setId(obj[12] + "");
@@ -289,11 +289,6 @@
homeTypeDao.update(type);
}
- public void updateHomeVideo(HomeVideo type) {
-
- homeVideoDao.update(type);
- }
-
public List<DetailSystemSelect> getDetailSystemSelectByType(String homeType) {
List<DetailSystemSelect> li = new ArrayList<>();
List<DetailSystem> list = detailSystemDao
@@ -315,114 +310,6 @@
return li;
}
- public void addHomeTypeVideo(HomeVideo video) {
-
- long count = homeVideoDao.getCount("select count(*) from HomeVideo h where h.type.id=? and h.video.id=?",
- new String[]{video.getType().getId(), video.getVideo().getId()});
- if (count <= 0L)
- homeVideoDao.create(video);
- }
-
- public void addHomeTypeVideo(List<HomeVideo> list) {
- HomeVideo info;
- for (Iterator<HomeVideo> iterator = list.iterator(); iterator.hasNext(); addHomeTypeVideo(info))
- info = (HomeVideo) iterator.next();
- }
-
- public void deleteHomeVideo(HomeVideo video) {
-
- homeVideoDao.delete(video);
- }
-
- public void deleteHomeTypeVideo(List<HomeVideo> list) {
- HomeVideo video;
- for (Iterator<HomeVideo> iterator = list.iterator(); iterator.hasNext(); deleteHomeVideo(video))
- video = (HomeVideo) iterator.next();
- }
-
- public long getHomeVideoCount(String homeId) {
-
- return homeVideoDao.getCount("from HomeVideo h where h.type.id=?", new String[]{homeId});
- }
-
- public long getHomeTypeVideoPage(String homeId) {
- long count = getHomeVideoCount(homeId);
- return count % (long) Constant.pageCount != 0L ? count / (long) Constant.pageCount + 1L
- : count / (long) Constant.pageCount;
- }
-
- public List<HomeVideo> getHomeVideoList(String homeId, int page) {
-
- return homeVideoDao.list(
- "from HomeVideo h where h.type.id=? order by h.video.orderby desc,h.createtime desc",
- (page - 1) * Constant.pageCount, Constant.pageCount, new String[]{homeId});
- }
-
- public List<HomeVideo> getHomeVideoList(String homeId, String key, int page) {
- return homeVideoDao.list(
- "from HomeVideo h where h.type.id=? and h.video.name like ? order by h.video.orderby desc,h.video.watchCount desc,h.createtime desc",
- (page - 1) * Constant.pageCount, Constant.pageCount, new String[]{homeId, "%" + key + "%"});
- }
-
-
- @Cacheable(value = "homeCache", key = "'getHomeVideoList-'+#homeId+'-'+#resourceKey+'-'+#bigPicture+'-'+#page+'-'+#pageSize")
- public List<HomeVideo> getHomeVideoList(String homeId, String resourceKey, List<Long> resourceIds, Boolean bigPicture, int page, int pageSize) {
- List<HomeVideo> homeVideos = (List<HomeVideo>) homeVideoDao.excute(new HibernateCallback<List<HomeVideo>>() {
- @Override
- public List<HomeVideo> doInHibernate(Session session) throws HibernateException {
-
- List<String> rids = new ArrayList<>();
- for (Long rid : resourceIds) {
- rids.add("rv.`resourceid`=" + rid);
- }
-
- String sql = String.format("SELECT hv.* FROM wk_video_homevideo hv LEFT JOIN wk_resource_video rv ON rv.`videoid`=hv.`videoid` LEFT JOIN wk_video_video v ON v.`id`=hv.`videoid` WHERE v.show=1 and hv.`hometype`=%s AND (%s) ", homeId, org.yeshi.utils.StringUtil.concat(rids, " or "));
-
- if (bigPicture != null) {
- sql += " and hv.big_picture=" + (bigPicture ? 1 : 0);
- }
- sql += " GROUP BY hv.id ORDER BY hv.big_picture desc,hv.`orderby` DESC,hv.`createtime` DESC";
-
- return session.createSQLQuery(sql).addEntity(HomeVideo.class).setFirstResult((page - 1) * pageSize).setMaxResults(pageSize).list();
- }
- });
-
- List<VideoInfo> videoInfoList = new ArrayList<>();
- for (HomeVideo hv : homeVideos) {
- if (hv.getVideo() != null)
- videoInfoList.add(hv.getVideo());
- }
- videoInfoExtraService.batchExtra(videoInfoList, resourceIds);
- return homeVideos;
- }
-
- @Cacheable(value = "homeCache", key = "'getHomeVideoListCount'+'-'+#resourceKey+'-'+#bigPicture")
- public long getHomeVideoListCount(String homeId, String resourceKey, List<Long> resourceIds, Boolean bigPicture) {
- return (Long) homeVideoDao.excute(new HibernateCallback<Long>() {
- @Override
- public Long doInHibernate(Session session) throws HibernateException {
-
- List<String> rids = new ArrayList<>();
- for (Long rid : resourceIds) {
- rids.add("rv.`resourceid`=" + rid);
- }
-
- String sql = String.format("SELECT count(distinct(hv.id)) FROM wk_video_homevideo hv LEFT JOIN wk_resource_video rv ON rv.`videoid`=hv.`videoid` LEFT JOIN wk_video_video v ON v.`id`=hv.`videoid` WHERE v.show=1 and hv.`hometype`=%s AND (%s)", homeId, org.yeshi.utils.StringUtil.concat(rids, " or "));
-
- if (bigPicture != null) {
- sql += " and hv.big_picture=" + (bigPicture ? 1 : 0);
-
- }
-
- return Long.parseLong(session.createSQLQuery(sql).uniqueResult() + "");
- }
- });
- }
-
- public long getHomeVideoListCount(String homeId, String key) {
- return homeVideoDao.getCount("select count(*) from HomeVideo h where h.type.id=? and h.video.name like ? ",
- new String[]{homeId, "%" + key + "%"});
- }
public Serializable addHomeType(HomeType type) {
return homeTypeDao.save(type);
--
Gitblit v1.8.0