From ad3ac53da1c3a11a96ae62d790aa61a81b9eab91 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 20 三月 2021 18:47:23 +0800
Subject: [PATCH] 完善APP首页顶部标签栏兼容，初步处理推送
---
src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java | 112 +++++++++++++++++++++++++++++++++----------------------
1 files changed, 67 insertions(+), 45 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 3001d79..c2d4f95 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/HomeTypeService.java
@@ -6,8 +6,10 @@
import javax.annotation.Resource;
import com.yeshi.buwan.dao.*;
+import com.yeshi.buwan.dao.system.DetailSystemDao;
import com.yeshi.buwan.domain.*;
-import com.yeshi.buwan.service.inter.VideoResourceMapExtraInfoService;
+import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.service.inter.video.VideoInfoExtraService;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.cache.annotation.Cacheable;
@@ -33,7 +35,7 @@
private DetailSystemDao detailSystemDao;
@Resource
- private VideoResourceMapExtraInfoService videoResourceMapExtraInfoService;
+ private VideoInfoExtraService videoInfoExtraService;
public List<HomeType> getHomeTypeDetailList() {
List<HomeType> list = homeTypeDao.list("from HomeType h order by h.orderby desc");
@@ -41,15 +43,15 @@
return getHomeType(list);
}
- public List<HomeType> getHomeTypeList(String systemId){
- List<HomeType> list = homeTypeDao.list("from HomeType h where h.system.id=? order by h.orderby desc",systemId);
+ public List<HomeType> getHomeTypeList(String systemId) {
+ List<HomeType> list = homeTypeDao.list("from HomeType h where h.system.id=? order by h.orderby desc", systemId);
return list;
}
@SuppressWarnings("unchecked")
- @Cacheable(value = "homeCache", key = "'getHomeType'+'-'+#detailSystem+'-'+#cacheMd5+'-'+#maxNumber+'-'+#vtid")
+ @Cacheable(value = "homeCache", key = "'getHomeType'+'-'+#detailSystem+'-'+#cacheMd5+'-'+#maxNumber+'-'+#dataKey")
public List<HomeType> getHomeType(final String detailSystem, final List<Long> resourceIds, String cacheMd5,
- final int maxNumber, final long vtid) {
+ final int maxNumber, final String dataKey) {
List<HomeType> homeTypeList = (List<HomeType>) homeTypeDao.excute(new HibernateCallback<List<HomeType>>() {
public List<HomeType> doInHibernate(Session session) throws HibernateException {
@@ -63,10 +65,10 @@
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 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 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.vtid='"
- + vtid + "' AND (" + resourceWhere
+ + " 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
+ " ) AND bv.`videoid` IS NULL ) GROUP BY (hv.`id`) ORDER BY hv.`orderby` desc,v.createtime DESC ) hvideo LEFT JOIN `wk_video_super_hometype` sht ON sht.`hometypeid`=hvideo.hometype LEFT JOIN `wk_video_hometype` ht ON sht.`hometypeid` =ht.`id` LEFT JOIN wk_video_video v ON v.`id`=hvideo.videoid WHERE sht.`detailsystemid` =" + detailSystem + " ORDER BY hvideo.`orderby` DESC,v.orderby desc,v.updatetime desc")
.list();
List<HomeType> homeTypeList = new ArrayList<>();
@@ -83,6 +85,7 @@
ht.setNumber(Integer.parseInt(obj[7] + ""));
ht.setOrderby(obj[21] + "");
+ ht.setNeedAd(Boolean.parseBoolean(obj[23] + ""));
HomeVideo hv = new HomeVideo();
hv.setId(obj[8] + "");
@@ -97,7 +100,7 @@
video.setHpicture(obj[16] + "");
video.setLatestHpicture(obj[17] + "");
video.setWatchCount(obj[18] + "");
- video.setCommentCount(Integer.parseInt(obj[19] + ""));
+ video.setCommentCount(obj[19] != null ? Integer.parseInt(obj[19] + "") : 0);
ht.setIcon(obj[20] + "");
hv.setVideo(video);
@@ -106,10 +109,15 @@
// hv.getVideo().getName());
// 鏇存敼鍥剧墖鏄剧ず
- if (!StringUtil.isNullOrEmpty(hv.getVideo().getLatestHpicture()))
- hv.getVideo().setPicture(hv.getVideo().getLatestHpicture());
- else
- hv.getVideo().setPicture(hv.getVideo().getHpicture());
+ //濡傛灉涓虹珫鐗�
+ if (ht.getColumns() == 2) {
+ if (!StringUtil.isNullOrEmpty(hv.getVideo().getLatestHpicture()))
+ hv.getVideo().setPicture(hv.getVideo().getLatestHpicture());
+ else
+ hv.getVideo().setPicture(hv.getVideo().getHpicture());
+ } else {
+// hv.getVideo().setPicture(hv.getVideo().getVpicture());
+ }
if (StringUtil.isNullOrEmpty(hv.getPicture()))
hv.setPicture(hv.getVideo().getPicture());
@@ -155,28 +163,16 @@
}
});
- List<String> videoIdList = new ArrayList<>();
+ List<VideoInfo> videoInfoList = new ArrayList<>();
for (HomeType ht : homeTypeList) {
if (ht.getHomeVideoList() != null)
for (HomeVideo hv : ht.getHomeVideoList()) {
if (hv.getVideo() != null)
- videoIdList.add(hv.getVideo().getId());
+ videoInfoList.add(hv.getVideo());
}
}
- Map<String, VideoResourceMapExtraInfo> videoMap = videoResourceMapExtraInfoService.listMap(videoIdList, resourceIds);
- for (HomeType ht : homeTypeList) {
- if (ht.getHomeVideoList() != null)
- for (HomeVideo hv : ht.getHomeVideoList()) {
- if (hv.getVideo() != null) {
- hv.getVideo().setVideoResourceMapExtraInfo(videoMap.get(hv.getVideo().getId()));
- if (hv.getVideo().getVideoResourceMapExtraInfo() != null)
- hv.getVideo().setFree(hv.getVideo().getVideoResourceMapExtraInfo().getFree());
- }
- }
- }
-
-
+ videoInfoExtraService.batchExtra(videoInfoList, resourceIds);
return homeTypeList;
}
@@ -236,7 +232,7 @@
for (HomeVideo sp : homeVideoList)
session.delete(sp);
- session.delete(session.get(HomeType.class,id));
+ session.delete(session.get(HomeType.class, id));
session.flush();
session.getTransaction().commit();
} catch (Exception e) {
@@ -442,7 +438,7 @@
*/
@SuppressWarnings("unchecked")
- public List<HomeTypeAdmin> getHomeTypeAdmin(final String key, final String systemId, final int detailSystem, final int page) {
+ public List<HomeTypeAdmin> getHomeTypeAdmin(final String key, final String systemId, final String dataKey, final int detailSystem, final int page) {
return (List<HomeTypeAdmin>) homeTypeDao.excute(new HibernateCallback<List<HomeTypeAdmin>>() {
public List<HomeTypeAdmin> doInHibernate(Session session) throws HibernateException {
@@ -450,12 +446,22 @@
try {
List<DetailSystem> detailSystemList = session.createQuery("from DetailSystem ds where ds.system.id=" + systemId).list();
String sql = "";
- if (detailSystem > 0)
- sql = "select sh.homeType from SuperHomeType sh where sh.homeType.name like ? and sh.detailSystem.id="
- + detailSystem + " order by sh.homeType.orderby desc";
- else
- sql = "from HomeType zb where zb.name like ? and zb.system.id=" + systemId + " order by zb.orderby desc";
-
+ List<String> andList = new ArrayList<>();
+ if (detailSystem > 0) {
+ andList.add("sh.homeType.name like ?");
+ andList.add("sh.detailSystem.id=" + detailSystem);
+ if (dataKey != null) {
+ andList.add("sh.homeType.specialDataKey='" + dataKey+"'");
+ }
+ sql = "select sh.homeType from SuperHomeType sh where " + org.yeshi.utils.StringUtil.concat(andList, " and ") + " order by sh.homeType.orderby desc";
+ } else {
+ andList.add("zb.name like ?");
+ andList.add("zb.system.id=" + systemId);
+ if (dataKey != null) {
+ andList.add("zb.specialDataKey='" + dataKey+"'");
+ }
+ sql = "from HomeType zb where " + org.yeshi.utils.StringUtil.concat(andList, " and ") + " order by zb.orderby desc";
+ }
List<HomeType> list = session.createQuery(sql).setParameter(0, "%" + key + "%")
.setFirstResult((page - 1) * Constant.pageCount).setMaxResults(Constant.pageCount).list();
for (HomeType vb : list) {
@@ -496,15 +502,31 @@
}
- public long getHomeTypeAdminCount(String key, String systemId,int detailSystem) {
- String sql = "";
- if (detailSystem > 0)
- sql = "select count(*) from (select count(*) from wk_video_super_hometype zb left join wk_video_hometype c on c.id=zb.hometypeid where zb.detailsystemid="
- + detailSystem + " and c.name like '%" + key + "%' group by zb.hometypeid) s";
- else
- sql = "select count(*) from (select count(*) from wk_video_super_hometype zb left join wk_video_hometype c on c.id=zb.hometypeid where c.name like '%"
- + key + "%' and c.system="+systemId+" group by zb.hometypeid) s";
+ public long getHomeTypeAdminCount(String key, String systemId, int detailSystem, final String dataKey) {
+ List<String> andList = new ArrayList<>();
+
+ String sql = "";
+ if (detailSystem > 0) {
+ andList.add("zb.detailsystemid=" + detailSystem);
+ andList.add("c.name like '%" + key + "%'");
+ if (dataKey != null) {
+ andList.add("c.special_data_key='" + dataKey + "'");
+ }
+
+ sql = "select count(*) from (select count(*) from wk_video_super_hometype zb left join wk_video_hometype c on c.id=zb.hometypeid where " + org.yeshi.utils.StringUtil.concat(andList, " and ") + " group by zb.hometypeid) s";
+
+
+ } else {
+
+ andList.add("c.name like '%" + key + "%'");
+ andList.add("c.system=" + systemId);
+ if (dataKey != null) {
+ andList.add("c.special_data_key='" + dataKey + "'");
+ }
+
+ sql = "select count(*) from (select count(*) from wk_video_super_hometype zb left join wk_video_hometype c on c.id=zb.hometypeid where " + org.yeshi.utils.StringUtil.concat(andList, " and ") + " group by zb.hometypeid) s";
+ }
return homeTypeDao.getCountSQL(sql);
}
--
Gitblit v1.8.0