bug修复

admin

2022-04-16 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3

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

@@ -13,6 +13,7 @@
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.statistic.video.VideoDetailStatisticData;
import com.yeshi.buwan.exception.video.VideoPlayException;
import com.yeshi.buwan.service.inter.video.VideoResourceInfoMapService;
import com.yeshi.buwan.service.manager.APPManager;
import com.yeshi.buwan.videos.mogotv.MogoTVUtil;
import com.yeshi.buwan.videos.pptv.PPTVApiUtil;
@@ -120,6 +121,9 @@

    @Resource
    private APPManager appManager;

    @Resource
    private VideoResourceInfoMapService videoResourceInfoMapService;

    private final Logger userPlayLogger = LoggerFactory.getLogger("videoPlayUser");

@@ -668,6 +672,9 @@

    //视频过滤
    private void filterVideo(AcceptData acceptData, VideoInfo video) {
        //过滤视频资源
        List<VideoResource> resourceList = videoResourceInfoMapService.filter(acceptData.getDetailSystem().getId(), video.getResourceList());
        video.setResourceList(resourceList);
        //控制前端列表中的来源显示问题
        if ("48".equalsIgnoreCase(acceptData.getDetailSystem().getId())) {
            if (video.getArea() != null && video.getArea().contains("韩国")) {
@@ -894,7 +901,6 @@
        //视频过滤
        filterVideo(acceptData, info);

        UserInfo user = userService.getUserInfo(acceptData.getUid());
        if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
            String sessionId = createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId);

@@ -915,6 +921,208 @@
    }


    @RequireUid
    public void getVideoDetailNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        String videoId = request.getParameter("VideoId");
        if (!NumberUtil.isNumeric(videoId)) {
            String[] cidVid = PPTVUtil.parseCidAndVidFromVisualVideoId(videoId);
            if (cidVid == null) {
                int fromType = VideoUtil.getVideoFromType(videoId);
                //短视频
                if (fromType == HomeVideo.FROM_TYPE_SHORT) {
                    getVideoDetailForShortVideo(acceptData, videoId, request, out);
                    return;
                } else if (fromType == HomeVideo.FROM_TYPE_INTERNET) {
                    getVideoDetailForInternetSearch(acceptData, videoId, request, out);
                    return;
                }
            }
            String cid = cidVid[0];
            String vid = cidVid[1];

            PPTVSeries series = pptvService.getSeriesDetail(cid);
            if (series == null) {
                series = PPTVApiUtil.getDetail(cid);
            }

            if (series != null) {
                JSONObject data = new JSONObject();
                String playUrl = PPTVUtil.getPlayUrl(series, pptvService.selectProgramById(vid));
                data.put("videoId", videoId);
                data.put("playUrl", playUrl);
                data.put("name", series.getName());
                data.put("vip", PPTVUtil.isVIPVideo(series.getFree()));
                JSONObject pptv = new JSONObject();
                pptv.put("pptv", data);
                out.print(JsonUtil.loadTrueJson(pptv.toString()));
            } else {
                out.print(JsonUtil.loadFalseJson("已下线"));
            }

            return;
        }

        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("请上传VideoId"));
            return;
        }
        if (StringUtil.isNullOrEmpty(thirdType)) {
            out.print(JsonUtil.loadFalseJson("请上传Type"));
            return;
        }

        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());

        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());

        //获取优先展示的渠道
        if (StringUtil.isNullOrEmpty(resourceId)) {
            Set<Long> rids = new HashSet<>();
            rids.addAll(resourceList);
            VideoResource defaultVideoResource = resourceVideoService.getDefaultVideoResource(videoId, rids);
            if (defaultVideoResource != null) {
                resourceId = defaultVideoResource.getId();
            }
            //视频没有来源
            if (StringUtil.isNullOrEmpty(resourceId)) {
                CMQManager.getInstance().addVideoResourceDeleteMsg(videoId);
                out.print(JsonUtil.loadFalseJson("视频已下线"));
                return;
            }
        }

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

        userPlayLogger.info(VideoLogFactory.createUserVideoDetailLog(acceptData.getDevice(), acceptData.getUtdId(), loginUid, acceptData.getDetailSystem().getId(), videoId, resourceId, from));


        //PPTV网页播放
        if (!StringUtil.isNullOrEmpty(resourceId) && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
            JSONObject data = new JSONObject();
            VideoPPTVMap map = pptvService.getVideoPPTVMapByVideoId(videoId);
            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();
                }
            }

            String videoName = "";
            String playUrl = null;

            PPTVSeries series = pptvService.getSeriesDetail(map.getInfoId());

            if (map.getProgramCode() != null) {
                PPTVProgram program = pptvService.selectProgramById(map.getProgramCode());
                videoName = program.getProgramSetTiltle();
                playUrl = PPTVUtil.getPlayUrl(series, program);
            } else {
                videoName = series.getName();
                p = p >= series.getSeries().size() ? 0 : p;
                playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(p));
            }

            String sessionId = createVideoDetailSessionId(acceptData, loginUid, videoName, videoId, resourceId);
            data.put("videoId", videoId);
            data.put("playUrl", playUrl);
            data.put("name", videoName);
            data.put("pptv", true);
            data.put("vip", "1".equalsIgnoreCase(series.getFree()));
            data.put("sessionId", sessionId);
            out.print(JsonUtil.loadTrueJson(data.toString()));
            LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, series.getName(), from));

            ThreadUtil.run(new Runnable() {
                @Override
                public void run() {
                    //看PP视频
                    deviceAdStrategyService.watchPPTVVideo(acceptData.getUtdId(), acceptData.getDetailSystem().getId());
                }
            });
            return;
        }


        VideoInfo info = videoDeailUtil.getVideoInfo(detailSystem.getId(), videoId, resourceId, resourceList,
                CacheUtil.getMD5Long(resourceList));
        LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, info != null ? info.getName() : "", from));

        List<VideoType> typeList = classService.getVideoTypeList(info.getId());
        if (typeList != null && typeList.size() > 0) {
            VideoType type = typeList.get(0);
            while (type.getParent() != null)
                type = type.getParent();
            info.setVideoType(type);
        }

        info.setPlayPicture(VideoPictureUtil.getShowPicture(info, acceptData.getPlatform(), acceptData.getVersion() + ""));

        if (info.getVideoDetailList() != null)
            for (VideoDetailInfo vd : info.getVideoDetailList()) {
                if (StringUtil.isNullOrEmpty(vd.getExtraId()))
                    vd.setExtraId(vd.getId() + "");
            }
        info.setCommentCount(0);


        VideoDetailVO.AttentionInfo attention = null;
        if (info.getVideoDetailList() != null)
            if (info.getVideoDetailList().size() > 1) {// 多集,可关注
                boolean isAttention = false;
                if (!StringUtil.isNullOrEmpty(loginUid)) {
                    isAttention = attentionService.isAddAttention(loginUid, info.getId());
                }
                attention = new VideoDetailVO.AttentionInfo();
                attention.setName(info.getName());
                attention.setPicture(info.getPicture());
                if (StringUtil.isNullOrEmpty(info.getUpdatetime())) {
                    attention.setUpdateInfo("更新:" + TimeUtil.getCommentTime(info.getCreatetime()));
                } else {
                    attention.setUpdateInfo("更新:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
                }
                attention.setAttention(isAttention);
            }

        //视频过滤
        filterVideo(acceptData, info);
        String sessionId = createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId);
        out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), acceptData.getVersion(), acceptData.getChannel(), loginUid, videoId, from), attention, sessionId))));

        ThreadUtil.run(new Runnable() {
            @Override
            public void run() {
                long showTime = TimeUtil.convertGernalTime(TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"), "yyyy-MM-dd");
                deviceAdStrategyService.setShortVideoAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), videoId, from, showTime, null);
            }
        });
    }


    /**
     * 获取视频的剧集列表
     *