后台会员/会员订单查询，搜索结果高清标签添加，

admin

2021-03-13 7becc97c5bfdd827b9a999c26746bb8e8bc3e25c

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

@@ -7,8 +7,9 @@
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;

import com.xxl.rpc.util.ThreadPoolUtil;
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.video.VideoWatchHistory;
import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.pptv.entity.PPTVSeries;
@@ -17,10 +18,13 @@
import com.yeshi.buwan.service.inter.video.VideoWatchHistoryService;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.util.log.VideoLogFactory;
import com.yeshi.buwan.vo.AcceptData;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
import org.apache.commons.httpclient.methods.GetMethod;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;

import com.yeshi.buwan.domain.entity.PlayUrl;
@@ -40,7 +44,7 @@
    @Resource
    private HomeTypeService homeTypeService;
    @Resource
    private ConfigService configService;
    private DetailSystemConfigService configService;
    @Resource
    private AdService adService;
    @Resource
@@ -74,6 +78,8 @@

    @Resource
    private VideoWatchHistoryService videoWatchHistoryService;

    private final Logger playLogger = LoggerFactory.getLogger("videoPlay");

    @RequireUid
    public void getHomeAd(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -119,14 +125,6 @@
                    if (!StringUtil.isNullOrEmpty(ad.getParams())) {
                        ad.setParams(ad.getParams().replace("\"", "\\" + "\""));
                    }

                    // 3.4.7以上的版本才可以用
                    // com.weikou.beibeivideo.ui.mine.FXBrowserActivity
                    if ("com.weikou.beibeivideo.ui.mine.FXBrowserActivity".equalsIgnoreCase(ad.getClazz())
                            && acceptData.getVersion() < 71)
                        ad.setClazz("com.weikou.beibeivideo.ui.mine.BrowserActivity");
                    else
                        ad.setClazz("com.weikou.beibeivideo.ui.mine.FXBrowserActivity");
                }
                object.put("count", (new StringBuilder(String.valueOf(list.size()))).toString());
                JSONArray array = new JSONArray();
@@ -153,10 +151,11 @@
        if (StringUtil.isNullOrEmpty(vtid)) {
            vtid = "309"; // 为了兼容以前的推荐
        }

        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
        JSONObject object = new JSONObject();

        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
        List<HomeType> list1 = homeTypeService.getHomeType(detailSystem.getId(), resourceList,
                CacheUtil.getMD5Long(resourceList), -1, Long.parseLong(vtid));
        List<HomeType> list = new ArrayList<>();
@@ -237,6 +236,7 @@
        object.put("data", array);
        out.print(JsonUtil.loadTrueJson(object.toString()));
    }



    public HomeType convertHomeVideoList(HomeType type) {
@@ -323,6 +323,7 @@
        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"));
@@ -335,7 +336,7 @@

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

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

        //获取优先展示的渠道
        if (StringUtil.isNullOrEmpty(resourceId)) {
@@ -364,6 +365,8 @@
            }
        });

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


        //PPTV网页播放
        if (resourceId != null && Integer.parseInt(resourceId) == PPTVUtil.RESOURCE_ID) {
@@ -372,6 +375,12 @@
            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();
                }
            }

            p = p >= series.getSeries().size() ? 0 : p;
@@ -577,7 +586,7 @@

    public void isPraise(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
        Config config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
        DetailSystemConfig config = configService.getConfigByKey("banner_praise", detailSystem, acceptData.getVersion());
        if ("是".equals(config.getValue())) {
            out.print(JsonUtil.loadTrueJson("1"));
        } else {