接口bug修改

admin

2021-02-06 cad915058c3c53bf328a8ae9ca9bc7de099caba7

 src/main/java/com/yeshi/buwan/controller/parser/HomeParser.java

@@ -7,11 +7,15 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.xxl.rpc.util.ThreadPoolUtil;
import com.yeshi.buwan.domain.*;
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.vo.AcceptData;
import org.apache.commons.httpclient.HttpClient;
@@ -20,14 +24,6 @@
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;
@@ -75,6 +71,9 @@

    @Resource
    private PPTVService pptvService;

    @Resource
    private VideoWatchHistoryService videoWatchHistoryService;

    @RequireUid
    public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -323,6 +322,7 @@
        String resourceId = request.getParameter("ResourceId");
        String thirdType = request.getParameter("Type");
        String loginUid = request.getParameter("LoginUid");
        String position = request.getParameter("Position");

        if (StringUtil.isNullOrEmpty(videoId)) {
            out.print(JsonUtil.loadFalseJson("请上传VideoId"));
@@ -347,11 +347,36 @@
            }
        }

        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);
            }
        });


        //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);
            }

            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);