修改获取info 接口

刘基城
1 parent e135a207
Showing 2 changed files with 31 additions and 32 deletions
src/main/java/com/cnlive/mz/live/action/UgcLiveAction.java
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -9,7 +9,9 @@
 package com.cnlive.mz.live.action;
+import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import org.apache.commons.lang.StringUtils;
@@ -33,33 +35,44 @@ public class UgcLiveAction {
 	private UgcLiveService ugcLiveService;
 	/**
-	 * 1.0 获取直播活动信息接口Server.md
+	 * 获取直播活动信息接口(1.0\1.1)
 	 * 
 	 * @param params
 	 * @return
 	 */
-	@Request.Get("/live/epg/getLiveActivityPlayInfo4Server")
+	@Request.Get("/live/epg/info")
 	public ResultBean getLiveActivityPlayInfo4Server(Params params) {
 		ResultBean rb = new ResultBean();
 		String appId = params.getString("appId");
 		String activityId = params.getString("activityId");
 		String timestamp = params.getString("timestamp");
-		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityId)) {
-			Map<String, Object> map = new HashMap<String, Object>();
-			map.put("location", "");
+		String platform_id = params.getString("platform_id");
+		Map<String, Object> map = new HashMap<String, Object>();
+		TLive tLive = ugcLiveService.getTLiveByActivityId(appId, activityId);
+		if (tLive == null) {
+			log.error("获取直播活动信息,活动对象为空");
+			rb.setErrorCode("500");
+			rb.setErrorMessage("获取直播活动信息失败,活动对象为空");
 			rb.setData(map);
-			rb.setErrorCode("200");
-			log.error("参数不正确");
-			rb.setErrorMessage("启动活动失败");
 			return rb;
 		} else {
-			TLive tLive = ugcLiveService.getTLiveByActivityId(appId, activityId);
-			Map<String, Object> map = new HashMap<String, Object>();
 			map.put("activityId", activityId);
+			map.put("activityName", tLive.getTitle());
+			map.put("activityStatus", tLive.getT_status_id());
+			map.put("isHorizontalScreen", tLive.getDirect());
+			map.put("channelID", tLive.getRelation_id());
+			map.put("createTime", tLive.getCreate_time());
+			map.put("startTime", tLive.getStart_time());
+			map.put("endTime", tLive.getEnd_time());
+			map.put("coverImgUrl", tLive.getPoster());
+			map.put("activityCategory", tLive.getCategory());
+			map.put("extensions", tLive.getCustom_args());
+			map.put("rates", "1,2,3,4");
 			map.put("location", tLive.getLive_url());
+			map.put("extViews", new ArrayList<Map<String, Object>>());
 			rb.setData(map);
 			rb.setErrorCode("0");
-			rb.setErrorMessage("启动活动成功");
+			rb.setErrorMessage("请求成功");
 			return rb;
 		}
 	}
@@ -129,23 +142,10 @@ public class UgcLiveAction {
 		log.info(params);
 		String appId = params.getString("appId");
 		String activityid = params.getString("activityId");
-		if (StringUtils.isEmpty(appId) || StringUtils.isEmpty(activityid)) {
-			rb.setErrorCode("500");
-			rb.setErrorMessage("启动活动失败,参数不正确");
-			return rb;
-		} else {
-			TLive tLive = ugcLiveService.getTLiveByActivityId(appId, activityid);
-			if (tLive == null) {
-				log.info("tLive为空......");
-				rb.setErrorCode("500");
-				rb.setErrorMessage("启动活动失败,活动对象为空");
-				return rb;
-			} else {
-				rb.setErrorCode("0");
-				rb.setErrorMessage("启动活动成功");
-				return rb;
-			}
-		}
+		ugcLiveService.start(appId, activityid);
+		rb.setErrorCode("0");
+		rb.setErrorMessage("启动活动成功");
+		return rb;
 	}
 	/**
@@ -352,8 +352,7 @@ public class UgcLiveAction {
 		rb.setErrorMessage("失败");
 		return rb;
 	}
-	
-	
+
 	@Request.Get("/live/clientError")
 	public ResultBean error404() {
 		ResultBean rb = new ResultBean();
@@ -363,5 +362,5 @@ public class UgcLiveAction {
 		rb.setErrorCode("404");
 		rb.setErrorMessage("失败");
 		return rb;
-	} 
+	}
 }
 \ No newline at end of file
 #Generated by Maven Integration for Eclipse
-#Thu Aug 25 14:43:25 CST 2016
+#Thu Aug 25 16:34:25 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web