admin
2021-10-16 df244ea8697b42f6b48582be381ee8b6f4aca331
src/main/java/com/yeshi/buwan/controller/parser/UserParser.java
@@ -5,31 +5,36 @@
import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.Collection;
import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
import com.yeshi.buwan.domain.solr.SolrShortVideo;
import com.yeshi.buwan.domain.system.DetailSystem;
import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.domain.video.InternetSearchVideo;
import com.yeshi.buwan.dto.log.BaseLog;
import com.yeshi.buwan.dto.search.SolrResultDTO;
import com.yeshi.buwan.dto.search.SolrShortVideoSearchFilter;
import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
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.videos.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.inter.juhe.InternetSearchVideoService;
import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager;
import com.yeshi.buwan.service.manager.search.SolrInternetSearchVideoDataManager;
import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
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.factory.VideoInfoFactory;
import com.yeshi.buwan.util.factory.vo.UserInfoVOFactory;
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.util.video.VideoUtil;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoListResultVO;
import net.sf.json.JSONArray;
@@ -79,6 +84,10 @@
    private SolrAlbumVideoDataManager solrDataManager;
    @Resource
    private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager;
    @Resource
    private SolrShortVideoDataManager solrShortVideoDataManager;
    @Resource
    private ConfigParser configParser;
    @Resource
@@ -96,7 +105,7 @@
            out.print(JsonUtil.loadFalseJson("获取uid失败"));
            return;
        } else {
            Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
            Map<String, String> map = configService.getConfigAsMap(acceptData.getChildDetailSystem(), acceptData.getVersion());
            ShareContent share = shareService.getShareContent(detailSystem.getId());
            JSONObject object = new JSONObject();
            object.put("Uid", uid);
@@ -529,11 +538,13 @@
                }
            }
            vt = new VideoType();
            vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
            vt.setName("高清");
            typeList.add(vt);
            //韩剧不返回高清
            if (!acceptData.getDetailSystem().getId().equalsIgnoreCase("48")) {
                vt = new VideoType();
                vt.setId(Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION);
                vt.setName("高清");
                typeList.add(vt);
            }
            JSONArray array1 = new JSONArray();
@@ -563,7 +574,7 @@
            int rootType = internetSearchVideo.getRootType();
            SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
            filter.setVideoType(rootType);
            filter.setResourceIds(new String[]{PPTVUtil.RESOURCE_ID + ""});
            filter.setResourceIds(Arrays.asList(new String[]{PPTVUtil.RESOURCE_ID + ""}));
            filter.setSortKey("watchcount");
            SolrResultDTO dto = solrDataManager.find(filter, 1, 20);
            List<SolrAlbumVideo> solrAlbumVideoList = new ArrayList<>();
@@ -608,13 +619,48 @@
    }
    private void guessLikeForShortVideo(AcceptData acceptData, String videoId, PrintWriter out) {
        SolrShortVideo solrShortVideo = solrShortVideoDataManager.findOne(videoId);
        SolrShortVideoSearchFilter filter = new SolrShortVideoSearchFilter();
        filter.setRootVideoType(solrShortVideo.getRootVideoType());
        if (solrShortVideo.getArea() != null) {
            filter.setAreas(Arrays.asList(solrShortVideo.getArea().split(",")));
        }
        SolrResultDTO dto = solrShortVideoDataManager.find(filter, 1, 10);
        JSONObject object = new JSONObject();
        object.put("count", dto.getVideoList().size() + "");
        JSONArray array = new JSONArray();
        for (int i = 0; i < dto.getVideoList().size(); i++) {
            SolrShortVideo temp = (SolrShortVideo) dto.getVideoList().get(i);
            if (temp.getId().equalsIgnoreCase(videoId))
                continue;
            array.add(StringUtil.outPutResultJson(VideoInfoFactory.create(temp)));
        }
        if (array.size() % 2 != 0) {
            array.remove(array.size() - 1);
        }
        object.put("data", array);
        out.print(JsonUtil.loadTrueJson(object.toString()));
    }
    // 猜你喜欢
    public void guessLike(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        String videoId = request.getParameter("VideoId");
        if (!NumberUtil.isNumeric(videoId)) {
            guessLikeForInternetSearch(acceptData, videoId, out);
            return;
        int fromtype = VideoUtil.getVideoFromType(videoId);
        switch (fromtype) {
            case HomeVideo.FROM_TYPE_INTERNET:
                guessLikeForInternetSearch(acceptData, videoId, out);
                return;
            case HomeVideo.FROM_TYPE_SHORT:
                guessLikeForShortVideo(acceptData, videoId, out);
                return;
        }
        DetailSystem ds = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -675,7 +721,7 @@
    //新版热门搜索
    public void getHotSearchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        DetailSystemConfig config = configService.getConfigByKey("hot_search", acceptData.getDetailSystem(), acceptData.getVersion());
        DetailSystemConfig config = configService.getConfigByKey("hot_search",  acceptData.getDetailSystem(), acceptData.getVersion());
        if (config == null) {
            out.print(JsonUtil.loadFalseJson("无内容"));
            return;
@@ -905,6 +951,35 @@
    }
    private void getRelativeVideosForShortVideo(AcceptData acceptData, String videoId, PrintWriter out) {
        SolrShortVideo solrShortVideo = solrShortVideoDataManager.findOne(videoId);
        SolrShortVideoSearchFilter filter = new SolrShortVideoSearchFilter();
        filter.setKey(solrShortVideo.getName());
        filter.setFuzzy(true);
        SolrResultDTO dto = solrShortVideoDataManager.find(filter, 1, 10);
        JSONObject object = new JSONObject();
        object.put("count", dto.getVideoList().size() + "");
        JSONArray array = new JSONArray();
        for (int i = 0; i < dto.getVideoList().size(); i++) {
            SolrShortVideo temp = (SolrShortVideo) dto.getVideoList().get(i);
            if (temp.getId().equalsIgnoreCase(videoId))
                continue;
            array.add(StringUtil.outPutResultJson(VideoInfoFactory.create(temp)));
        }
        if (array.size() % 2 != 0) {
            array.remove(array.size() - 1);
        }
        object.put("data", array);
        out.print(JsonUtil.loadTrueJson(object.toString()));
    }
    /**
     * 相关视频
     *
@@ -918,9 +993,14 @@
            return;
        }
        if (!NumberUtil.isNumeric(videoId)) {
            getRelativeVideosForInternetSearch(acceptData, videoId, out);
            return;
        int fromtype = VideoUtil.getVideoFromType(videoId);
        switch (fromtype) {
            case HomeVideo.FROM_TYPE_INTERNET:
                getRelativeVideosForInternetSearch(acceptData, videoId, out);
                return;
            case HomeVideo.FROM_TYPE_SHORT:
                getRelativeVideosForShortVideo(acceptData, videoId, out);
                return;
        }
        List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
@@ -1124,6 +1204,7 @@
        loginInfoDto.setSystemId(acceptData.getDetailSystem().getSystem().getId());
        loginInfoDto.setEmail(account);
        loginInfoDto.setPwd(StringUtil.Md5(pwd));
        loginInfoDto.setIpInfo(IPUtil.getRemotIP(request) + ":" + request.getRemotePort());
        try {
            LoginUser user = userService.login(loginInfoDto);
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
@@ -1187,6 +1268,12 @@
        // 注册 --用户名,昵称,密码
        LoginUser user = userService.getLoginUser(loginUid);
        if (user.getState() != null && user.getState() == LoginUser.STATE_UNREGISTER) {
            out.print(JsonUtil.loadFalseJson("账户已注销"));
            return;
        }
        //隐藏user中的email
        user.setEmail(UserInfoVOFactory.getHiddenEmail(user.getEmail()));
        if (user.getPortrait() != null && !user.getPortrait().startsWith("http"))
            user.setPortrait("http://" + Constant.WEBSITE + "/BuWan" + user.getPortrait());
        out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));