From e89de9319d8f771f8e53cb5f876d06465a580c57 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期一, 02 八月 2021 18:23:22 +0800
Subject: [PATCH] kafka日志集成
---
src/main/java/com/yeshi/buwan/service/imp/SearchService.java | 50 +++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 39 insertions(+), 11 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 84b4f1e..dd186e1 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
@@ -12,8 +12,8 @@
import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.service.inter.video.VideoInfoExtraService;
-import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
-import com.yeshi.buwan.service.manager.SolrInternetSearchVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrInternetSearchVideoDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.factory.VideoInfoFactory;
import com.yeshi.buwan.util.video.VideoConstant;
@@ -288,7 +288,7 @@
}
- private SearchResult searchAlbum(int videoType, String key, int page, int pageSize) {
+ public SearchResult searchAlbum(int videoType, String key, int page, int pageSize) {
List<VideoInfo> localList = new ArrayList<>();
//涓撹緫瑙嗛闆嗗悎
Set<String> solrAlbumVids = new HashSet<>();
@@ -316,12 +316,15 @@
}
}
- //绗竴椤佃�屼笖涓嶄负楂樻竻鏃舵悳绱�
+ //绗竴椤�,涓嶄负楂樻竻,涓绘悳绱㈠紩鎿庢棤娉曟悳绱㈠埌鍐呭鏃舵悳绱�
if (page == 1 && videoType != Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION) {
//page涓�1鏃� 鍏ㄧ綉鎼�
SolrResultDTO internetSearchResultDTO = solrInternetSearchVideoDataManager.find(filter, 1, 20);
if (internetSearchResultDTO != null && internetSearchResultDTO.getVideoList().size() > 0) {
- List<InternetSearchVideo> isvList = internetSearchResultDTO.getVideoList();
+ List<InternetSearchVideo> iList = internetSearchResultDTO.getVideoList();
+ List<InternetSearchVideo> isvList = new ArrayList<>();
+ if (iList != null && iList.size() > 0)
+ isvList.addAll(iList);
//鍒犻櫎鍓嶉潰鏈夌殑鏁版嵁锛屾牴鎹畆ootType涓庡悕绉扮瓫閫�
for (int i = 0; i < isvList.size(); i++) {
String uniqueId = isvList.get(i).getName() + "#" + isvList.get(i).getRootType();
@@ -333,11 +336,34 @@
for (InternetSearchVideo sv : isvList) {
VideoInfo video = VideoInfoFactory.create(sv);
video = loadAlbumData(video);
- localList.add(video);
+ if (albumCount < 3) {
+ localList.add(video);
+ } else {
+ if (video.getName().equalsIgnoreCase(key))
+ localList.add(video);
+ }
}
}
- //todo 鎸夊叧閿瘝鐨勫尮閰嶅害鎺掑簭
+ //鎸夊叧閿瘝鐨勫尮閰嶅害鎺掑簭
+ Comparator<VideoInfo> cm = (VideoInfo o1, VideoInfo o2) -> {
+ if (o1.getDefinition() - o2.getDefinition() == 0) {
+ float s1 = CompareStrSimUtil.getSimilarityRatio(o1.getName(), key, true);
+ float s2 = CompareStrSimUtil.getSimilarityRatio(o2.getName(), key, true);
+// if (s1 != s2)//鐩镐技搴﹁秺楂樿秺闈犲墠
+ return s2 > s1 ? 1 : -1;
+// else
+// return o1.getDefinition() - o2.getDefinition();//楂樻竻鎺掑湪鍓�
+ } else {
+ return o2.getDefinition() - o1.getDefinition();//楂樻竻鎺掑湪鍓�
+ }
+ };
+
+ Collections.sort(localList, cm);
+ }
+ //鏈悳绱㈠埌鍐呭
+ if (localList == null || localList.size() == 0) {
+ logger.warn("涓撹緫鎼滅储鏃犵粨鏋�#{}", key);
}
return new SearchResult(albumCount, localList);
}
@@ -392,9 +418,11 @@
if (!StringUtil.isNullOrEmpty(key) && key.length() > 30)
key = key.substring(0, 30);
sh.setKey(key);
- UserInfo user = new UserInfo();
- user.setId(uid);
- sh.setUser(user);
+ if(uid!=null) {
+ UserInfo user = new UserInfo();
+ user.setId(uid);
+ sh.setUser(user);
+ }
searchDao.create(sh);
// 鏌ヨ鏁版嵁搴�
@@ -708,7 +736,7 @@
}
- class SearchResult {
+ public static class SearchResult {
private int totalCount;
private List<VideoInfo> videoInfoList;
--
Gitblit v1.8.0