Browse Source

首页视频
标题

limin 7 years ago
parent
commit
2d8163e072

+ 3 - 1
src/main/java/com/goafanti/admin/controller/AdminVideoApiController.java

@@ -162,13 +162,15 @@ public class AdminVideoApiController extends CertifyApiController {
 					buildError(ErrorConstants.PARAM_ERROR, "", "视频id不存在"));
 			return result;
 		}
-		if (StringUtils.isNotBlank(video.getUrl())) { // 如果修改了视频
+		if (StringUtils.isNotBlank(video.getUrl()) && !video.getUrl().equals(oldVideo.getUrl())) { // 如果修改了视频
 			video.setTranscoding(1);
 			// 压缩视频并将视频
 			String filename = video.getUrl();
 			String output = System.nanoTime() + ".mp4";
 			video.setUrl(createFileName() + "/" + output);
 			videoChange(filename, output, video.getUrl());
+		}else{
+			video.setUrl(null);
 		}
 
 		result.setData(adminVideoService.updateVideo(video));

+ 2 - 0
src/main/java/com/goafanti/admin/service/AdminVideoService.java

@@ -15,4 +15,6 @@ public interface AdminVideoService {
 	
 	int updateByUrl(JtVideo jtVideo);
 	
+	AdminVideoBo getIndexVideo(String summary);
+	
 }

+ 5 - 0
src/main/java/com/goafanti/admin/service/impl/AdminVideoServiceImpl.java

@@ -65,6 +65,11 @@ public class AdminVideoServiceImpl extends BaseMybatisDao<JtVideoMapper> impleme
 		return jtVideoMapper.updateByUrl(jtVideo);
 	}
 
+	@Override
+	public AdminVideoBo getIndexVideo(String summary) {
+		return jtVideoMapper.getIndexVideo(summary);
+	}
+
 	
 
 }

+ 9 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -20,6 +20,7 @@ import org.springframework.web.servlet.ModelAndView;
 
 import com.goafanti.achievement.service.AchievementInterestService;
 import com.goafanti.achievement.service.AchievementService;
+import com.goafanti.admin.service.AdminVideoService;
 import com.goafanti.app.bo.ExpertsListBo;
 import com.goafanti.banners.service.BannersService;
 import com.goafanti.business.bo.JtBusinessCategoryBo;
@@ -107,7 +108,10 @@ public class WebpageController extends BaseController {
 	@Resource
 	private JtBusinessCategoryMapper jtBusinessCategoryMapper; 
 	@Resource
-	private JtTagService jtTagService; 
+	private JtTagService jtTagService; 
+	
+	@Resource
+	private AdminVideoService adminVideoService;
 
 	@RequestMapping(value = "/user/account/index", method = RequestMethod.GET)
 	public ModelAndView index(HttpServletRequest request, ModelAndView modelview) {
@@ -862,7 +866,10 @@ public class WebpageController extends BaseController {
 		List<Banners> blist = bannersService.findBannersList("index", 0, 4, 1);
 		if(null != blist){
 			modelview.addObject("bannerlist", blist);
-		}
+		}
+		//视频
+		String url = adminVideoService.getIndexVideo("首页").getUrl();
+		modelview.addObject("vurl", url);
 		// List<AchievementObject>
 		// achievementObjects=achievementService.getHotAchievements(9, url,
 		// "web_index");

+ 2 - 0
src/main/java/com/goafanti/common/dao/JtVideoMapper.java

@@ -81,4 +81,6 @@ public interface JtVideoMapper {
 	AdminVideoBo selectById(String id);
 	
 	int updateByUrl(JtVideo video);
+	
+	AdminVideoBo getIndexVideo(String summary);
 }

+ 13 - 0
src/main/java/com/goafanti/common/mapper/JtVideoMapper.xml

@@ -506,4 +506,17 @@
     </set>
     where url = #{url,jdbcType=VARCHAR}
   </update>
+  <!-- 查看首页视频 -->
+  <select id="getIndexVideo" parameterType="java.lang.String" resultType="com.goafanti.admin.bo.AdminVideoBo">
+  select 
+    id, name, url, type, owner, create_time as createTime, status, summary, cover_url as coverUrl, 
+    release_time as releaseTime, transcoding, md5
+  	from jt_video
+    where 
+    transcoding = 2
+    and status = 1
+    and summary = #{_parameter,jdbcType=VARCHAR}
+    order by release_time desc
+    limit 1
+  </select>
 </mapper>

+ 2 - 7
src/main/webapp/WEB-INF/views/common.html

@@ -12,6 +12,7 @@
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <meta http-equiv="X-UA-Compatible" content="ie=edge">
   <th:block th:replace="${link}" />
+  <th:block th:replace="${title}" />
 <!--   <title></title> -->
 </head>
 
@@ -537,13 +538,7 @@
 				<button class="btn btn-default">返回</button>
 			</div>
 		</div>
-		<div class="initModel">
-				<div>
-				<span class="glyphicon glyphicon-remove"></span>
-				<a th:href="@{/portal/invitation}" class="moreActive">了解活动规则详情 >></a>
-				<a th:href="@{/user/signIn}" class="ljZhuCe">立即注册 >></a>
-			</div>
-		</div>
+		
 	</th:block>
 
 	<th:block th:fragment="footer(scripts)">

+ 12 - 4
src/main/webapp/WEB-INF/views/portal/index.html

@@ -145,15 +145,16 @@
 			</div>
 			<div class="wield_cont">
 				<div class="video">
-					<video id="video1" controls>
-						<source src="http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4 " type="video/mp4">
+					<video id="video1" controls="true" controlslist="nodownload">
+<!-- 						<source src="http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4 "  type="video/mp4"> -->
+						<source th:src="${vurl == null? 'http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4': 'http://118.190.205.7:8000/'+vurl}"  type="video/mp4">
 						您的浏览器不支持 HTML5 video 标签。
 					</video>
 				</div>
 				<img th:src="${portalHost+'/img/indedImg/inded5.png'}" alt="" />
 			</div>
 				<div class="moreVideo">
-				<a href="">查看更多视频 >></a>
+				<a href="/portal/video.html">查看更多视频 >></a>
 			</div>
 		</div>
 		<div class="brands">
@@ -277,8 +278,15 @@
 			<span></span>
 		</a>
 	</div>
+	<div class="initModel">
+		<div>
+			<span class="glyphicon glyphicon-remove"></span>
+			<a th:href="@{/portal/invitation}" class="moreActive">了解活动规则详情 >></a>
+			<a th:href="@{/user/signIn}" class="ljZhuCe">立即注册 >></a>
+		</div>
+	</div>
 	<footer>
-			<div th:replace="common::copyright"></div>
+		<div th:replace="common::copyright"></div>
 		<div th:replace="common::login"></div>
 	</footer>
 	<div th:replace="common::footer(~{::script})">

File diff suppressed because it is too large
+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/patent.html


+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/safeguarding.html

@@ -4,7 +4,7 @@
 	xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 
 <head th:replace="common::header(~{::title},~{::link})">
-    <title>知识产权维权</title>
+    <title>知识产权维权首页</title>
     <link th:href="${portalHost+'/dll/dll.css'}" rel="stylesheet">
     <link th:href="${portalHost+'/vendors.css'}" rel="stylesheet">
     <link th:href="${portalHost+'/newMenu/safeguarding.css'}" rel="stylesheet"></head>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/service/services.html

@@ -6,7 +6,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="ie=edge">
-    <title>运用</title>
+    <title>知识产权运用首页</title>
 <link th:href="${portalHost + '/dll/dll.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
 <link th:href="${portalHost + '/newMenu/services.css'}" rel="stylesheet">