buwan-server.git

			@@ -4,6 +4,7 @@
			import com.yeshi.buwan.domain.ad.CommonAd;
			import com.yeshi.buwan.domain.ad.CommonAdPositionAd;
			import com.yeshi.buwan.domain.recommend.CategoryRecommendVideo;
			import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
			import com.yeshi.buwan.domain.special.Special;
			import com.yeshi.buwan.domain.system.DetailSystem;
			import com.yeshi.buwan.dto.search.SolrResultDTO;
			@@ -11,6 +12,7 @@
			import com.yeshi.buwan.pptv.PPTVUtil;
			import com.yeshi.buwan.service.imp.*;
			import com.yeshi.buwan.service.imp.recommend.CategoryRecommendVideoService;
			import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
			import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
			import com.yeshi.buwan.service.manager.SolrCommonVideoDataManager;
			import com.yeshi.buwan.util.*;
			@@ -69,6 +71,9 @@

			@Resource
			private SearchService searchService;

			@Resource
			private HomeRecommendSpecialService homeRecommendSpecialService;

			@RequireUid
			public void getClass(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
			@@ -184,7 +189,7 @@
			VideoType vt = new VideoType(Constant.VIDEO_TYPE_VIP);
			vt.setName("VIP");
			vt.setShow("1");
			vt.setIcon("https://hbimg.huabanimg.com/12834704bb4aa39342c2fb51e0c644181b13997b70eb-CqlE1I_fw658/format/webp");
			vt.setIcon("https://hbimg.huabanimg.com/4690ea8f8144f3d46c11e417c77daa5debcb71f9201f-WpAbfw_fw658/format/jpg");
			sty.setType(vt);
			boolean isC = false;
			for (SuperVideoType svt : list) {
			@@ -295,15 +300,24 @@
			vo.setShowTitle(type.getShowTitle());
			vo.setType(type.getType());
			vo.setCategoryType(type.getCategoryType());

			typelist.add(vo);
			//删除老版本中的除开分类的顶部标签
			if (sv.getType().getId() != 309L && sv.getType().getId() != 310L)
			typelist.add(vo);
			}

			HomeClassVO vo = new HomeClassVO();

			vo.setDataType(HomeClassVO.DATA_TYPE_NOVEL);
			vo.setName("小说");
			typelist.add(1, vo);
			//获取首页推荐标签
			List<HomeRecommendSpecial> specialList = homeRecommendSpecialService.listSpecialByDetailSystemId(acceptData.getDetailSystem().getId(), null, 1, Constant.pageCount);
			if (specialList != null) {
			for (int i = specialList.size() - 1; i >= 0; i--) {
			HomeRecommendSpecial special = specialList.get(i);
			HomeClassVO vo = new HomeClassVO();
			vo.setId(Long.parseLong(special.getId()));
			vo.setName(special.getName());
			vo.setShowTitle(special.getName());
			vo.setDataKey(special.getDataKey());
			vo.setDataType(HomeClassVO.DATA_TYPE_RECOMMEND);
			typelist.add(0, vo);
			}
			}

			JSONObject object = new JSONObject();
			object.put("count", (new StringBuilder(String.valueOf(typelist.size()))).toString());
			@@ -312,7 +326,6 @@
			array.add(StringUtil.outPutResultJson(typelist.get(j)));
			object.put("data", array);
			out.print(JsonUtil.loadTrueJson(object.toString()));

			}


			@@ -622,6 +635,14 @@

			String parentId = request.getParameter("ParentId");

			//是否包含VIP的分类
			boolean containsVIPType = false;
			try {
			List<Integer> vipTypeList = Arrays.asList(Constant.vipTypes);
			containsVIPType = vipTypeList.contains(Integer.parseInt(parentId));
			} catch (Exception e) {

			}
			if (StringUtil.isNullOrEmpty(parentId)) {
			out.print(JsonUtil.loadFalseJson("请上传ParentId"));
			return;
			@@ -681,39 +702,50 @@
			list.remove(0);
			}

			} else if ((Constant.VIDEO_TYPE_VIP + "").equalsIgnoreCase(parentId)) {
			} else if (containsVIPType) {
			//VIP分类
			VideoType type = new VideoType(Constant.VIDEO_TYPE_VIP);
			type.setName("全部");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);

			//VIP根分类
			if (Constant.VIDEO_TYPE_VIP == Integer.parseInt(parentId)) {
			VideoType type = new VideoType(Constant.VIDEO_TYPE_VIP);
			type.setName("全部");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);


			type = new VideoType(Constant.VIDEO_TYPE_VIP_MOVIE);
			type.setName("电影");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);
			type = new VideoType(Constant.VIDEO_TYPE_VIP_MOVIE);
			type.setName("电影");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);

			type = new VideoType(Constant.VIDEO_TYPE_VIP_TV);
			type.setName("电视剧");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);
			type = new VideoType(Constant.VIDEO_TYPE_VIP_TV);
			type.setName("电视剧");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);


			type = new VideoType(Constant.VIDEO_TYPE_VIP_CARTOON);
			type.setName("动漫");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);
			type = new VideoType(Constant.VIDEO_TYPE_VIP_CARTOON);
			type.setName("动漫");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);

			// type = new VideoType(Constant.VIDEO_TYPE_VIP_SHOW);
			// type.setName("综艺");
			// type.setShow("1");
			// type.setCategoryType("area");
			// list.add(type);
			} else {
			VideoType type = new VideoType(Integer.parseInt(parentId));
			type.setName("全部");
			type.setShow("1");
			type.setCategoryType("area");
			list.add(type);
			}


			} else {
			List<VideoType> clist = classService.getFirstTypeList(parentId);
			@@ -850,6 +882,8 @@
			if ("310".equals(typeid)) { // 310做的特殊处理:前端处理的是HomeAd，所有需要返回homeAD的形式
			Object vi = json.get("VideoInfo");
			json.put("Video", vi);
			//设置banner的比例
			object.put("bannerSizeRate", "0.56");
			}
			json.put("LinkType", "1");
			array.add(json);