接口bug修改

admin

2021-02-06 cad915058c3c53bf328a8ae9ca9bc7de099caba7

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

@@ -1,23 +1,28 @@
package com.yeshi.buwan.controller.parser;

import com.yeshi.buwan.domain.*;
import com.yeshi.buwan.domain.Collection;
import com.yeshi.buwan.domain.user.LoginUser;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.manager.SolrAlbumDataManager;
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.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.springframework.stereotype.Controller;

import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpSession;
import java.io.File;
import java.io.PrintWriter;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.*;

@Controller
public class UserParser {
@@ -43,6 +48,10 @@
    private BanQuanService banQuanService;
    @Resource
    private VideoInfoService videoInfoService;
    @Resource
    private SolrAlbumDataManager solrDataManager;
    @Resource
    private ConfigParser configParser;

    public void getUid(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
@@ -53,13 +62,13 @@
            out.print(JsonUtil.loadFalseJson("获取uid失败"));
            return;
        } else {
            Map<String, String> map = configService.getConfigAsMap(detailSystem,acceptData.getVersion());
            Map<String, String> map = configService.getConfigAsMap(detailSystem, acceptData.getVersion());
            ShareContent share = shareService.getShareContent(detailSystem.getId());
            JSONObject object = new JSONObject();
            object.put("Uid", uid);
            object.put("Portrait", userInfo.getPortrait());
            object.put("Nickname", userInfo.getNickname());
            object.put("TopIcon", map.get("top_icon"));

            object.put("ZiXun", map.get("zixun_url"));
            if (acceptData.getPlatform().equalsIgnoreCase("ios") && !"中国".equalsIgnoreCase(userInfo.getCountry()))// 正在审核的版本
                object.put("CommentUrl", "");
@@ -80,7 +89,14 @@
            object.put("WXShareIcon", map.get("wx_share_icon"));
            object.put("WXShareUrl", map.get("wx_share_url"));
            object.put("WXShareContent", map.get("wx_share_content"));
            object.put("TuiGuang", map.get("taobao_tuiguang"));

            if ("qq".equalsIgnoreCase(acceptData.getChannel())) {
                object.put("TopIcon", "");
                object.put("TuiGuang", "");
            } else {
                object.put("TuiGuang", map.get("taobao_tuiguang"));
                object.put("TopIcon", map.get("top_icon"));
            }
            object.put("SOHU_partner", detailSystem.getSohuPartner());
            object.put("SOHU_key", detailSystem.getSohuKey());

@@ -102,12 +118,22 @@
            object.put("shopurl", map.get("shopurl"));
            object.put("copyplate", map.get("copy_plate"));

            // 是否广告点击下载
            if ("huawei".equalsIgnoreCase(acceptData.getChannel())
                    && acceptData.getVersion() >= Integer.parseInt(map.get("ad_click_download_version"))) {
            //开关设置
            String channel = acceptData.getChannel().toLowerCase();
            String adOpenSettings = map.get("ad_other_open_settings");
            JSONObject adOpenSettingsJson = JSONObject.fromObject(adOpenSettings);

            if (!adOpenSettingsJson.keySet().contains(channel.toLowerCase())) {
                channel = "qq";
            }

            int closeVersion = adOpenSettingsJson.optInt(channel);
            if (acceptData.getVersion() >= closeVersion) {
                object.put("adClickDownload", true);
            } else
            } else {
                object.put("adClickDownload", false);
            }


            // 广告类型
            object.put("adType", map.get("ad_type"));
@@ -119,7 +145,15 @@
                fullVideoVersion = json.optInt(acceptData.getChannel().toLowerCase(), 0);
            }

            if (acceptData.getVersion() >= fullVideoVersion) {// 是否屏蔽详情页全屏广告

            ConfigParser.ADConfig adConfig = configParser.getAdShowType("ad_video_detail_full_video", acceptData.getChannel(), acceptData.getVersion(), map);
            String type = adConfig == null ? "" : adConfig.getType();

            if (!StringUtil.isNullOrEmpty(type)) {// 是否屏蔽详情页全屏广告
                JSONObject adType = JSONObject.fromObject(map.get("ad_type"));
                adType.put("videoDetailSplashAd", true);
                object.put("adType", adType.toString());
            } else {
                JSONObject adType = JSONObject.fromObject(map.get("ad_type"));
                adType.put("videoDetailSplashAd", false);
                object.put("adType", adType.toString());
@@ -138,11 +172,11 @@
            return;
        }

        List<String> list = searchService.suggestSearch(key, acceptData.getSystem());
        List<String> list = solrDataManager.getSuggestKeyList(key); //searchService.suggestSearch(key, acceptData.getSystem());
        if (acceptData.getPlatform().equalsIgnoreCase("ios")) {
            if (Constant.IOSTest) {
                if (acceptData.getVersion()== 1) {
                    list = new ArrayList<String>();
                if (acceptData.getVersion() == 1) {
                    list = new ArrayList<>();
                }
            }
        }
@@ -157,6 +191,34 @@
        out.print(JsonUtil.loadTrueJson(object.toString()));

    }

    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() <= 5) {
                for (int i = 0; i < video.getVideocount(); i++) {
                    VideoDetailInfo detail = new VideoDetailInfo();
                    detail.setTag((i + 1) + "");
                    detailList.add(detail);
                }
            } else {
                for (int i = 0; i < 3; i++) {
                    VideoDetailInfo detail = new VideoDetailInfo();
                    detail.setTag((i + 1) + "");
                    detailList.add(detail);
                }

                for (int i = video.getVideocount() - 3; i < video.getVideocount(); i++) {
                    VideoDetailInfo detail = new VideoDetailInfo();
                    detail.setTag((i + 1) + "");
                    detailList.add(detail);
                }
            }
        }

        return detailList;
    }


    // 搜索
    public void search(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -208,6 +270,14 @@
            List<VideoInfo> list = searchService.search(detailSystem.getId(), request.getRemoteAddr(),
                    acceptData.getUid(), key, pageIndex, (StringUtil.isNullOrEmpty(contentType) ? 0 : Integer.parseInt(contentType)),
                    acceptData.getSystem(), resourceList, cacheMD5);
            //组织数据
            for (VideoInfo video : list) {
                //如果是正片，且为5大分类 就采用竖条展示
                if (video.getShowType() == 1) {
                    video.setVideoDetailList(createSearchVideoDetailsVO(video));

                }
            }
            cacheMD5 = "0";
            if (list != null) {
                for (VideoInfo info : list) {
@@ -249,9 +319,137 @@
                array.add(StringUtil.outPutResultJson(list.get(i)));
            }
            object.put("data", array);
            if (pageIndex == 1) {//返回导航栏

            }

            out.print(JsonUtil.loadTrueJson(object.toString()));
        }
    }


    // 搜索
    public void searchNew(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
        //type: 0-全部  1-
        String key = request.getParameter("Key");
        String type = request.getParameter("Type");
        String page = request.getParameter("Page");

        if (StringUtil.isNullOrEmpty(key)) {
            out.print(JsonUtil.loadFalseJson("请上传Key"));
            return;
        }

        if (StringUtil.isNullOrEmpty(type)) {
            out.print(JsonUtil.loadFalseJson("请上传Type"));
            return;
        }

        int pageIndex = StringUtil.getPage(page);
        if (pageIndex <= 0) {
            pageIndex = 1;
        }

        DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
        UserInfo user1 = userService.getUserInfo(acceptData.getUid());
        if (Utils.isTest(request, user1, detailSystem.getId())) {
            detailSystem = systemService.getDetailSystemById(40 + "");
            JSONObject object = new JSONObject();
            object.put("count", 0);
            JSONArray array = new JSONArray();
            object.put("data", array);
            out.print(JsonUtil.loadTrueJson(object.toString()));
        } else {
            List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), 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(detailSystem.getId(), request.getRemoteAddr(),
                    acceptData.getUid(), key, pageIndex, Integer.parseInt(type),
                    acceptData.getSystem(), resourceList, cacheMD5);
            //组织数据
            for (VideoInfo video : videoListResultVO.getVideoList()) {
                //如果是正片，且为5大分类 就采用竖条展示
                if (video.getShowType() == 1) {
                    video.setVideoDetailList(createSearchVideoDetailsVO(video));
                }
            }
            cacheMD5 = "0";
            if (videoListResultVO.getVideoList() != null) {
                for (VideoInfo info : videoListResultVO.getVideoList()) {
                    cacheMD5 += info.getId() + "#";
                }
            }
            List<VideoInfo> list = banQuanService.getBanQuanVideo(videoListResultVO.getVideoList(), detailSystem.getId(), cacheMD5);

            JSONObject object = new JSONObject();
            object.put("count", Constant.isUpdate ? 19 + "" : videoListResultVO.getCount());
            JSONArray array = new JSONArray();
            for (int i = 0; i < list.size(); i++) {
                if (JuheVideoUtil.isNeedDelete((VideoInfo) list.get(i), detailSystem.getId())) {
                    list.remove(i);
                    i--;
                }
            }

            List<String> keyList = banQuanService.getBanQuanKeyListAll(Integer.parseInt(detailSystem.getId()));
            for (int i = 0; i < list.size(); i++) {

                boolean delete = false;
                for (int j = 0; j < keyList.size(); j++) {
                    if (list.get(i).getName().contains(keyList.get(j))) {
                        delete = true;
                        break;
                    }
                }
                if (delete) {
                    list.remove(i);
                    i--;
                }

            }

            for (int i = 0; i < list.size(); i++) {
                ((VideoInfo) list.get(i))
                        .setPicture(VideoPictureUtil.getShowPicture((VideoInfo) list.get(i), acceptData.getPlatform(), acceptData.getVersion() + ""));
                array.add(StringUtil.outPutResultJson(list.get(i)));
            }
            object.put("data", array);
            if (pageIndex == 1) {//返回导航栏
                List<VideoType> typeList = new ArrayList<>();
                VideoType vt = new VideoType();
                vt.setId(0);
                vt.setName("全部");
                typeList.add(vt);
                Set<Long> set = new HashSet<>();
                for (VideoInfo videoInfo : list) {
                    if (videoInfo.getShowType() == 1 && videoInfo.getVideoType() != null)
                        set.add(videoInfo.getVideoType().getId());
                }

                for (Iterator<Long> its = set.iterator(); its.hasNext(); ) {
                    Long typeId = its.next();
                    String typeName = VideoConstant.getMainCategoryName(typeId);
                    if (!StringUtil.isNullOrEmpty(typeName)) {
                        vt = new VideoType();
                        vt.setId(typeId);
                        vt.setName(typeName);
                        typeList.add(vt);
                    }
                }
                JSONArray array1 = new JSONArray();
                for (VideoType vt1 : typeList)
                    array1.add(StringUtil.outPutResultJson(vt1));
                object.put("typeList", array1);
            }

            out.print(JsonUtil.loadTrueJson(object.toString()));
        }
    }


    // 猜你喜欢
    public void guessLike(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -270,7 +468,7 @@
            list1 = videoInfoService.simpleRandomVideoList(4);
        }

        List<VideoInfo> list = new ArrayList<VideoInfo>();
        List<VideoInfo> list = new ArrayList<>();
        list.addAll(list1);

        if ("android".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() < 35) {
@@ -490,7 +688,7 @@
            list1 = videoInfoService.simpleRandomVideoList(4);
        }

        List<VideoInfo> list = new ArrayList<VideoInfo>();
        List<VideoInfo> list = new ArrayList<>();
        list.addAll(list1);

        if ("android".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() < 35) {
@@ -524,6 +722,7 @@
        String pwd = request.getParameter("Pwd");// 密码
        String nickName = request.getParameter("NickName");// 昵称
        String code = request.getParameter("VerifyCode");// 验证码
        String portrait = request.getParameter("Portrait");// 验证码


        if (StringUtil.isNullOrEmpty(account)) {
@@ -566,7 +765,7 @@
        user.setName(nickName);
        user.setOpenid(account);
        user.setPwd(StringUtil.Md5(pwd));
        user.setPortrait(savePortrait(request));
        user.setPortrait(savePortrait(portrait, request.getSession()));
        user.setIpinfo(ip + ":" + port);

        String result = userService.registerByEmail(user);
@@ -638,7 +837,7 @@
        user.setPortrait("http://buwan-1255749512.file.myqcloud.com/resource/ic_portrait_default.png");
        user = userService.loginByEmail(user);
        if (user == null || user.getState() != LoginUser.STATE_NORMAL)
            out.print(JsonUtil.loadFalseJson("登录失败"));
            out.print(JsonUtil.loadFalseJson("账号或密码错误"));
        else
            out.print(JsonUtil.loadTrueJson(StringUtil.outPutResultJson(user)));
    }
@@ -655,6 +854,7 @@
        String birthDay = request.getParameter("BirthDay");// 生日
        String personalSign = request.getParameter("PersonalSign");// 个性签名
        String loginUid = request.getParameter("LoginUid");// 个性签名
        String portrait = request.getParameter("Portrait");
        if (StringUtil.isNullOrEmpty(loginUid)) {
            out.print(JsonUtil.loadFalseJson("请上传LoginUid"));
            return;
@@ -665,7 +865,7 @@
        if (user != null) {
            if (!StringUtil.isNullOrEmpty(nickName))
                user.setName(nickName);
            String potrait = savePortrait(request);
            String potrait = savePortrait(portrait, request.getSession());
            if (!StringUtil.isNullOrEmpty(potrait))
                user.setPortrait(potrait);
            if (!StringUtil.isNullOrEmpty(sex))
@@ -729,7 +929,7 @@
        }

        if (!verifyCode.equalsIgnoreCase(request.getSession().getAttribute(email) + "")) {
            out.print(JsonUtil.loadTrueJson("验证码错误"));
            out.print(JsonUtil.loadFalseJson("验证码错误"));
            return;
        }

@@ -775,16 +975,15 @@

    }

    private String savePortrait(HttpServletRequest request) {
        String base64 = request.getParameter("Portrait");
    public static String savePortrait(String base64, HttpSession session) {
        if (StringUtil.isNullOrEmpty(base64))
            return "";

        String fileName = "portrait_" + System.currentTimeMillis() + ".jpg";
        // 定义上传路径
        String path = request.getSession().getServletContext().getRealPath("upload") + "/" + fileName;
        if (!new File(request.getSession().getServletContext().getRealPath("upload") + "/").exists())
            new File(request.getSession().getServletContext().getRealPath("upload") + "/").mkdirs();
        String path = session.getServletContext().getRealPath("upload") + "/" + fileName;
        if (!new File(session.getServletContext().getRealPath("upload") + "/").exists())
            new File(session.getServletContext().getRealPath("upload") + "/").mkdirs();
        boolean isS = StringUtil.generateImageFromBase64(base64, path);
        if (!isS)
            return "";