Merge branch 'v532' into 'master'

添加直播回放act See merge request !7

Merge branch 'v532' into 'master'
添加直播回放act See merge request !7
刘基城
2 parents b6b7b17f 4f74989d
Showing 12 changed files with 68 additions and 252 deletions
.settings/org.eclipse.wst.common.component
src/main/java/com/cnlive/mz/live/action/CopyOfIndexAction.java
src/main/java/com/cnlive/mz/live/action/IndexAction.java
src/main/java/com/cnlive/mz/live/action/VideoAction.java
src/main/webapp/pages/common/left.jsp
src/main/webapp/pages/live/live_add.jsp
target/classes/com/cnlive/mz/live/action/ActivityAction.class
target/classes/com/cnlive/mz/live/action/ChannelAction.class
target/classes/com/cnlive/mz/live/action/IndexAction.class
target/classes/com/cnlive/mz/live/aspect/ActionAspect.class
target/classes/com/cnlive/mz/live/aspect/AuthFilter.class
target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
@@ -8,10 +8,16 @@
         <dependent-module archiveName="cnlive_live_model-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_live_model/cnlive_live_model">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="cnlive_ks3-1.0-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_ks3/cnlive_ks3">
+        <dependent-module archiveName="smart-framework-4.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
             <dependency-type>uses</dependency-type>
         </dependent-module>
-        <dependent-module archiveName="smart-framework-4.0.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-framework/smart-framework">
+        <dependent-module archiveName="smart-plugin-dbcp-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-dbcp/smart-plugin-dbcp">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="smart-plugin-rest-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-rest/smart-plugin-rest">
+            <dependency-type>uses</dependency-type>
+        </dependent-module>
+        <dependent-module archiveName="smart-plugin-i18n-1.0.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/smart-plugin-i18n/smart-plugin-i18n">
             <dependency-type>uses</dependency-type>
         </dependent-module>
         <dependent-module archiveName="cnlive_mam_commons-0.0.1-SNAPSHOT.jar" deploy-path="/WEB-INF/lib" handle="module:/resource/cnlive_mam_commons/cnlive_mam_commons">
-/**
- * Project Name:cnlive_live_web
- * File Name:IndexAction.java
- * Package Name:com.cnlive.mz.live.action
- * Date:2015年8月3日下午3:18:31
- * Copyright (c) 2015, cnlive.com All Rights Reserved.
- *
- */
-
-package com.cnlive.mz.live.action;
-
-import java.io.File;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import net.sf.json.JSONObject;
-
-import org.apache.commons.lang.StringUtils;
-import org.smart4j.framework.ioc.annotation.Inject;
-import org.smart4j.framework.mvc.annotation.Action;
-import org.smart4j.framework.mvc.annotation.Request;
-import org.smart4j.framework.mvc.bean.Params;
-
-import com.cnlive.mz.live.bean.Account;
-import com.cnlive.ksyun.KsYun;
-import com.cnlive.mz.commons.CNLiveFFmpeg;
-import com.cnlive.mz.commons.CnliveUtil;
-import com.cnlive.mz.commons.DateUtil;
-import com.cnlive.mz.commons.JsonUtil;
-import com.cnlive.mz.commons.net.HttpReq;
-import com.cnlive.mz.commons.sys.Scp;
-import com.cnlive.mz.live.bean.ResultBean;
-import com.cnlive.mz.live.entity.TApp;
-import com.cnlive.mz.live.entity.TDispatchServer;
-import com.cnlive.mz.live.entity.TUser;
-import com.cnlive.mz.live.entity.TVideo;
-import com.cnlive.mz.live.service.TActivityService;
-import com.cnlive.mz.live.service.TAppService;
-import com.cnlive.mz.live.service.TChannelService;
-import com.cnlive.mz.live.service.TDispatchServerService;
-import com.cnlive.mz.live.service.TUserService;
-import com.cnlive.mz.live.service.TVideoService;
-import com.cnlive.mz.live.service.TWowzaService;
-
-@Action
-public class CopyOfIndexAction {
-	@Inject
-	private TChannelService tChannelService;
-	@Inject
-	private TActivityService tActivityService;
-	@Inject
-	private TWowzaService tWowzaService;
-
-	@Inject
-	private TUserService tUserService;
-
-	@Request.Post("/api/video/uploadNotify")
-	public void uploadNotify(Params params) {
-		String video_uuid = params.getString("video_uuid");
-		String upload_type = params.getString("upload_type");
-		String video_type = params.getString("video_type");
-		String state = params.getString("state");
-		notify(video_uuid);
-		// renderJson(new ResultBean(100, "请求成功", null));
-	}
-
-	/**
-	 * sdk 方式上传
-	 */
-	@Request.Post("/api/video/supload")
-	public void supload(Params params) {
-		ResultBean resultBean = new ResultBean();
-		try {
-			Map data = new LinkedHashMap();
-			String app_access_key = params.getString("app_access_key");
-			String user_access_key = params.getString("user_access_key");
-			String server_access_key = params.getString("server_access_key");
-			String uuid = CnliveUtil.getUUID();
-			String md5 = params.getString("md5");
-			TVideo tVideo = new TVideo();
-			tVideo.setCustom_args(params.getString("custom_args"));
-			tVideo.setRelation_id(params.getString("relation_id"));
-			tVideo.setName(params.getString("name"));
-			tVideo.setVideo_type(params.getString("video_type"));
-			tVideo.setPlat(params.getString("plat"));
-			tVideo.setState(207);
-			tVideo.setMd5(md5);
-			tVideo.setVideo_uuid(uuid);
-			tVideo.setTitle(params.getString("title"));
-			tVideo.setVideo_type(params.getString("video_type"));
-			tVideo.setDescription(params.getString("description"));
-			saveSdkVideoSrc(tVideo, server_access_key, user_access_key, app_access_key);
-			resultBean.setCode(100);
-			resultBean.setMessage("请求成功");
-			data.put("video_uuid", uuid);
-			resultBean.setData(data);
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-		// renderJson(resultBean);
-	}
-
-	TDispatchServerService tDispatchServerService;
-	TAppService tAppService;
-	TVideoService tVideoService;
-
-	public void saveSdkVideoSrc(TVideo tVideo, String server_access_key, String user_access_key, String app_access_key) {
-		TDispatchServer dispatchServer = tDispatchServerService.getServerByAccessKey(server_access_key);
-		TUser user = tUserService.getUserByAccessKey(user_access_key);
-		TApp app = tAppService.getAppByAccessKey(app_access_key);
-		int video_type = Integer.parseInt(tVideo.getVideo_type());
-		String name = tVideo.getName();
-		tVideo.setT_app_id(app.getId());
-		tVideo.setT_user_id(user.getId());
-		tVideo.setT_dispatch_server_id(dispatchServer.getId());
-		tVideo.setState(207);
-		tVideoService.save(tVideo);
-	}
-
-	public void notify(String video_uuid) {
-		TVideo video = tVideoService.getVideoByUuId(video_uuid);
-		tVideoService.updateState(video.getId(), 302);
-		NotifyThread t = new NotifyThread(video);
-		t.start();
-	}
-
-	public String tempPath = "/opt/video/";
-
-	class NotifyThread extends Thread {
-		TVideo video;
-
-		NotifyThread(TVideo video) {
-			this.video = video;
-		}
-
-		@Override
-		public void run() {
-			TDispatchServer dispatchServer = tDispatchServerService.getDispatchServerById(video
-					.getT_dispatch_server_id());
-			String floder = "/home/lijielong/video/storage/";// dispatchServer.getStr("floder");
-			String account = dispatchServer.getAccount();
-			Account acc = (Account) JsonUtil.getDtoFromJsonObjStr(account, Account.class);
-			String name = video.getName();
-			String md5 = video.getMd5();
-			String ip = dispatchServer.getIp();
-			String remoteFile = floder + md5 + "/" + name;
-			boolean flag = Scp.get(ip, acc.getS_name(), acc.getS_password(), tempPath, remoteFile);
-			if (flag) {
-				String localFilePath = tempPath + name;
-				File localFile = new File(localFilePath);
-				String basePath = tempPath + DateUtil.getDays("yyyy/MM/dd/");
-				new File(basePath).mkdirs();
-				String imageKey = DateUtil.getDays("yyyy/MM/dd/") + video.getVideo_uuid() + ".jpg";
-				String imagePath = tempPath + imageKey;
-				CNLiveFFmpeg ffmpeg = new CNLiveFFmpeg(localFilePath);
-				String w = ffmpeg.getWidth();
-				String h = ffmpeg.getHeight();
-				int width = Integer.parseInt(w);
-				int height = Integer.parseInt(h);
-				CNLiveFFmpeg.getPreviewImg(localFilePath, imagePath);
-
-				File image = new File(imagePath);
-				if (!image.exists()) {
-					image = new File("/usr/local/tomcat/webapps/ROOT/resource/assets/images/336x220.jpg");
-				}
-				String ks3ImagePath = putToKS3(image, imageKey);
-				String ks3VideoPath = putToKS3(localFile, DateUtil.getDays("yyyy/MM/dd/") + name);
-				Map map = new HashMap();
-				map.put("file_path", ks3VideoPath);
-				map.put("preview_image", ks3ImagePath);
-				tVideoService.update(video.getId(), map);
-			} else {
-				System.out.println("scp get file fail " + remoteFile);
-			}
-		}
-	}
-
-	public String putToKS3(File file, String key) {
-		KsYun yun = new KsYun(false);
-		yun.singlePut("cnlive-ugc", key, file);
-		return "http://cnlive-ugc.ks3-cn-beijing.ksyun.com/" + key;
-	}
-
-	private void pushToCms(TVideo video, String start_time, String endTime) {
-		String url = "http://icms.staff.cnlive.com/icms_service/api/ugcContentSave.do";
-		JSONObject obj = JSONObject.fromObject(video.getCustom_args());
-		Map map = new HashMap();
-		map.put("MAM_UUID", video.getName());
-		map.put("MAM_USERID", String.valueOf(obj.get("userId")));
-		map.put("MAM_NickName", obj.get("nickName"));
-		map.put("MAM_Title", video.getTitle());
-		map.put("MAM_Description", video.getDescription());
-		map.put("MAM_PublishDate", start_time);
-		map.put("MAM_VideoUrl", video.getFile_path());
-		map.put("MAM_VideoHUrl", video.getFile_path());
-		map.put("MAM_VideoUHUrl", video.getFile_path());
-		map.put("MAM_VideoLUrl", video.getFile_path());
-		if (StringUtils.isNotEmpty(endTime)) {
-			map.put("MAM_EndTime", endTime);
-		}
-		JSONObject jsonObj = JSONObject.fromObject(map);
-		String str = HttpReq.postRequestWidthResult(url, "json", jsonObj.toString());
-		System.out.println("测试期间：调用cms" + str);
-	}
-
-}
@@ -15,6 +15,7 @@ import java.util.Map;
 import javax.servlet.http.HttpSession;
+import org.apache.commons.lang3.StringUtils;
 import org.smart4j.framework.core.ConfigHelper;
 import org.smart4j.framework.ioc.annotation.Inject;
 import org.smart4j.framework.mvc.DataContext;
@@ -53,7 +54,6 @@ public class IndexAction {
 	@Inject
 	private TUserService tUserService;
-	
 	int type = 1;
 	@Request.Get("/index")
@@ -89,11 +89,16 @@ public class IndexAction {
 	@Request.Post("/doswitch")
 	public Result doSwitch(Params params) {
 		String channel_ids = params.getString("channel_ids");
-		String wowza_id = params.getString("wowza_id");
-		tActivityService.doSwitch(channel_ids, Integer.parseInt(wowza_id));
-		return new Result(true);
+		if (StringUtils.isEmpty(channel_ids)) {
+			System.out.println("没选择频道");
+			return new Result(false);
+		} else {
+			String wowza_id = params.getString("wowza_id");
+			tActivityService.doSwitch(channel_ids, Integer.parseInt(wowza_id));
+			return new Result(true);
+		}
 	}
- 
+
 	@Request.Get("/login/success")
 	public View loginSuccess(Params params) {
 		String userName = params.getString("username");
@@ -102,7 +107,7 @@ public class IndexAction {
 		if (tUser == null) {
 			view = new View("index/loginfail.jsp");
 		} else {
-			HttpSession session=DataContext.getRequest().getSession();
+			HttpSession session = DataContext.getRequest().getSession();
 			session.setAttribute(LiveUtils.SESSION_KEY_NAME, tUser.getName());
 			session.setAttribute(LiveUtils.SESSION_KEY_ID, tUser.getId());
 			session.setAttribute(LiveUtils.SESSION_ROLE_ID, tUser.getIs_admin());
@@ -125,17 +130,17 @@ public class IndexAction {
 	public void logout() {
 		HttpSession session = DataContext.getRequest().getSession();
 		String logoutUrl = ConfigHelper.getString("auth.logout.url");
-		String webUrl=  ConfigHelper.getString("website.url");
+		String webUrl = ConfigHelper.getString("website.url");
 		session.removeAttribute(LiveUtils.SESSION_KEY_NAME);
 		session.removeAttribute(LiveUtils.SESSION_KEY_ID);
 		session.invalidate();
 		try {
-			DataContext.getResponse().sendRedirect(logoutUrl+webUrl+"/logout/success");
+			DataContext.getResponse().sendRedirect(logoutUrl + webUrl + "/logout/success");
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
 	}
-	
+
 	@Request.Get("/logout/success")
 	public Result logoutSuccess() {
 		return new Result(true).data("退出成功");
@@ -6,16 +6,18 @@ import java.util.Map;
 import org.smart4j.framework.dao.bean.Pager;
 import org.smart4j.framework.ioc.annotation.Inject;
+import org.smart4j.framework.mvc.DataContext;
 import org.smart4j.framework.mvc.annotation.Action;
 import org.smart4j.framework.mvc.annotation.Request;
 import org.smart4j.framework.mvc.bean.ApiBean;
 import org.smart4j.framework.mvc.bean.Params;
+import org.smart4j.framework.mvc.bean.View;
+import org.smart4j.framework.util.CastUtil;
 import com.cnlive.mz.commons.CnliveUtil;
-import com.cnlive.mz.live.entity.TApp;
+import com.cnlive.mz.live.common.LiveUtils;
 import com.cnlive.mz.live.entity.TLive;
 import com.cnlive.mz.live.entity.TVideo;
-import com.cnlive.mz.live.service.TAppService;
 import com.cnlive.mz.live.service.TDispatchServerService;
 import com.cnlive.mz.live.service.TLiveService;
 import com.cnlive.mz.live.service.TUserService;
@@ -25,8 +27,7 @@ import com.cnlive.mz.live.service.TVideoService;
 public class VideoAction {
 	@Inject
 	private TDispatchServerService tDispatchServerService;
-	@Inject
-	private TAppService tAppService;
+
 	@Inject
 	private TVideoService tVideoService;
 	@Inject
@@ -47,25 +48,8 @@ public class VideoAction {
 	public ApiBean redirect(Params params) {
 		String app_access_key = params.getString("app_access_key");
 		String video_type = params.getString("video_type");
-		String userId = params.getString("userId");
-		TApp app = tAppService.getAppByAccessKey(app_access_key);
-		ApiBean apiBean = new ApiBean();
-		apiBean.setCode(100);
-		apiBean.setMessage("请求成功");
-		Map map = tDispatchServerService.getDispatchServer(app, video_type, app_access_key);
-		String chat_room_id = "";
-		int active_id = 0;
-		String ks_id = "";
-		if (video_type.equals("3")) {
-			TLive tLive = tLiveService.save(Integer.parseInt(userId));
-			chat_room_id = tLive.getChat_room_id();
-			active_id = tLive.getId();
-			ks_id = userId + "_" + tLive.getId();
-		}
-		map.put("chat_room_id", chat_room_id);
-		map.put("active_id", active_id);
-		map.put("ks_id", ks_id);
-		apiBean.setData(map);
+		String user_id = params.getString("relation_id");
+		ApiBean apiBean = tDispatchServerService.redirect(video_type, app_access_key, user_id);
 		return apiBean;
 	}
@@ -79,14 +63,14 @@ public class VideoAction {
 		String active_id = params.getString("active_id");
 		String title = params.getString("title");
 		String description = params.getString("description");
-		String args = params.getString("custom_args");
+		String custom_args = params.getString("custom_args");
 		String uuid = CnliveUtil.getUUID();
 		String md5 = params.getString("md5");
 		String relation_id = params.getString("relation_id");
 		if (video_type.equals("2")) {
 			// 2：sdk上传录播文件
 			TVideo tVideo = new TVideo();
-			tVideo.setCustom_args(args);
+			tVideo.setCustom_args(custom_args);
 			tVideo.setRelation_id(relation_id);
 			tVideo.setName(params.getString("name"));
 			tVideo.setVideo_type(params.getString("video_type"));
@@ -106,7 +90,8 @@ public class VideoAction {
 			tLive.setUuid(uuid);
 			tLive.setUser_uuid(params.getString("name"));
 			tLive.setRelation_id(relation_id);
-			tLive.setLive_url("http://cnlive.hlslive.ks-cdn.com/live/" + relation_id + "_" + tLive.getId()
+			tLive.setCustom_args(custom_args);
+			tLive.setLive_url("http://cnlive.hlslive.ks-cdn.com/live/" + tLive.getT_user_id() + "_" + tLive.getId()
 					+ "/index.m3u8");
 			tLiveService.startLive(tLive);
 		}
@@ -125,8 +110,7 @@ public class VideoAction {
 		String pageNo = params.getString("page_no");
 		String relation_id = params.getString("relation_id");
 		String upload_type = params.getString("upload_type");
-		String page_no = params.getString("page_no");
-		String video_type = params.getString("video_type");
+		// String video_type = params.getString("video_type");
 		Pager<TVideo> page = tVideoService.findAll(app_access_key, relationId, pageNo);
 		ApiBean apiBean = new ApiBean();
 		apiBean.setCode(100);
@@ -135,6 +119,31 @@ public class VideoAction {
 		return apiBean;
 	}
+	@Request.Get("/video/list/{page_number}")
+	public View list(int page_number) {
+		int user_id = CastUtil.castInt(DataContext.getRequest().getSession().getAttribute(LiveUtils.SESSION_KEY_ID));
+		Pager<TVideo> page = tVideoService.list(user_id, page_number, 33);
+		return new View("live/video_management.jsp").data("videos", page);
+	}
+
+	@Request.Post("/video/view/{id}")
+	public View one(int id) {
+		TVideo page = tVideoService.getVideoById(id);
+		return new View("live/video_view.jsp").data("videos", page);
+	}
+
+	@Request.Post("/api/video/one")
+	public ApiBean one(Params params) {
+		String app_access_key = params.getString("app_access_key");
+		String video_uuid = params.getString("video_uuid");
+		TVideo page = tVideoService.getVideoByUuId(video_uuid);
+		ApiBean apiBean = new ApiBean();
+		apiBean.setCode(100);
+		apiBean.setMessage("请求成功");
+		apiBean.setData(page);
+		return apiBean;
+	}
+
 	@Request.Post("/api/video/uploadNotify")
 	public ApiBean uploadNotify(Params params) {
 		String video_uuid = params.getString("video_uuid");
@@ -43,12 +43,15 @@
 			    </li>
 			    <!-- 主播 -->
-			    <li class="header">系统设置</li>
+			    <li class="header">UGC直播</li>
 				<li>
 					<a href="${BASE}/room/list/1"><i class="fa fa-circle-o text-yellow"></i>直播间管理</a>
 				</li>
 				<li>
-					<a href="${BASE}/live/list/1"><i class="fa fa-circle-o text-yellow"></i>直播活动</a>
+					<a href="${BASE}/live/list/1"><i class="fa fa-circle-o text-yellow"></i>直播活动管理</a>
+				</li>
+				<li>
+					<a href="${BASE}/video/list/1"><i class="fa fa-circle-o text-yellow"></i>直播录制管理</a>
 				</li>
 			</c:if>
 			<c:if test="${sessionScope.roleId=='0'}">
@@ -82,10 +82,10 @@
 										</div>
 									</div>
 									<div class="form-group">
-										<label>海报 </label>
+										<label>封面海报 </label>
 										<div class="input-group">
 											<span class="input-group-addon"><i
-												class="fa fa-file-word-o"></i> </span> <input id="input-22" type="file" name="input-22"  accept="image/*" class="file-loading">
+												class="fa fa-file-word-o"></i> </span> <input id="input-22"   type="file" name="input-22"  accept="image/*" class="file-loading">
 										</div>
 									</div>
 									<div class="form-group">
@@ -106,7 +106,7 @@
 									</div>
 									<div class="form-group">
-										<label>活动简述 </label>
+										<label>活动简介 </label>
 										<div class="input-group">
 											<span class="input-group-addon"><i
 												class="fa fa-file-word-o"></i> </span> <script id="editor" type="text/plain" style="width:1024px;height:500px;"></script>
 #Generated by Maven Integration for Eclipse
-#Thu May 26 14:32:01 CST 2016
+#Mon Jun 06 10:53:20 CST 2016
 version=0.0.1-SNAPSHOT
 groupId=com.cnlive.mz.live.web
 m2e.projectName=cnlive_live_web