From cdc3690a0354e01b44852f4c9da3b7204128d2eb Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 13 八月 2021 18:46:36 +0800
Subject: [PATCH] 增加苹果内购回调日志，兼容苹果内购
---
src/main/java/com/yeshi/buwan/controller/admin/api/VideoAdminController.java | 21 +++++++++++++++------
1 files changed, 15 insertions(+), 6 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 8850d13..f2d04ca 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,22 @@
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.VideoResource;
import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
import com.yeshi.buwan.domain.video.VideoInfoExtra;
import com.yeshi.buwan.dto.search.SolrResultDTO;
import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
import com.yeshi.buwan.iqiyi.IqiYiNewAPI;
+import com.yeshi.buwan.service.imp.VideoResourceService;
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.util.Constant;
import com.yeshi.buwan.vo.video.VideoAdminInfoVO;
import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -50,6 +50,9 @@
@Resource
private ResourceVideoService resourceVideoService;
+
+ @Resource
+ private VideoResourceService videoResourceService;
@Resource
private IqiyiUtil iqiyiUtil;
@@ -132,7 +135,7 @@
for (int i = 0; i < array.size(); i++) {
rids[i] = array.optString(i);
}
- filter.setResourceIds(rids);
+ filter.setResourceIds(Arrays.asList(rids));
}
filter.setSortKey("updateTime");
@@ -141,10 +144,16 @@
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());
+ }
+
SolrResultDTO dto = solrAlbumDataManager.find(filter, page, Constant.pageCount);
if (dto.getVideoList() != null)
for (SolrAlbumVideo videoInfo : (List<SolrAlbumVideo>) dto.getVideoList())
- voList.add(VideoAdminInfoVO.create(videoInfo));
+ voList.add(VideoAdminInfoVO.create(videoInfo,resourceMap));
count = dto.getTotalCount();
} else {
list = classService.getTypeVideoListAdmin(videotype == 0 ? "" : videotype + "", page, key,
--
Gitblit v1.8.0