热搜榜，栏目编辑优化

admin

2021-04-07 35a29882f356542dd9c431714c64d277eb7cad40

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

@@ -18,15 +18,18 @@
import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.domain.video.VideoWatchHistory;
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.statistic.video.VideoDetailStatisticData;
import com.yeshi.buwan.mogotv.MogoTVUtil;
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.ad.DeviceAdStrategyService;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.inter.juhe.PPTVService;
import com.yeshi.buwan.service.inter.juhe.YouKuService;
import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
import com.yeshi.buwan.service.manager.VideoPlayStatisticManager;
import com.yeshi.buwan.tencent.TencentVideoUtil;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.annotation.RequireUid;
@@ -35,6 +38,7 @@
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.log.VideoLogFactory;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoDetailVO;
import com.yeshi.buwan.youku.YouKuUtil;
import com.yeshi.buwan.youku.entity.YouKuSearchVideoMap;
import com.yeshi.buwan.youku.entity.YouKuShowDetail;
@@ -102,6 +106,9 @@

    @Resource
    private HomeRecommendSpecialService homeRecommendSpecialService;

    @Resource
    private DeviceAdStrategyService deviceAdStrategyService;

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

@@ -185,7 +192,7 @@
        JSONObject object = new JSONObject();

        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
        List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), resourceList,
        List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), acceptData.getPlatform(), acceptData.getVersion(), resourceList,
                CacheUtil.getMD5Long(resourceList), -1, special != null ? special.getDataKey() : null);
        List<HomeType> list = new ArrayList<>();
        for (HomeType ht : list1)
@@ -282,6 +289,48 @@
    }


    // 首页类型获取
    public void getHomeTypeNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        // 20170914 一级视频分类ID
        String page = request.getParameter("Page");
        String pageSize = request.getParameter("PageSize");
        String dataKey = request.getParameter("DataKey");

        long count = homeTypeService.countHomeType(acceptData.getDetailSystem().getId(), acceptData.getVersion(), dataKey);

        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
        List<HomeType> homeTypeList = homeTypeService.getHomeTypeList(acceptData.getDetailSystem().getId(), acceptData.getVersion(), dataKey, Integer.parseInt(page), Integer.parseInt(pageSize));

        if (homeTypeList != null)
            for (HomeType homeType : homeTypeList) {
                String resourceKey = StringUtil.Md5(org.yeshi.utils.StringUtil.concat(resourceList, ","));
                List<HomeVideo> homeVideoList = homeTypeService.getHomeVideoList(homeType.getId(), resourceKey, resourceList, null, 1, homeType.getNumber());
                long videoCount = homeTypeService.getHomeVideoListCount(homeType.getId(), resourceKey, resourceList, null);
                long bigPictureCount = homeTypeService.getHomeVideoListCount(homeType.getId(), resourceKey, resourceList, true);
                if (videoCount - bigPictureCount > homeType.getNumber()) {
                    while ((videoCount - bigPictureCount) % homeType.getNumber() != 0) {
                        videoCount--;
                    }
                }
                homeType.setCount((int) videoCount);
                List<HomeVideo> tempHomeVideoList = new ArrayList<>();
                tempHomeVideoList.addAll(homeVideoList);
                while (tempHomeVideoList != null && (tempHomeVideoList.size() - bigPictureCount) % homeType.getColumns() != 0)
                    tempHomeVideoList.remove(tempHomeVideoList.size() - 1);

                homeType.setHomeVideoList(tempHomeVideoList);
            }

        JSONObject object = new JSONObject();
        JSONArray array = new JSONArray();
        for (int i = 0; i < homeTypeList.size(); i++)
            array.add(StringUtil.outPutResultJson(homeTypeList.get(i)));
        object.put("data", array);
        object.put("count", count + "");
        out.print(JsonUtil.loadTrueJson(object.toString()));
    }


    public HomeType convertHomeVideoList(HomeType type) {
        List<VideoInfo> vlist = new ArrayList<VideoInfo>();
        List<HomeVideo> list = type.getHomeVideoList();
@@ -292,6 +341,66 @@
        type.setVideoList(vlist);
        return type;
    }


    // 首页类型获取
    public void getHomeVideoList(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {

        // 20170914 一级视频分类ID
        String homeTypeId = request.getParameter("Id");
        int page = Integer.parseInt(request.getParameter("Page"));

        if (StringUtil.isNullOrEmpty(homeTypeId)) {
            out.print(JsonUtil.loadFalseJson(""));
            return;
        }

        HomeType homeType = homeTypeService.getHomeTypeById(homeTypeId);
        if (homeType == null) {
            out.print(JsonUtil.loadFalseJson(""));
            return;
        }

        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
        //查询大图
        List<HomeVideo> bigPictureVideos = homeTypeService.getHomeVideoList(homeTypeId, org.yeshi.utils.StringUtil.concat(resourceList, ","), resourceList, true, 1, homeType.getNumber());


        //大图需要每次都返回

        JSONObject object = new JSONObject();
        String resourceKey = StringUtil.Md5(org.yeshi.utils.StringUtil.concat(resourceList, ","));

        Long count = homeTypeService.getHomeVideoListCount(homeTypeId, resourceKey, resourceList, null);
        if (count - bigPictureVideos.size() > homeType.getNumber()) {

            while ((count - bigPictureVideos.size()) % homeType.getNumber() != 0) {
                count--;
            }
        }


        List<HomeVideo> list1 = homeTypeService.getHomeVideoList(homeTypeId, resourceKey, resourceList, false, page, homeType.getNumber());
        List<HomeVideo> list = new ArrayList<>();
        list.addAll(bigPictureVideos);
        list.addAll(list1);
        JSONObject data = new JSONObject();
        object.put("count", count);
        JSONArray array = new JSONArray();
        for (int i = 0; i < list.size(); i++)
            array.add(StringUtil.outPutResultJson(list.get(i)));
        object.put("list", array);

        //判断是否还有下一页
        int totalPage = (int) ((count - bigPictureVideos.size()) % homeType.getNumber() == 0 ? (count - bigPictureVideos.size()) / homeType.getNumber() : (count - bigPictureVideos.size()) / homeType.getNumber() + 1);

        if (page >= totalPage) {
            page = 0;
        }
        object.put("page", page);
        out.print(JsonUtil.loadTrueJson(object.toString()));
    }


    @RequireUid
    public void getMoreVideo(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -371,19 +480,50 @@
    @Resource
    private TencentVideoUtil tencentVideoUtil;

    @Resource
    private VideoPlayStatisticManager videoPlayStatisticManager;


    private String createVideoDetailSessionId(AcceptData acceptData, String uid, String videoName, String videoId, String resourceId) {

        try {
            VideoDetailStatisticData data = new VideoDetailStatisticData();
            data.setDetailSystemId(acceptData.getDetailSystem().getId());
            data.setLoginUid(uid);
            data.setResourceId(Integer.parseInt(resourceId));
            data.setUtdId(acceptData.getUtdId());
            data.setVersion(acceptData.getVersion());
            data.setVideoId(videoId);
            data.setVideoName(videoName);

            return videoPlayStatisticManager.createVideoDetailSessionId(data);
        } catch (Exception e) {

        }
        return null;
    }


    public void getVideoDetailForInternetSearch(AcceptData acceptData, String videoId, HttpServletRequest request, PrintWriter out) {
        String loginUid = request.getParameter("LoginUid");
        String from = request.getParameter("From");
        InternetSearchVideo internetSearchVideo = internetSearchVideoService.selectByPrimaryKey(videoId);
        String resourceId = request.getParameter("ResourceId");
        String position = request.getParameter("Position");
        int pageSize = 100;
        if (!StringUtil.isNullOrEmpty(position)) {
            if (VersionUtil.isGraterThan391(acceptData.getPlatform(), acceptData.getVersion()))
                pageSize = (Integer.parseInt(position) / 100 + 1) * 100;
        }


        if (StringUtil.isNullOrEmpty(resourceId)) {
            resourceId = internetSearchVideo.getResourceIds().split(",")[0];
        }
        VideoInfo info = null;
        if (Integer.parseInt(resourceId) == YouKuUtil.RESOURCE_ID) {
            try {
                info = youKuUtil.getVideoInfo(internetSearchVideo);
                info = youKuUtil.getVideoInfo(internetSearchVideo, pageSize);

            } catch (Exception e) {
                logger.error("全网搜视频详情出错：" + videoId);
@@ -394,7 +534,7 @@

        } else if (Integer.parseInt(resourceId) == MogoTVUtil.RESOURCE_ID) {
            try {
                info = mogoTVUtil.getVideoInfo(internetSearchVideo);
                info = mogoTVUtil.getVideoInfo(internetSearchVideo, pageSize);
            } catch (Exception e) {
                logger.error("全网搜视频详情出错：" + videoId);
                out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
@@ -402,7 +542,7 @@
            }
        } else if (Integer.parseInt(resourceId) == TencentVideoUtil.RESOURCE_ID) {
            try {
                info = tencentVideoUtil.getVideoInfo(internetSearchVideo);
                info = tencentVideoUtil.getVideoInfo(internetSearchVideo, pageSize);
            } catch (Exception e) {
                logger.error("全网搜视频详情出错：" + videoId);
                out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
@@ -410,14 +550,23 @@
            }
        }

        userPlayLogger.info(VideoLogFactory.createUserVideoDetailLog(acceptData.getDevice(), acceptData.getUtdId(), loginUid, acceptData.getDetailSystem().getId(), videoId, resourceId, from));
        if (info != null)
            info.setPageSize(pageSize);

        LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, info.getName(), from));

        info.setWatchCount("" + (int) (Math.random() * 1000));

        JSONArray array = new JSONArray();
        JSONObject obj = new JSONObject();
        out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                obj.toString()));

        if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), deviceAdStrategyService.getVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), loginUid), null, createVideoDetailSessionId(acceptData, loginUid, info.getName(), videoId, resourceId))), array.toString(),
                    obj.toString()));
        } else {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                    obj.toString()));
        }
    }

    @RequireUid
@@ -494,13 +643,25 @@

            p = p >= series.getSeries().size() ? 0 : p;

            String sessionId = createVideoDetailSessionId(acceptData, loginUid, series.getName(), videoId, resourceId);
            String playUrl = PPTVUtil.getPlayUrl(series, series.getSeries().get(p));
            data.put("videoId", videoId);
            data.put("playUrl", playUrl);
            data.put("name", series.getName());
            data.put("pptv", true);
            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() {
                    //每天展示一次广告
                    long showTime = TimeUtil.convertGernalTime(TimeUtil.getGernalTime(System.currentTimeMillis() + 1000 * 60 * 60 * 24L, "yyyy-MM-dd"), "yyyy-MM-dd");

                    deviceAdStrategyService.setVideoDetailAdStrategy(acceptData.getUtdId(), acceptData.getDetailSystem().getId(), showTime, null);
                }
            });
            return;
        }

@@ -531,28 +692,41 @@
            info.setCommentCount((int) count);

        JSONObject obj = new JSONObject();
        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);

                //兼容老版本
                JSONObject attentionInfo = new JSONObject();
                attentionInfo.put("Name", info.getName());
                attentionInfo.put("Picture", info.getPicture());
                if (StringUtil.isNullOrEmpty(info.getUpdatetime()))
                    attentionInfo.put("UpdateInfo", "更新:" + TimeUtil.getCommentTime(info.getCreatetime()));
                else
                    attentionInfo.put("UpdateInfo", "更新:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
                attentionInfo.put("IsAttention", isAttention);
                attentionInfo.put("Picture", attention.getPicture());
                attentionInfo.put("Name", attention.getName());
                attentionInfo.put("UpdateInfo", attention.getUpdateInfo());
                attentionInfo.put("IsAttention", attention.isAttention());
                obj.put("Attention", attentionInfo);
            }
        UserInfo user = userService.getUserInfo(acceptData.getUid());
        if (Utils.isTest(request, user, detailSystem.getId()))
            out.print(JsonUtil.loadTrueJson(""));
        else
        if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
            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(), loginUid), attention, sessionId)), array.toString(),
                    obj.toString()));
        } else {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                    obj.toString()));
        }
    }


@@ -568,6 +742,7 @@
        String videoId = request.getParameter("VideoId");
        String resourceId = request.getParameter("ResourceId");
        String page = request.getParameter("Page");//页码
        String pageSize = request.getParameter("PageSize");//页

        if (StringUtil.isNullOrEmpty(videoId)) {
            out.print(JsonUtil.loadFalseJson("请上传VideoId"));
@@ -582,9 +757,13 @@
            out.print(JsonUtil.loadFalseJson("请上传Page"));
            return;
        }
        int pagesize = 100;
        if (!StringUtil.isNullOrEmpty(pageSize)) {
            pagesize = Integer.parseInt(pageSize);
        }


        List<VideoDetailInfo> list = videoDetailUtil.getVideoDetailList(videoId, new VideoResource(resourceId), Integer.parseInt(page), 100);
        List<VideoDetailInfo> list = videoDetailUtil.getVideoDetailList(videoId, new VideoResource(resourceId), Integer.parseInt(page), pagesize);
        if (list == null)
            list = new ArrayList<>();
        JSONObject data = new JSONObject();