From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java | 121 +++++++++++++++++++++++++++++++++-------
1 files changed, 100 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java b/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java
index 830a467..dc803d3 100644
--- a/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java
+++ b/src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java
@@ -1,22 +1,31 @@
package com.yeshi.buwan.controller.admin.api;
import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import javax.annotation.Resource;
import com.google.common.base.Function;
import com.google.common.collect.Maps;
import com.google.gson.Gson;
+import com.yeshi.buwan.domain.HomeVideo;
+import com.yeshi.buwan.domain.VideoResource;
import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
+import com.yeshi.buwan.domain.solr.SolrShortVideo;
+import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.domain.video.VideoInfoExtra;
import com.yeshi.buwan.dto.search.SolrResultDTO;
+import com.yeshi.buwan.dto.search.SolrShortVideoSearchFilter;
import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
-import com.yeshi.buwan.iqiyi.IqiYiNewAPI;
+import com.yeshi.buwan.exception.video.IqiyiVideoSolrException;
+import com.yeshi.buwan.videos.iqiyi.IqiYiNewAPI;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil2;
+import com.yeshi.buwan.service.imp.VideoResourceService;
+import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service;
import com.yeshi.buwan.service.inter.video.VideoInfoExtraService;
-import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrInternetSearchVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
import com.yeshi.buwan.util.Constant;
import com.yeshi.buwan.vo.video.VideoAdminInfoVO;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -25,11 +34,9 @@
import org.springframework.web.bind.annotation.RequestMethod;
import com.google.gson.GsonBuilder;
-import com.yeshi.buwan.acFun.AcFunUtil;
import com.yeshi.buwan.domain.VideoInfo;
-import com.yeshi.buwan.iqiyi.util.IqiyiUtil;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil;
import com.yeshi.buwan.service.imp.ClassService;
-import com.yeshi.buwan.service.imp.ResourceVideoService;
import com.yeshi.buwan.service.imp.VideoManager;
import com.yeshi.buwan.util.JsonUtil;
import com.yeshi.buwan.util.StringUtil;
@@ -48,14 +55,13 @@
@Resource
private ClassService classService;
+
@Resource
- private ResourceVideoService resourceVideoService;
+ private VideoResourceService videoResourceService;
@Resource
private IqiyiUtil iqiyiUtil;
- @Resource
- private AcFunUtil acFunUtil;
@Resource
private ThreadPoolTaskExecutor taskExecutor;
@@ -64,7 +70,20 @@
private SolrAlbumVideoDataManager solrAlbumDataManager;
@Resource
+ private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager;
+
+ @Resource
+ private SolrShortVideoDataManager solrShortVideoDataManager;
+
+
+ @Resource
private VideoInfoExtraService videoInfoExtraService;
+
+ @Resource
+ private Iqiyi2Service iqiyi2Service;
+
+ @Resource
+ private IqiyiUtil2 iqiyiUtil2;
@RequestMapping(value = "/changevideoshow", method = RequestMethod.POST)
public void changeVideoShow(String id, int show, PrintWriter out) {
@@ -92,7 +111,7 @@
}
@RequestMapping(value = "/videolist", method = RequestMethod.POST)
- public void videoList(int videotype, int page, String key, String type, String resourceIds, int contenttype, String freeType, PrintWriter out) {
+ public void videoList(int videotype, int page, String key, String type, String resourceIds, int fromtype, int contenttype, String freeType, String area, PrintWriter out) {
if (StringUtil.isNullOrEmpty(type)) {
type = "name";
@@ -132,18 +151,59 @@
for (int i = 0; i < array.size(); i++) {
rids[i] = array.optString(i);
}
- filter.setResourceIds(rids);
+ filter.setResourceIds(Arrays.asList(rids));
}
filter.setSortKey("updateTime");
filter.setFreeType(freeTypeInt);
- SolrResultDTO dto = solrAlbumDataManager.find(filter, page, Constant.pageCount);
- if (dto.getVideoList() != null)
- for (SolrAlbumVideo videoInfo : (List<SolrAlbumVideo>) dto.getVideoList())
- voList.add(VideoAdminInfoVO.create(videoInfo));
- count = dto.getTotalCount();
+ filter.setArea(StringUtil.isNullOrEmpty(area) ? null : area.trim());
+
+ List<VideoResource> resourceList = videoResourceService.getResourceList();
+ Map<Long, String> resourceMap = new HashMap<>();
+ for (VideoResource vr : resourceList) {
+ resourceMap.put(Long.parseLong(vr.getId()), vr.getName());
+ }
+ if (fromtype == HomeVideo.FROM_TYPE_LOCAL) {
+ SolrResultDTO dto = solrAlbumDataManager.find(filter, page, Constant.pageCount);
+ if (dto.getVideoList() != null)
+ for (SolrAlbumVideo videoInfo : (List<SolrAlbumVideo>) dto.getVideoList())
+ voList.add(VideoAdminInfoVO.create(videoInfo, resourceMap));
+ count = dto.getTotalCount();
+ } else if (fromtype == HomeVideo.FROM_TYPE_INTERNET) {
+ SolrResultDTO dto = solrInternetSearchVideoDataManager.find(filter, page, Constant.pageCount);
+ if (dto.getVideoList() != null)
+ for (InternetSearchVideo videoInfo : (List<InternetSearchVideo>) dto.getVideoList())
+ voList.add(VideoAdminInfoVO.create(videoInfo, resourceMap));
+ count = dto.getTotalCount();
+ } else if (fromtype == HomeVideo.FROM_TYPE_SHORT) {
+ SolrShortVideoSearchFilter shortFilter = new SolrShortVideoSearchFilter();
+ shortFilter.setRootVideoType(filter.getVideoType());
+ if (!StringUtil.isNullOrEmpty(key)) {
+ String[] keys = key.split(" ");
+ if (!StringUtil.isNullOrEmpty(keys[0]))
+ shortFilter.setTag(keys[0].trim());
+ if (keys.length > 1) {
+ shortFilter.setKey(key.substring(key.indexOf(keys[0])).trim());
+ }
+ }
+
+
+ if (!StringUtil.isNullOrEmpty(filter.getArea())) {
+ shortFilter.setAreas(Arrays.asList(new String[]{filter.getArea()}));
+ //鏌愪簺鐭棰戝垎绫讳负鏃ラ煩
+ if (filter.getArea().equalsIgnoreCase("闊╁浗")) {
+ shortFilter.getAreas().add("鏃ラ煩");
+ }
+ }
+ shortFilter.setFuzzy(true);
+ SolrResultDTO dto = solrShortVideoDataManager.find(shortFilter, page, Constant.pageCount);
+ if (dto.getVideoList() != null)
+ for (SolrShortVideo videoInfo : (List<SolrShortVideo>) dto.getVideoList())
+ voList.add(VideoAdminInfoVO.create(videoInfo, resourceMap));
+ count = dto.getTotalCount();
+ }
} else {
list = classService.getTypeVideoListAdmin(videotype == 0 ? "" : videotype + "", page, key,
contenttype);
@@ -170,8 +230,16 @@
for (VideoAdminInfoVO a : voList) {
VideoInfoExtra extra = maps.get(a.getId());
if (extra != null) {
- if (!StringUtil.isNullOrEmpty(extra.gethPosterPicture()))
- a.setPicture(extra.gethPosterPicture());
+
+ if (a.getHpicture() != null) {
+ if (!StringUtil.isNullOrEmpty(extra.gethPosterPicture()))
+ a.setHpicture(extra.gethPosterPicture());
+ }
+
+ if (a.getVpicture() != null) {
+ if (!StringUtil.isNullOrEmpty(extra.getvPosterPicture()))
+ a.setVpicture(extra.getvPosterPicture());
+ }
}
}
@@ -204,7 +272,18 @@
if (StringUtil.isNullOrEmpty(aid)) {
out.print(JsonUtil.loadFalseAdmin("鏈兘鑾峰彇鍒颁笓杈�"));
} else {
- iqiyiUtil.updateAlbum(aid);
+ try {
+ iqiyi2Service.validAlbumSolrState(Long.parseLong(aid));
+ iqiyiUtil2.syncByAid(Long.parseLong(aid),false);
+ } catch (IqiyiVideoSolrException e) {
+ if (e.getCode() == IqiyiVideoSolrException.CODE_ALBUM_NOT_SAVE ||
+ e.getCode() == IqiyiVideoSolrException.CODE_ALBUM_NOT_EXIST || e.getCode() == IqiyiVideoSolrException.CODE_ALBUM_NOT_ADD_TO_VIDEO) {
+ iqiyiUtil2.syncByAid(Long.parseLong(aid),false);
+ } else {
+ out.print(JsonUtil.loadFalseAdmin(e.getMsg()));
+ return;
+ }
+ }
out.print(JsonUtil.loadTrueAdmin("涓撹緫鏇存柊鎴愬姛"));
}
}
--
Gitblit v1.8.0