buwan-server.git

			@@ -6,7 +6,7 @@

			import javax.annotation.Resource;

			import com.yeshi.buwan.service.inter.VideoResourceMapExtraInfoService;
			import com.yeshi.buwan.service.inter.video.VideoInfoExtraService;
			import org.hibernate.CacheMode;
			import org.hibernate.HibernateException;
			import org.hibernate.Session;
			@@ -18,7 +18,7 @@
			import com.yeshi.buwan.dao.VideoInfoDao;
			import com.yeshi.buwan.dao.VideoTypeDao;
			import com.yeshi.buwan.domain.CategoryVideo;
			import com.yeshi.buwan.domain.DetailSystem;
			import com.yeshi.buwan.domain.system.DetailSystem;
			import com.yeshi.buwan.domain.SuperHotType;
			import com.yeshi.buwan.domain.SuperVideoType;
			import com.yeshi.buwan.domain.VideoInfo;
			@@ -36,8 +36,9 @@
			private VideoInfoDao videoInfoDao;
			@Resource
			private SuperVideoTypeDao superVideoTypeDao;

			@Resource
			private VideoResourceMapExtraInfoService videoResourceMapExtraInfoService;
			private VideoInfoExtraService videoInfoExtraService;

			public List<VideoType> getTypeList() {
			List<VideoType> list = videoTypeDao.list("from VideoType v where v.show='1' and v.parent=null");
			@@ -279,7 +280,7 @@
			info.setHpicture(obj[4] + "");
			info.setLatestHpicture(obj[5] + "");
			info.setWatchCount(obj[6] + "");
			info.setCommentCount(Integer.parseInt(obj[7] + ""));
			info.setCommentCount(obj[7]!=null? Integer.parseInt(obj[7] + ""):0);
			if (obj.length > 8) {
			String[] resourceIds = (obj[8] + "").split(",");
			List<VideoResource> resourceList = new ArrayList<VideoResource>();
			@@ -293,7 +294,7 @@
			dataList.add(info);
			}

			dataList = videoResourceMapExtraInfoService.batchExtraInfo(dataList, resourceIdList);
			dataList = videoInfoExtraService.batchExtra(dataList, resourceIdList);

			return dataList;
			}