From 7becc97c5bfdd827b9a999c26746bb8e8bc3e25c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 13 三月 2021 16:23:36 +0800
Subject: [PATCH] 后台会员/会员订单查询,搜索结果高清标签添加,

---
 src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java |   76 +++++++++++++++++++++++++++----------
 1 files changed, 55 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
index 689ca09..c04f028 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java
@@ -8,26 +8,26 @@
 import javax.servlet.http.HttpServletRequest;
 
 import com.yeshi.buwan.domain.*;
+import com.yeshi.buwan.domain.system.DetailSystemConfig;
+import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.domain.video.VideoWatchHistory;
 import com.yeshi.buwan.pptv.PPTVUtil;
 import com.yeshi.buwan.pptv.entity.PPTVSeries;
 import com.yeshi.buwan.service.imp.*;
 import com.yeshi.buwan.service.inter.juhe.PPTVService;
+import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
+import com.yeshi.buwan.util.*;
 import com.yeshi.buwan.util.annotation.RequireUid;
+import com.yeshi.buwan.util.log.VideoLogFactory;
 import com.yeshi.buwan.vo.AcceptData;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
 import org.apache.commons.httpclient.methods.GetMethod;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Controller;
 
 import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.util.CacheUtil;
-import com.yeshi.buwan.util.Constant;
-import com.yeshi.buwan.util.JsonUtil;
-import com.yeshi.buwan.util.JuheVideoUtil;
-import com.yeshi.buwan.util.StringUtil;
-import com.yeshi.buwan.util.TimeUtil;
-import com.yeshi.buwan.util.Utils;
-import com.yeshi.buwan.util.VideoPictureUtil;
 import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
 import com.yeshi.buwan.util.video.VideoDetailUtil;
 import com.yeshi.buwan.util.zhibo.MeiNvZhiBoUtil;
@@ -44,7 +44,7 @@
     @Resource
     private HomeTypeService homeTypeService;
     @Resource
-    private ConfigService configService;
+    private DetailSystemConfigService configService;
     @Resource
     private AdService adService;
     @Resource
@@ -75,6 +75,11 @@
 
     @Resource
     private PPTVService pptvService;
+
+    @Resource
+    private VideoWatchHistoryService videoWatchHistoryService;
+
+    private final Logger playLogger = LoggerFactory.getLogger("videoPlay");
 
     @RequireUid
     public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -120,14 +125,6 @@
                     if (!StringUtil.isNullOrEmpty(ad.getParams())) {
                         ad.setParams(ad.getParams().replace("\"", "\\" + "\""));
                     }
-
-                    // 3.4.7浠ヤ笂鐨勭増鏈墠鍙互鐢�
-                    // com.weikou.beibeivideo.ui.mine.FXBrowserActivity
-                    if ("com.weikou.beibeivideo.ui.mine.FXBrowserActivity".equalsIgnoreCase(ad.getClazz())
-                            && acceptData.getVersion() < 71)
-                        ad.setClazz("com.weikou.beibeivideo.ui.mine.BrowserActivity");
-                    else
-                        ad.setClazz("com.weikou.beibeivideo.ui.mine.FXBrowserActivity");
                 }
                 object.put("count", (new StringBuilder(String.valueOf(list.size()))).toString());
                 JSONArray array = new JSONArray();
@@ -154,10 +151,11 @@
         if (StringUtil.isNullOrEmpty(vtid)) {
             vtid = "309"; // 涓轰簡鍏煎浠ュ墠鐨勬帹鑽�
         }
+
         DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
         JSONObject object = new JSONObject();
 
-        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
         List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), resourceList,
                 CacheUtil.getMD5Long(resourceList), -1, Long.parseLong(vtid));
         List<HomeType> list = new ArrayList<>();
@@ -238,6 +236,7 @@
         object.put("data", array);
         out.print(JsonUtil.loadTrueJson(object.toString()));
     }
+
 
 
     public HomeType convertHomeVideoList(HomeType type) {
@@ -323,6 +322,8 @@
         String resourceId = request.getParameter("ResourceId");
         String thirdType = request.getParameter("Type");
         String loginUid = request.getParameter("LoginUid");
+        String position = request.getParameter("Position");
+        String from = request.getParameter("From");
 
         if (StringUtil.isNullOrEmpty(videoId)) {
             out.print(JsonUtil.loadFalseJson("璇蜂笂浼燰ideoId"));
@@ -335,7 +336,7 @@
 
         DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
 
-        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
+        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
 
         //鑾峰彇浼樺厛灞曠ず鐨勬笭閬�
         if (StringUtil.isNullOrEmpty(resourceId)) {
@@ -347,11 +348,44 @@
             }
         }
 
+        ThreadUtil.run(new Runnable() {
+            @Override
+            public void run() {
+                int p = 0;
+                if (!StringUtil.isNullOrEmpty(position)) {
+                    p = Integer.parseInt(position);
+                }
+
+                VideoWatchHistory history = new VideoWatchHistory();
+                history.setDevice(acceptData.getDevice());
+                history.setVideoId(videoId);
+                history.setUid(loginUid);
+                history.setPosition(p);
+                videoWatchHistoryService.add(history);
+            }
+        });
+
+        playLogger.info(VideoLogFactory.createUserVideoDetailLog(acceptData.getDevice(), loginUid, acceptData.getDetailSystem().getId(), videoId, resourceId, from));
+
+
         //PPTV缃戦〉鎾斁
         if (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
             JSONObject data = new JSONObject();
             PPTVSeries series = pptvService.getSeriesDetailByVideoId(videoId);
-            String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(0));
+            int p = 0;
+            if (!StringUtil.isNullOrEmpty(position)) {
+                p = Integer.parseInt(position);
+            } else {
+                //鍙栨挱鏀捐褰�
+                VideoWatchHistory history = videoWatchHistoryService.getWatchHistory(acceptData.getDevice(), videoId);
+                if (history != null && history.getPosition() != null) {
+                    p = history.getPosition();
+                }
+            }
+
+            p = p >= series.getSeries().size() ? 0 : p;
+
+            String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(p));
             data.put("videoId", videoId);
             data.put("playUrl", playUrl);
             data.put("pptv", true);
@@ -552,7 +586,7 @@
 
     public void isPraise(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
         DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
-        Config config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
+        DetailSystemConfig config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
         if ("鏄�".equals(config.getValue())) {
             out.print(JsonUtil.loadTrueJson("1"));
         } else {

--
Gitblit v1.8.0