From 2a593ddac16e06f1ff55edca22ea568f07b068ba Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 02 四月 2021 19:15:18 +0800
Subject: [PATCH] 3.9.0bug修改
---
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java | 190 ++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 177 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
index 1f3fd7e..6c9bc71 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -2,23 +2,36 @@
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.Collection;
+import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.user.LoginUser;
+import com.yeshi.buwan.domain.video.InternetSearchVideo;
+import com.yeshi.buwan.dto.log.BaseLog;
+import com.yeshi.buwan.dto.search.SolrResultDTO;
+import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
import com.yeshi.buwan.dto.user.LoginInfoDto;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.exception.user.RegisterUserException;
+import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
+import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
+import com.yeshi.buwan.service.manager.SolrInternetSearchVideoDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.util.email.MailSenderUtil;
+import com.yeshi.buwan.util.factory.VideoInfoFactory;
+import com.yeshi.buwan.util.log.LoggerUtil;
+import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.video.VideoCategoryConstant;
import com.yeshi.buwan.util.video.VideoConstant;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoListResultVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
@@ -30,6 +43,7 @@
@Controller
public class UserParser {
+
@Resource
private SystemService systemService;
@Resource
@@ -54,6 +68,8 @@
private VideoInfoService videoInfoService;
@Resource
private SolrAlbumVideoDataManager solrDataManager;
+ @Resource
+ private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager;
@Resource
private ConfigParser configParser;
@@ -184,6 +200,13 @@
}
}
}
+ if (list == null || list.size() < 3) {
+ List<String> list1 = solrInternetSearchVideoDataManager.getSuggestKeyList(key);
+ if (list1 != null) {
+ list.addAll(list1);
+ }
+ }
+
JSONObject object = new JSONObject();
object.put("count", list.size() + "");
JSONArray array = new JSONArray();
@@ -199,7 +222,7 @@
private List<VideoDetailInfo> createSearchVideoDetailsVO(VideoInfo video) {
List<VideoDetailInfo> detailList = new ArrayList<>();
if (video.getVideoType() != null && (Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DIANSHIJU || Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DONGMAN)) {
- if (video.getVideocount()!=null&& video.getVideocount() <= 5) {
+ if (video.getVideocount() != null && video.getVideocount() <= 5) {
for (int i = 0; i < video.getVideocount(); i++) {
VideoDetailInfo detail = new VideoDetailInfo();
detail.setTag((i + 1) + "");
@@ -334,6 +357,8 @@
// 鎼滅储
public void searchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
+
+
//type: 0-鍏ㄩ儴 1-
String key = request.getParameter("Key");
String type = request.getParameter("Type");
@@ -349,17 +374,22 @@
return;
}
+ LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createSearch(new BaseLog(acceptData, ""), key, type));
+
int pageIndex = StringUtil.getPage(page);
if (pageIndex <= 0) {
pageIndex = 1;
}
List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+
+
String cacheMD5 = "0";
if (resourceList != null && resourceList.size() > 0)
for (Long l : resourceList)
cacheMD5 += "#" + l;
cacheMD5 = StringUtil.Md5(cacheMD5);
+
VideoListResultVO videoListResultVO = searchService.searchNew(acceptData.getDetailSystem().getId(), request.getRemoteAddr(),
acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
@@ -389,26 +419,49 @@
}
}
- for (int i = 0; i < list.size(); i++) {
- ((VideoInfo) list.get(i))
- .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + ""));
- array.add(StringUtil.outPutResultJson(list.get(i)));
- }
- object.put("data", array);
+
if (pageIndex == 1) {//杩斿洖瀵艰埅鏍�
List<VideoType> typeList = new ArrayList<>();
VideoType vt = new VideoType();
vt.setId(0);
vt.setName("鍏ㄩ儴");
typeList.add(vt);
- Set<Long> set = new HashSet<>();
- for (VideoInfo videoInfo : list) {
- if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null)
- set.add(videoInfo.getVideoType().getId());
+ List<Long> set = new ArrayList<>();
+ //灏嗚棰戝唴瀹瑰垎绫诲苟鎺掑簭
+ Map<Long, List<VideoInfo>> videoMap = new HashMap<>();
+ for (int i = 0; i < list.size(); i++) {
+ VideoInfo videoInfo = list.get(i);
+ if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null) {
+ if (videoMap.get(videoInfo.getVideoType().getId()) == null)
+ videoMap.put(videoInfo.getVideoType().getId(), new ArrayList<>());
+ videoMap.get(videoInfo.getVideoType().getId()).add(videoInfo);
+ if (!set.contains(videoInfo.getVideoType().getId()))
+ set.add(videoInfo.getVideoType().getId());
+
+ if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) {
+ list.remove(i);
+ i--;
+ }
+ }
}
- for (Iterator<Long> its = set.iterator(); its.hasNext(); ) {
- Long typeId = its.next();
+ //閲嶆柊缁勭粐鏁版嵁
+ if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion()) && (StringUtil.isNullOrEmpty(type) || type.equalsIgnoreCase("0"))) {
+ List<VideoInfo> albumVideoList = new ArrayList<>();
+ for (int i = 0; i < set.size(); i++) {
+ Long typeId = set.get(i);
+ String typeName = VideoConstant.getMainCategoryName(typeId);
+ if (!StringUtil.isNullOrEmpty(typeName)) {
+ videoMap.get(typeId).get(0).setAlbumMoreInfo(new VideoInfo.VideoAlbumMoreInfo(typeName, i + 1));
+ albumVideoList.addAll(videoMap.get(typeId));
+ }
+ }
+ list.addAll(0, albumVideoList);
+ }
+
+
+ for (int i = 0; i < set.size(); i++) {
+ Long typeId = set.get(i);
String typeName = VideoConstant.getMainCategoryName(typeId);
if (!StringUtil.isNullOrEmpty(typeName)) {
vt = new VideoType();
@@ -417,21 +470,94 @@
typeList.add(vt);
}
}
+
+
+ vt = new VideoType();
+ vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
+ vt.setName("楂樻竻");
+ typeList.add(vt);
+
+
JSONArray array1 = new JSONArray();
for (VideoType vt1 : typeList)
array1.add(StringUtil.outPutResultJson(vt1));
object.put("typeList", array1);
}
+ for (int i = 0; i < list.size(); i++) {
+ ((VideoInfo) list.get(i))
+ .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + ""));
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ }
+ object.put("data", array);
+
out.print(JsonUtil.loadTrueJson(object.toString()));
}
+ @Resource
+ private InternetSearchVideoService internetSearchVideoService;
+
+ private void guessLikeForInternetSearch(AcceptData acceptData, String videoId, PrintWriter out) {
+ InternetSearchVideo internetSearchVideo = internetSearchVideoService.selectByPrimaryKey(videoId);
+ if (internetSearchVideo != null) {
+ int rootType = internetSearchVideo.getRootType();
+ SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
+ filter.setVideoType(rootType);
+ filter.setResourceIds(new String[]{PPTVUtil.RESOURCE_ID + ""});
+ filter.setSortKey("watchcount");
+ SolrResultDTO dto = solrDataManager.find(filter, 1, 20);
+ List<SolrAlbumVideo> solrAlbumVideoList = new ArrayList<>();
+ solrAlbumVideoList.addAll(dto.getVideoList());
+ List<VideoInfo> list = new ArrayList<>();
+ for (int i = 0; i < 4; i++) {
+ if (solrAlbumVideoList.size() > 0) {
+ int p = (int) (Math.random() * solrAlbumVideoList.size());
+ SolrAlbumVideo solrAlbumVideo = solrAlbumVideoList.get(p);
+ list.add(VideoInfoFactory.create(solrAlbumVideo));
+ solrAlbumVideoList.remove(p);
+ }
+ }
+
+ if (list.size() < 4) {
+ filter.setResourceIds(null);
+ dto = solrDataManager.find(filter, 1, 20);
+ solrAlbumVideoList.clear();
+ solrAlbumVideoList.addAll(dto.getVideoList());
+ for (int i = list.size(); i < 4; i++) {
+ if (solrAlbumVideoList.size() > 0) {
+ int p = (int) (Math.random() * solrAlbumVideoList.size());
+ SolrAlbumVideo solrAlbumVideo = solrAlbumVideoList.get(p);
+ list.add(VideoInfoFactory.create(solrAlbumVideo));
+ solrAlbumVideoList.remove(p);
+ }
+ }
+ }
+
+
+ JSONObject object = new JSONObject();
+ object.put("count", list.size() + "");
+ JSONArray array = new JSONArray();
+
+ for (int i = 0; i < list.size(); i++) {
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ }
+
+ object.put("data", array);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+ }
+
// 鐚滀綘鍠滄
public void guessLike(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String videoId = request.getParameter("VideoId");
+ if (!NumberUtil.isNumeric(videoId)) {
+ guessLikeForInternetSearch(acceptData, videoId, out);
+ return;
+ }
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -604,6 +730,39 @@
}
+
+ private void getRelativeVideosForInternetSearch(AcceptData acceptData, String videoId, PrintWriter out) {
+ InternetSearchVideo internetSearchVideo = internetSearchVideoService.selectByPrimaryKey(videoId);
+ if (internetSearchVideo != null) {
+ SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
+ filter.setKey(internetSearchVideo.getName());
+ filter.setFuzzy(true);
+ SolrResultDTO dto = solrDataManager.find(filter, 1, 20);
+ List<SolrAlbumVideo> solrAlbumVideoList = new ArrayList<>();
+ solrAlbumVideoList.addAll(dto.getVideoList());
+ List<VideoInfo> list = new ArrayList<>();
+ for (int i = 0; i < 4; i++) {
+ if (i < solrAlbumVideoList.size()) {
+ SolrAlbumVideo solrAlbumVideo = solrAlbumVideoList.get(i);
+ list.add(VideoInfoFactory.create(solrAlbumVideo));
+ }
+ }
+
+
+ JSONObject object = new JSONObject();
+ object.put("count", list.size() + "");
+ JSONArray array = new JSONArray();
+
+ for (int i = 0; i < list.size(); i++) {
+ array.add(StringUtil.outPutResultJson(list.get(i)));
+ }
+
+ object.put("data", array);
+ out.print(JsonUtil.loadTrueJson(object.toString()));
+ }
+
+ }
+
/**
* 鐩稿叧瑙嗛
*
@@ -617,6 +776,11 @@
return;
}
+ if (!NumberUtil.isNumeric(videoId)) {
+ getRelativeVideosForInternetSearch(acceptData, videoId, out);
+ return;
+ }
+
List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
--
Gitblit v1.8.0