3.9.0兼容

admin

2021-03-31 431c684f254ba5163cb6256739215e2099b91aaf

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

@@ -35,6 +35,7 @@
import com.yeshi.buwan.util.log.UserActiveLogFactory;
import com.yeshi.buwan.util.log.VideoLogFactory;
import com.yeshi.buwan.vo.AcceptData;
import com.yeshi.buwan.vo.video.VideoDetailVO;
import com.yeshi.buwan.youku.YouKuUtil;
import com.yeshi.buwan.youku.entity.YouKuSearchVideoMap;
import com.yeshi.buwan.youku.entity.YouKuShowDetail;
@@ -56,7 +57,7 @@
@Controller
public class HomeParser {

    private Logger logger=LoggerFactory.getLogger(HomeParser.class);
    private Logger logger = LoggerFactory.getLogger(HomeParser.class);

    @Resource
    private SystemService systemService;
@@ -373,6 +374,8 @@


    public void getVideoDetailForInternetSearch(AcceptData acceptData, String videoId, HttpServletRequest request, PrintWriter out) {
        String loginUid = request.getParameter("LoginUid");
        String from = request.getParameter("From");
        InternetSearchVideo internetSearchVideo = internetSearchVideoService.selectByPrimaryKey(videoId);
        String resourceId = request.getParameter("ResourceId");
        if (StringUtil.isNullOrEmpty(resourceId)) {
@@ -384,7 +387,7 @@
                info = youKuUtil.getVideoInfo(internetSearchVideo);

            } catch (Exception e) {
                logger.error("全网搜视频详情出错："+videoId);
                logger.error("全网搜视频详情出错：" + videoId);
                e.printStackTrace();
                out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
                return;
@@ -394,7 +397,7 @@
            try {
                info = mogoTVUtil.getVideoInfo(internetSearchVideo);
            } catch (Exception e) {
                logger.error("全网搜视频详情出错："+videoId);
                logger.error("全网搜视频详情出错：" + videoId);
                out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
                return;
            }
@@ -402,18 +405,26 @@
            try {
                info = tencentVideoUtil.getVideoInfo(internetSearchVideo);
            } catch (Exception e) {
                logger.error("全网搜视频详情出错："+videoId);
                logger.error("全网搜视频详情出错：" + videoId);
                out.print(JsonUtil.loadFalseAdmin(e.getMessage()));
                return;
            }
        }

        LoggerUtil.getUserActiveLogger().info(UserActiveLogFactory.createVideoDetail(new BaseLog(acceptData, loginUid), videoId, info.getName(), from));

        info.setWatchCount("" + (int) (Math.random() * 1000));

        JSONArray array = new JSONArray();
        JSONObject obj = new JSONObject();
        out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                obj.toString()));

        if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), new VideoDetailVO.VideoAdInfo(true,false), null)), array.toString(),
                    obj.toString()));
        } else {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                    obj.toString()));
        }
    }

    @RequireUid
@@ -527,28 +538,39 @@
            info.setCommentCount((int) count);

        JSONObject obj = new JSONObject();
        VideoDetailVO.AttentionInfo attention = null;
        if (info.getVideoDetailList() != null)
            if (info.getVideoDetailList().size() > 1) {// 多集,可关注
                boolean isAttention = false;
                if (!StringUtil.isNullOrEmpty(loginUid)) {
                    isAttention = attentionService.isAddAttention(loginUid, info.getId());
                }
                attention = new VideoDetailVO.AttentionInfo();
                attention.setName(info.getName());
                attention.setPicture(info.getPicture());
                if (StringUtil.isNullOrEmpty(info.getUpdatetime())) {
                    attention.setUpdateInfo("更新:" + TimeUtil.getCommentTime(info.getCreatetime()));
                } else {
                    attention.setUpdateInfo("更新:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
                }
                attention.setAttention(isAttention);

                //兼容老版本
                JSONObject attentionInfo = new JSONObject();
                attentionInfo.put("Name", info.getName());
                attentionInfo.put("Picture", info.getPicture());
                if (StringUtil.isNullOrEmpty(info.getUpdatetime()))
                    attentionInfo.put("UpdateInfo", "更新:" + TimeUtil.getCommentTime(info.getCreatetime()));
                else
                    attentionInfo.put("UpdateInfo", "更新:" + TimeUtil.getCommentTime(Long.parseLong(info.getUpdatetime())));
                attentionInfo.put("IsAttention", isAttention);
                attentionInfo.put("Picture", attention.getPicture());
                attentionInfo.put("Name", attention.getName());
                attentionInfo.put("UpdateInfo", attention.getUpdateInfo());
                attentionInfo.put("IsAttention", attention.isAttention());
                obj.put("Attention", attentionInfo);
            }
        UserInfo user = userService.getUserInfo(acceptData.getUid());
        if (Utils.isTest(request, user, detailSystem.getId()))
            out.print(JsonUtil.loadTrueJson(""));
        else
        if (VersionUtil.isGraterThan390(acceptData.getPlatform(), acceptData.getVersion())) {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(new VideoDetailVO(Utils.convertVideo(info), new VideoDetailVO.VideoAdInfo(true,true), attention)), array.toString(),
                    obj.toString()));
        } else {
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(Utils.convertVideo(info)), array.toString(),
                    obj.toString()));
        }
    }