From 4011b8d0b377af33e2bc435f7726329630d706cb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 02 三月 2021 18:28:52 +0800
Subject: [PATCH] 搜索引擎接口更新
---
src/main/java/com/yeshi/buwan/service/imp/SearchService.java | 149 ++++++++++++++++++++++++++-----------------------
1 files changed, 80 insertions(+), 69 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/SearchService.java b/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
index 876d12e..7e0d0b3 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
@@ -1,32 +1,27 @@
package com.yeshi.buwan.service.imp;
-import java.io.Serializable;
-import java.io.UnsupportedEncodingException;
-import java.util.*;
-
-import javax.annotation.Resource;
-
-import com.yeshi.buwan.dao.video.AlbumVideoMapDao;
+import com.yeshi.buwan.dao.*;
import com.yeshi.buwan.domain.*;
-import com.yeshi.buwan.domain.video.AlbumVideoMap;
+import com.yeshi.buwan.domain.web.DetailSystemSelect;
+import com.yeshi.buwan.domain.web.HotSearchAdmin;
+import com.yeshi.buwan.dto.search.SolrResultDTO;
+import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
+import com.yeshi.buwan.service.inter.VideoResourceMapExtraInfoService;
import com.yeshi.buwan.service.manager.SolrAlbumDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.factory.VideoInfoFactory;
import com.yeshi.buwan.util.video.VideoConstant;
+import com.yeshi.buwan.vo.video.VideoListResultVO;
import org.hibernate.HibernateException;
import org.hibernate.Session;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
-import com.yeshi.buwan.dao.DetailSystemDao;
-import com.yeshi.buwan.dao.HotSearchDao;
-import com.yeshi.buwan.dao.SearchDao;
-import com.yeshi.buwan.dao.SuperHotSearchDao;
-import com.yeshi.buwan.dao.VideoBanQuanVideoDao;
-import com.yeshi.buwan.dao.VideoInfoDao;
-import com.yeshi.buwan.domain.web.DetailSystemSelect;
-import com.yeshi.buwan.domain.web.HotSearchAdmin;
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.io.UnsupportedEncodingException;
+import java.util.*;
@Service
public class SearchService {
@@ -41,22 +36,20 @@
@Resource
private SuperHotSearchDao superHotSearchDao;
@Resource
- private ConfigService configService;
- @Resource
private VideoBanQuanVideoDao videoBanQuanVideoDao;
@Resource
private DetailSystemDao detailSystemDao;
@Resource
- private AlbumVideoMapDao albumVideoMapDao;
+ private SolrAlbumDataManager solrAlbumDataManager;
@Resource
- private SolrAlbumDataManager solrAlbumDataManager;
+ private VideoResourceMapExtraInfoService videoResourceMapExtraInfoService;
@SuppressWarnings("rawtypes")
@Cacheable(value = "userCache", key = "'suggestSearch'+'-'+#key+'-'+#system")
public List<String> suggestSearch(String key, String system) {
if (StringUtil.isNullOrEmpty(key) || key.startsWith("%"))
- return new ArrayList<String>();
+ return new ArrayList<>();
List<String> list;
Session session = null;
@@ -67,7 +60,7 @@
sql = "select name as result from wk_video_video where name like ?";
}
- list = new ArrayList<String>();
+ list = new ArrayList<>();
List li = null;
try {
@@ -93,7 +86,7 @@
}
Iterator<String> it = set.iterator();
- list = new ArrayList<String>();
+ list = new ArrayList<>();
while (it.hasNext()) {
list.add(it.next());
if (list.size() > 10)
@@ -135,7 +128,7 @@
.append(") order by REPLACE(v.name,?,'') ,v.watchCount desc").toString();
else
sql = "from VideoInfo v where v.show='1' and (v.name like ?) order by REPLACE(v.name,?,''),v.watchCount desc";// 鏀逛负sql
- List<Serializable> list = new ArrayList<Serializable>();
+ List<Serializable> list = new ArrayList<>();
BaiduVideoUtil util = new BaiduVideoUtil();
List<VideoInfo> localList = videoInfoDao.list(sql, (page - 1) * Constant.pageCount, Constant.pageCount,
new String[]{(new StringBuilder("")).append(key).append("%").toString(), key});
@@ -196,7 +189,7 @@
searchDao.create(sh);
// 鏌ヨ鏁版嵁搴�
- List<VideoInfo> list = new ArrayList<VideoInfo>();
+ List<VideoInfo> list = new ArrayList<>();
List<VideoInfo> localList = null;
try {
long startt = System.currentTimeMillis();
@@ -220,7 +213,7 @@
sql = sql.substring(0, sql.length() - 9);
List rlist = videoInfoDao.sqlList(sql);
- List<Integer> pList = new ArrayList<Integer>();
+ List<Integer> pList = new ArrayList<>();
for (int i = 0; i < localList.size(); i++) {
if (Integer.parseInt(rlist.get(i) + "") < 1) {
pList.add(i);
@@ -250,8 +243,8 @@
@Cacheable(value = "userCache", key = "'searchNew'+'-'+#detailSystem+'-'+#key+'-'+#page+'-'+#videoType+'-'+#system+'-'+#cacheMD5")
- public List<VideoInfo> searchNew(String detailSystem, String ip, String uid, String key, int page, int videoType,
- String system, List<Long> resourceList, String cacheMD5) {
+ public VideoListResultVO searchNew(String detailSystem, String ip, String uid, String key, int page, int videoType,
+ String system, List<Long> resourceList, String cacheMD5) {
String resourceWhere = "";
for (Long re : resourceList) {
resourceWhere += " rv.resourceid=" + re + " or";
@@ -273,7 +266,9 @@
searchDao.create(sh);
// 鏌ヨ鏁版嵁搴�
- List<VideoInfo> list = new ArrayList<VideoInfo>();
+ //涓撹緫鏁伴噺
+ long albumCount = 0L;
+ List<VideoInfo> list = new ArrayList<>();
List<VideoInfo> localList = null;
try {
long startt = System.currentTimeMillis();
@@ -281,43 +276,56 @@
localList = new ArrayList<>();
//鍏堟悳绱笓杈�
- List<SolrVideo> solrVideoList = solrAlbumDataManager.findByKey(key, 1, videoType == 0 ? null : videoType, page);
+ int pageSize = 20;
+ //涓撹緫瑙嗛闆嗗悎
Set<String> solrAlbumVids = new HashSet<>();
- for (SolrVideo sv : solrVideoList) {
- VideoInfo video = VideoInfoFactory.create(sv);
- video.setShowType(1);
- if (!StringUtil.isNullOrEmpty(video.getMainActor())) {
- video.setMainActor("涓绘紨锛�" + video.getMainActor());
- }
- //璁剧疆tag
- String tag = "";
- if (!StringUtil.isNullOrEmpty(sv.getYear())) {
- tag += sv.getYear() + "/";
- }
+ SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
+ filter.setKey(key);
+ filter.setVideoType(videoType == 0 ? null : videoType);
+ filter.setContentType(1);
- if (video.getVideoType() != null) {
- String vt = VideoConstant.getMainCategoryName(sv.getRootVideoType());
- if (!StringUtil.isNullOrEmpty(vt)) {
- tag += vt + "/";
+ SolrResultDTO solrResultDTO = solrAlbumDataManager.find(filter, page, pageSize);
+ if (solrResultDTO != null) {
+ albumCount = solrResultDTO.getTotalCount();
+
+ for (SolrVideo sv : solrResultDTO.getVideoList()) {
+ VideoInfo video = VideoInfoFactory.create(sv);
+ video.setShowType(1);
+ if (!StringUtil.isNullOrEmpty(video.getMainActor())) {
+ video.setMainActor("涓绘紨锛�" + video.getMainActor());
}
+
+ //璁剧疆tag
+ String tag = "";
+ if (!StringUtil.isNullOrEmpty(sv.getYear())) {
+ tag += sv.getYear() + "/";
+ }
+
+ if (video.getVideoType() != null) {
+ String vt = VideoConstant.getMainCategoryName(sv.getRootVideoType());
+ if (!StringUtil.isNullOrEmpty(vt)) {
+ tag += vt + "/";
+ }
+ }
+
+ if (!StringUtil.isNullOrEmpty(video.getArea())) {
+ tag += video.getArea() + "/";
+ }
+
+ if (tag.endsWith("/"))
+ tag = tag.substring(0, tag.length() - 1);
+ video.setTag(tag);
+
+ localList.add(video);
+ solrAlbumVids.add(video.getId());
}
-
- if (!StringUtil.isNullOrEmpty(video.getArea())) {
- tag += video.getArea() + "/";
- }
-
- if (tag.endsWith("/"))
- tag = tag.substring(0, tag.length() - 1);
- video.setTag(tag);
-
- localList.add(video);
- solrAlbumVids.add(video.getId());
}
+ int commonSolrPage = page - solrResultDTO.getTotalCount() / pageSize;
- if (videoType == 0) {
+ if (videoType == 0 && commonSolrPage > 0) {
//鎼滅储鍘熷鐨�
- List<VideoInfo> solrList = SolrUtil.search(key, page);
+ List<VideoInfo> solrList = SolrUtil.search(key, commonSolrPage);
for (VideoInfo vi : solrList) {
if (!solrAlbumVids.contains(vi.getId())) {
localList.add(vi);
@@ -336,8 +344,8 @@
if (sql.endsWith("union all"))
sql = sql.substring(0, sql.length() - 9);
- List rlist = videoInfoDao.sqlList(sql);
- List<Integer> pList = new ArrayList<Integer>();
+ List rlist = StringUtil.isNullOrEmpty(sql) ? new ArrayList() : videoInfoDao.sqlList(sql);
+ List<Integer> pList = new ArrayList<>();
for (int i = 0; i < localList.size(); i++) {
if (Integer.parseInt(rlist.get(i) + "") < 1) {
pList.add(i);
@@ -363,7 +371,10 @@
}
}
- return list;
+ //鑾峰彇闄勫姞淇℃伅
+ list = videoResourceMapExtraInfoService.batchExtraInfo(list, resourceList);
+
+ return new VideoListResultVO(list, videoType == 0 ? albumCount : 1000L);
}
public long searchCount(String key, String system) {
@@ -382,7 +393,7 @@
@SuppressWarnings({"rawtypes"})
@Cacheable(value = "userCache", key = "'getHotSearchList'+'-'+#system")
public List<String> getHotSearchList(String system) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
try {
List li = searchDao.sqlList(
"SELECT h.`name` FROM wk_video_super_hotsearch sh LEFT JOIN wk_video_hotsearch h ON sh.`hotsearchid`=h.`id` WHERE sh.`detailsystem`=? ORDER BY h.`orderby` DESC",
@@ -455,16 +466,16 @@
}
@SuppressWarnings("unchecked")
- public List<HotSearchAdmin> getHotSearchAdmin(String key, int detailSystem, int page) {
- List<HotSearchAdmin> zhiBoClassList = new ArrayList<HotSearchAdmin>();
+ public List<HotSearchAdmin> getHotSearchAdmin(String key, String systemId, int detailSystem, int page) {
+ List<HotSearchAdmin> zhiBoClassList = new ArrayList<>();
try {
- List<DetailSystem> detailSystemList = detailSystemDao.list("from DetailSystem");
+ List<DetailSystem> detailSystemList = detailSystemDao.list("from DetailSystem ds where ds.system.id=" + systemId);
String sql = "";
if (detailSystem > 0)
sql = "select sh.hotSearch from SuperHotSearch sh where sh.hotSearch.name like ? and sh.detailSystem.id="
+ detailSystem + " order by sh.createtime desc";
else
- sql = "from HotSearch zb where zb.name like ? order by zb.createtime desc";
+ sql = "from HotSearch zb where zb.name like ? and zb.system.id=" + systemId + " order by zb.createtime desc";
List<HotSearch> list = hotSearchDao.list(sql, (page - 1) * Constant.pageCount, Constant.pageCount,
new Serializable[]{"%" + key + "%"});
@@ -472,7 +483,7 @@
List<DetailSystem> detailSystemS = detailSystemDao
.list("select vb.detailSystem from SuperHotSearch vb where vb.hotSearch.id=" + vb.getId());
- List<DetailSystemSelect> dssList = new ArrayList<DetailSystemSelect>();
+ List<DetailSystemSelect> dssList = new ArrayList<>();
for (DetailSystem ds : detailSystemList) {
DetailSystemSelect dss = new DetailSystemSelect();
@@ -502,13 +513,13 @@
return zhiBoClassList;
}
- public long getHotSearchAdminCount(String key, int detailSystem) {
+ public long getHotSearchAdminCount(String key,String systemId, int detailSystem) {
String sql = "";
if (detailSystem > 0)
sql = "select count(*) from (select count(*) from wk_video_super_hotsearch zb left join wk_video_hotsearch c on c.id=zb.hotsearchid where zb.detailsystem="
+ detailSystem + " and c.name like '%" + key + "%' group by zb.hotsearchid) s";
else
- sql = "select count(*) from wk_video_hotsearch h where h.name like '%" + key + "%'";
+ sql = "select count(*) from wk_video_hotsearch h where h.name like '%" + key + "%' and h.system="+systemId;
return videoBanQuanVideoDao.getCountSQL(sql);
}
--
Gitblit v1.8.0