韩迷TV相关bug修改，电视直播完善（后台+前端API）

admin

2021-09-03 b41a6efe17ba61d150c5a9b7309651cebae54e0d

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

@@ -25,6 +25,7 @@
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;

@Controller
@@ -87,8 +88,42 @@

        int pageSize = Constant.pageCount;
        boolean hasNextPage = false;
        if (searchSpecial.getAlbumQuery() != null) {
            SolrResultDTO solrResultDTO = solrAlbumVideoDataManager.find(searchSpecial.getAlbumQuery(), pageIndex, pageSize);

        //获取搜索条件
        SearchSpecial.QueryConditions conditions = null;

        if (searchSpecial.getContainerList() != null) {
            //按version排序
            Comparator<SearchSpecial.QueryConditionsContainer> cm = (o1, o2) -> o1.getMinVersion() - o2.getMinVersion();
            Collections.sort(searchSpecial.getContainerList(), cm);


            for (SearchSpecial.QueryConditionsContainer container : searchSpecial.getContainerList()) {
                if (acceptData.getDetailSystem().getId().equalsIgnoreCase(container.getDetailSystemId())) {
                    if (acceptData.getVersion() >= container.getMinVersion()) {
                        if (acceptData.getChannel().equalsIgnoreCase(container.getChannel())) {
                            conditions = container.getQueryConditions();
                            break;
                        }
                    }
                }
            }

            if (conditions == null) {
                for (SearchSpecial.QueryConditionsContainer container : searchSpecial.getContainerList()) {
                    if (acceptData.getDetailSystem().getId().equalsIgnoreCase(container.getDetailSystemId())) {
                        if (acceptData.getVersion() >= container.getMinVersion()) {
                            conditions = container.getQueryConditions();
                            break;
                        }
                    }
                }
            }
        }


        if (conditions.getAlbumQuery() != null) {
            SolrResultDTO solrResultDTO = solrAlbumVideoDataManager.find(conditions.getAlbumQuery(), pageIndex, pageSize);
            if (solrResultDTO != null) {
                List<SolrAlbumVideo> list = solrResultDTO.getVideoList();
                if (list != null) {
@@ -102,8 +137,8 @@
            }
        }

        if (searchSpecial.getInternetQuery() != null) {
            SolrResultDTO solrResultDTO = solrInternetSearchVideoDataManager.find(searchSpecial.getInternetQuery(), pageIndex, pageSize);
        if (conditions.getInternetQuery() != null) {
            SolrResultDTO solrResultDTO = solrInternetSearchVideoDataManager.find(conditions.getInternetQuery(), pageIndex, pageSize);
            if (solrResultDTO != null) {
                List<InternetSearchVideo> list = solrResultDTO.getVideoList();
                if (list != null) {
@@ -117,8 +152,8 @@
            }
        }

        if (searchSpecial.getShortQuery() != null) {
            SolrResultDTO solrResultDTO = solrShortVideoDataManager.find(searchSpecial.getShortQuery(), pageIndex, pageSize);
        if (conditions.getShortQuery() != null) {
            SolrResultDTO solrResultDTO = solrShortVideoDataManager.find(conditions.getShortQuery(), pageIndex, pageSize);
            if (solrResultDTO != null) {
                List<SolrShortVideo> list = solrResultDTO.getVideoList();
                if (list != null) {
@@ -159,7 +194,15 @@
            item.put("name", StringUtil.isNullOrEmpty(map.getShowName()) ? map.getSpecial().getName() : map.getShowName());
            item.put("id", map.getSpecialId());
            item.put("icon", map.getIcon());
            array.add(item);
            String name = item.optString("name");
            //魅族和小米不添加
            if (("xiaomi" .equalsIgnoreCase(acceptData.getChannel()) || "meizu" .equalsIgnoreCase(acceptData.getChannel())) && "hanju-video-types" .equalsIgnoreCase(pid)) {
                if (name.contains("电视剧") || name.contains("电影") || name.contains("综艺") || name.contains("少儿")) {
                    array.add(item);
                }
            } else {
                array.add(item);
            }
        }
        JSONObject data = new JSONObject();
        data.put("list", array);