@@ -253,6 +253,8 @@ public class AdminVideoApiController extends CertifyApiController {
// 5.关闭线程池
service.shutdown();
// LOGGER.info("=============返回给前端=============");
+
+ //System.out.println("task运行结果" + result.get());
return "SUCESS";
}
@@ -1,5 +1,7 @@
package com.goafanti.admin.service;
+import java.util.List;
import com.goafanti.admin.bo.AdminVideoBo;
import com.goafanti.common.model.JtVideo;
import com.goafanti.core.mybatis.page.Pagination;
@@ -19,4 +21,6 @@ public interface AdminVideoService {
int nameCheck(String name);
+ List<JtVideo> getAllVideoExcludeId(String id);
@@ -2,6 +2,7 @@ package com.goafanti.admin.service.impl;
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
import java.util.UUID;
@@ -75,6 +76,11 @@ public class AdminVideoServiceImpl extends BaseMybatisDao<JtVideoMapper> impleme
return jtVideoMapper.nameCheck(name);
+ @Override
+ public List<JtVideo> getAllVideoExcludeId(String id) {
+ return jtVideoMapper.getAllVideoExcludeId(id);
+ }
@@ -237,5 +237,17 @@ public class PortalController extends BaseController {
result.setData(adminVideoService.getVideoList(video, pageNo, pageSize,2));
return result;
-
+ //跳转视频详情
+ @RequestMapping(value="/protal/videoDetail", method = RequestMethod.GET)
+ public ModelAndView videoDetail(ModelAndView modelAndView,String id){
+ modelAndView.setViewName("/portal/video/videoDetail");
+ //获得视频信息
+ modelAndView.addObject("videoPlay",adminVideoService.getVideoById(id));
+ //获得所有视频列表
+ modelAndView.addObject("videoList",adminVideoService.getAllVideoExcludeId(id));
+ return modelAndView;
@@ -85,4 +85,6 @@ public interface JtVideoMapper {
AdminVideoBo getIndexVideo(String summary);
@@ -523,4 +523,16 @@
<select id="nameCheck" parameterType="java.lang.String" resultType="java.lang.Integer">
select count(*) from jt_video where status < 3 and name = #{_parameter,jdbcType=VARCHAR}
</select>
+ <!-- 查看所有视频信息 -->
+ <select id="getAllVideoExcludeId" parameterType="java.lang.String" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from jt_video
+ where
+ transcoding = 2
+ and status = 1
+ and id <> #{_parameter,jdbcType=VARCHAR}
+ order by release_time desc
+ </select>
</mapper>
@@ -63,4 +63,9 @@ patentTemplate=SMS_72005286
avatar.host=//s.jishutao.com
-avatar.upload.host=//s.jishutao.com/upload
+avatar.upload.host=//s.jishutao.com/upload
+ffmpeg.path=/usr/bin/ffmpeg
+ffprobe.path=/usr/bin/ffprobe
+video.path=test