From 010ef2a907e66efd4702443c06cdd18f8a7ffa5b Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 30 十月 2024 14:08:53 +0800
Subject: [PATCH] IP归属地查询接口集成
---
src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java | 31 +++++++++++++++++++------------
1 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java
index b1813cf..47afac2 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/web/WebHomeParser.java
@@ -8,13 +8,14 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
+import com.yeshi.buwan.exception.video.VideoPlayException;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
import org.springframework.stereotype.Controller;
import com.yeshi.buwan.domain.CategoryContry;
-import com.yeshi.buwan.domain.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.HomeAd;
import com.yeshi.buwan.domain.HomeType;
import com.yeshi.buwan.domain.HomeVideo;
@@ -35,7 +36,7 @@
import com.yeshi.buwan.service.imp.ClassService;
import com.yeshi.buwan.service.imp.CollectionService;
import com.yeshi.buwan.service.imp.CommentService;
-import com.yeshi.buwan.service.imp.ConfigService;
+import com.yeshi.buwan.service.imp.DetailSystemConfigService;
import com.yeshi.buwan.service.imp.HomeAdService;
import com.yeshi.buwan.service.imp.HomeTypeService;
import com.yeshi.buwan.service.imp.RecommendService;
@@ -71,7 +72,7 @@
@Resource
private HomeTypeService homeTypeService;
@Resource
- private ConfigService configService;
+ private DetailSystemConfigService configService;
@Resource
private AdService adService;
@Resource
@@ -123,6 +124,7 @@
String sign = request.getParameter("Sign");
String platform = request.getParameter("Platform");
String packageName = request.getParameter("Package");
+ String channel = request.getParameter("Channel");
if (StringUtil.isNullOrEmpty(method)) {
out.print(JsonUtil.loadFalseJson("璇蜂笂浼燤ethod"));
return;
@@ -148,7 +150,7 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
- List<HomeAd> list = homeAdService.getHomeAdList(detailSystem);
+ List<HomeAd> list = homeAdService.getHomeAdList(detailSystem, "recommend");
for (HomeAd ad : list) {
if (ad.getVideo() != null) {
@@ -164,7 +166,7 @@
array.add(StringUtil.outPutResultJson(list.get(i)));
object.put("homeAdList", array);
- object.put("homeTypeList", getHomeType(uid, platform, detailSystem.getId()));
+ object.put("homeTypeList", getHomeType(uid, platform, detailSystem.getId(), channel));
// 鎺掕
JSONObject rank = new JSONObject();
@@ -188,11 +190,11 @@
}
// 棣栭〉绫诲瀷鑾峰彇
- private JSONArray getHomeType(String uid, String platform, String detailsystemid) {
+ private JSONArray getHomeType(String uid, String platform, String detailsystemid, String channel) {
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1);
- List<HomeType> list1 = homeTypeService.getHomeType(detailsystemid, resourceList,
- CacheUtil.getMD5Long(resourceList), 10, 309);
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1, channel);
+ List<HomeType> list1 = homeTypeService.getHomeType(detailsystemid, platform, 1, resourceList,
+ CacheUtil.getMD5Long(resourceList), 10, "recommend");
List<HomeType> list = new ArrayList<>();
for (HomeType ht : list1)
list.add(ht);
@@ -389,7 +391,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1);
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), 1, null);
DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
List<VideoType> typeList = getFirstType(pid);
@@ -770,7 +772,7 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), Integer.parseInt(version));
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(new DetailSystem("44"), Integer.parseInt(version), null);
VideoInfo info = (videoDeailUtil.getVideoInfo(null, videoId, resourceId, resourceList,
CacheUtil.getMD5Long(resourceList)));
@@ -933,7 +935,12 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(packageName);
- PlayUrl pu = videoDeailUtil.getPlayUrl(null, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ PlayUrl pu = null;
+ try {
+ pu = videoDeailUtil.getPlayUrl(null, detailSystem.getId(), id, type, Integer.parseInt(resourceId), videoId);
+ } catch (VideoPlayException e) {
+ e.printStackTrace();
+ }
if (pu != null) {
if (!StringUtil.isNullOrEmpty(pu.getUrl()))
--
Gitblit v1.8.0