热搜榜，栏目编辑优化

admin

2021-04-07 35a29882f356542dd9c431714c64d277eb7cad40

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

@@ -289,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();
@@ -321,15 +363,24 @@

        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
        //查询大图
        List<HomeVideo> bigPictureVideos = homeTypeService.getHomeVideoList(homeTypeId, resourceList, true, 1, homeType.getNumber());
        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, resourceList, null);
        List<HomeVideo> list1 = homeTypeService.getHomeVideoList(homeTypeId, resourceList, false, page, homeType.getNumber());
        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);
@@ -458,13 +509,21 @@
        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);
@@ -475,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()));
@@ -483,13 +542,16 @@
            }
        } 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()));
                return;
            }
        }

        if (info != null)
            info.setPageSize(pageSize);

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

@@ -590,6 +652,16 @@
            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;
        }

@@ -670,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"));
@@ -684,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();