admin
2021-03-23 7def9937241d8c5fada7a63c8a0fd144bf0c05ff
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -4,21 +4,27 @@
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.log.BaseLog;
import com.yeshi.buwan.dto.user.LoginInfoDto;
import com.yeshi.buwan.exception.user.LoginUserException;
import com.yeshi.buwan.exception.user.RegisterUserException;
import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
import com.yeshi.buwan.util.*;
import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
import com.yeshi.buwan.util.annotation.RequireUid;
import com.yeshi.buwan.util.email.MailSenderUtil;
import com.yeshi.buwan.util.log.LoggerUtil;
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.video.VideoCategoryConstant;
import com.yeshi.buwan.util.video.VideoConstant;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoListResultVO;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.stereotype.Controller;
import javax.annotation.Resource;
@@ -30,6 +36,7 @@
@Controller
public class UserParser {
    @Resource
    private SystemService systemService;
    @Resource
@@ -199,7 +206,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()!=null&& 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) + "");
@@ -334,6 +341,8 @@
    // 搜索
    public void searchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        //type: 0-全部  1-
        String key = request.getParameter("Key");
        String type = request.getParameter("Type");
@@ -349,17 +358,22 @@
            return;
        }
        LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createSearch(new BaseLog(acceptData, ""), key, type));
        int pageIndex = StringUtil.getPage(page);
        if (pageIndex <= 0) {
            pageIndex = 1;
        }
        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(acceptData.getDetailSystem().getId(), request.getRemoteAddr(),
                acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
@@ -417,6 +431,13 @@
                    typeList.add(vt);
                }
            }
            vt = new VideoType();
            vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
            vt.setName("高清");
            typeList.add(vt);
            JSONArray array1 = new JSONArray();
            for (VideoType vt1 : typeList)
                array1.add(StringUtil.outPutResultJson(vt1));