删除冗余代码，初步优化首页的推荐专题，3.8.7之后在我的里面添加VIP分类

admin

2021-03-10 f7b2baec57a19039ca85880bbba4e17fe27f0511

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

@@ -2,6 +2,7 @@

import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.Collection;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.dto.user.LoginInfoDto;
import com.yeshi.buwan.exception.user.LoginUserException;
@@ -32,7 +33,7 @@
    @Resource
    private SystemService systemService;
    @Resource
    private ConfigService configService;
    private DetailSystemConfigService configService;
    @Resource
    private UserService userService;
    @Resource
@@ -198,7 +199,7 @@
    private List<VideoDetailInfo> createSearchVideoDetailsVO(VideoInfo video) {
        List<VideoDetailInfo> detailList = new ArrayList<>();
        if (video.getVideoType() != null && (Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DIANSHIJU || Integer.parseInt(video.getVideoType().getId() + "") == VideoCategoryConstant.CATEGORY_DONGMAN)) {
            if (video.getVideocount() <= 5) {
            if (video.getVideocount()!=null&& video.getVideocount() <= 5) {
                for (int i = 0; i < video.getVideocount(); i++) {
                    VideoDetailInfo detail = new VideoDetailInfo();
                    detail.setTag((i + 1) + "");
@@ -353,24 +354,14 @@
            pageIndex = 1;
        }

        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
        UserInfo user1 = userService.getUserInfo(acceptData.getUid());
        if (Utils.isTest(request, user1, detailSystem.getId())) {
            detailSystem = systemService.getDetailSystemById(40 + "");
            JSONObject object = new JSONObject();
            object.put("count", 0);
            JSONArray array = new JSONArray();
            object.put("data", array);
            out.print(JsonUtil.loadTrueJson(object.toString()));
        } else {
            List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
            String cacheMD5 = "0";
            if (resourceList != null && resourceList.size() > 0)
                for (Long l : resourceList)
                    cacheMD5 += "#" + l;
            cacheMD5 = StringUtil.Md5(cacheMD5);

            VideoListResultVO videoListResultVO = searchService.searchNew(detailSystem.getId(), request.getRemoteAddr(),
        VideoListResultVO videoListResultVO = searchService.searchNew(acceptData.getDetailSystem().getId(), request.getRemoteAddr(),
                    acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
                    acceptData.getSystem(), resourceList, cacheMD5);
            //组织数据
@@ -386,34 +377,17 @@
                    cacheMD5 += info.getId() + "#";
                }
            }
            List<VideoInfo> list = banQuanService.getBanQuanVideo(videoListResultVO.getVideoList(), detailSystem.getId(), cacheMD5);
        List<VideoInfo> list = banQuanService.getBanQuanVideo(videoListResultVO.getVideoList(), acceptData.getDetailSystem().getId(), cacheMD5);

            JSONObject object = new JSONObject();
            object.put("count", Constant.isUpdate ? 19 + "" : videoListResultVO.getCount());
            JSONArray array = new JSONArray();
            for (int i = 0; i < list.size(); i++) {
                if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), detailSystem.getId())) {
            if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), acceptData.getDetailSystem().getId())) {
                    list.remove(i);
                    i--;
                }
            }
//
//            List<String> keyList = banQuanService.getBanQuanKeyListAll(Integer.parseInt(detailSystem.getId()));
//            for (int i = 0; i < list.size(); i++) {
//
//                boolean delete = false;
//                for (int j = 0; j < keyList.size(); j++) {
//                    if (list.get(i).getName().contains(keyList.get(j))) {
//                        delete = true;
//                        break;
//                    }
//                }
//                if (delete) {
//                    list.remove(i);
//                    i--;
//                }
//
//            }

            for (int i = 0; i < list.size(); i++) {
                ((VideoInfo) list.get(i))
@@ -450,7 +424,7 @@
            }

            out.print(JsonUtil.loadTrueJson(object.toString()));
        }

    }