Merge branch 'dev'

liwei2917
2 parents 50dfbfb5 aa98d46e
Showing 5 changed files with 42 additions and 10 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/api/LiveControllerApi.java
src/main/java/com/cnlive/shenhe/controller/ContentController.java
src/main/java/com/cnlive/shenhe/job/ContentJob.java
src/main/resources/templates/page/contentDetail.html
 package com.cnlive.shenhe.api;
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.cnlive.shenhe.bean.ErrorEnum;
 import com.cnlive.shenhe.bean.ResponseBean;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpSession;
@@ -137,6 +139,21 @@ public class ContentControllerApi {
     	List<ShyContent> contentList = contentService.findshyContent(shyContent);
     	//获取审核类型
         Integer shenheType = contentService.getShenheType(json.getInteger("spId"),"moment");
+        
+        //获取生活圈内容的类型 1：图片 2：视频 3：分享
+        Integer contentType = json.getInteger("contentType");
+        String contentImageUrl="";//内容图片地址
+        if(contentType!=null&&contentType==1){
+        	JSONArray contentImageUrlList = JSONObject.parseArray(json.getString("contentImageUrl"));//朋友圈分享的内容的url
+        	for(int i=0;i<contentImageUrlList.size();i++){
+        		 JSONObject contentImageUrlMap = contentImageUrlList.getJSONObject(i);
+        		 contentImageUrl+=contentImageUrlMap.getString("imageUrl")+",";
+        	}
+        	contentImageUrl=contentImageUrl.substring(0, contentImageUrl.length()-1);//去掉最后一个逗号
+        }else{
+        	contentImageUrl=json.getString("contentImageUrl");
+        }
+        
     	//存在则更新
     	if (contentList.size() > 0) {
     		ShyContent shyContent1 = contentList.get(0);
@@ -152,6 +169,7 @@ public class ContentControllerApi {
     		shyContent1.setCreate_date(CommonUtils.getCurrentTime());
     		shyContent1.setCallback(json.getString("callbackUrl"));//回调地址
     		shyContent1.setContent_url(json.getString("pageUrl"));//朋友圈分享的url
+    		shyContent1.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔
     		shyContent1.setSp_id(json.getInteger("spId"));//spid
     		shyContent1.setAuthor(json.getString("userId"));//用户id
     		shyContent1.setSource(json.getString("nickName"));//用户昵称
@@ -183,6 +201,7 @@ public class ContentControllerApi {
     	shyContent.setCreate_date(CommonUtils.getCurrentTime());
     	shyContent.setCallback(json.getString("callbackUrl"));//回调地址
     	shyContent.setContent_url(json.getString("pageUrl"));//朋友圈分享的url
+    	shyContent.setContent_pc_url(contentImageUrl);//朋友圈分享的内容的url，以逗号分隔
     	shyContent.setSp_id(json.getInteger("spId"));//spid
     	shyContent.setAuthor(json.getString("userId"));//用户id
 		shyContent.setSource(json.getString("nickName"));//用户昵称
@@ -91,16 +91,16 @@ public class LiveControllerApi {
         		shyLive.setActivity_end_time(timestamp_end);
         		shyLive.setIs_hot(2);//是否是热点: 1:不是 ,2: 是
         	}else if(activityStatus==1){//启动直播
-        		shyLive.setActivity_start_time(CommonUtils.getCurrentTime());
+        		shyLive.setActivity_start_time(timestamp_start);
         		shyLive.setIs_hot(2);//是否是热点: 1:不是 ,2: 是
         	}else if(activityStatus==2){//停止直播
-        		shyLive.setActivity_end_time(CommonUtils.getCurrentTime());
+        		shyLive.setActivity_end_time(timestamp_end);
         		shyLive.setPlayback_url(playbackUrl);//回放地址
         		shyLive.setShenhe_state(2);//状态 0:未认领 1.已领未审,2:已审
         		shyLive.setUpdater("自动通过");;//直播完成后自动通过
         		shyLive.setIs_hot(1);//是否是热点: 1:不是 ,2: 是
         	}else if(activityStatus==4){//审核强制下线
-        		shyLive.setActivity_end_time(CommonUtils.getCurrentTime());
+        		shyLive.setActivity_end_time(timestamp_end);
         		shyLive.setPlayback_url(playbackUrl);//回放地址
         		shyLive.setIs_hot(1);//是否是热点: 1:不是 ,2: 是
         	}
@@ -148,6 +148,14 @@ public class ContentController {
             updater =sitesService.getUpdater(updater,auditor_id);
             content.setUpdater(updater);
         }
+    	 //朋友圈内容切割内容图片或者视频地址
+        if(content.getContent_tag().equals("moment")){
+        	String[] contentImageUrlList=null;
+        	if(content.getContent_pc_url()!=null){
+        		contentImageUrlList=content.getContent_pc_url().split(",");
+        	}
+        	model.addAttribute("contentImageUrlList", contentImageUrlList);
+        }
         model.addAttribute("content", content);
         return "page/contentDetail.html";
     }
@@ -58,7 +58,7 @@ public class ContentJob {
     /**
      * 定时发送数美检测视频
      */
-   @Scheduled(cron="0 0/1 10-23 * * ? ")//每天10点到23点执行，每分钟一次
+   @Scheduled(cron="0 0/1 * * * ? ")//每分钟一次
     public void videofilter() {
     	 ShyContent shyContent = new ShyContent();
     	 shyContent.setShenhe_type(CommonConst.AUDIT_TYPE_MACHANE);//审核类型为机审
@@ -86,17 +86,22 @@
                                             </div>
                                         </div>
                                         <div class="form-group">
+                                            <label for="activity_id" class="control-label col-sm-2">图文标题:</label>
+                                            <div class="col-sm-10">
+                                                <h5 th:text="${content.title}">
+                                                    769:video:comets:604_902dce9848ac482eb433f15c2cb0c401#3025</h5>
+                                            </div>
+                                        </div>
+                                        <div class="form-group" th:if="${content.content_tag=='content'}">
                                             <label for="program_id" class="control-label col-sm-2">pc地址:</label>
-<!--                                             <button type="button" class="btn btn-primary pull-right" onclick="content(1);"></button> -->
                                             <div class="col-sm-10">
                                             <a th:href="@{${content.content_pc_url}}" th:text="${content.content_pc_url}" target="blank"></a>
                                             </div>
                                         </div>
-                                        <div class="form-group">
-                                            <label for="activity_id" class="control-label col-sm-2">图文标题:</label>
-                                            <div class="col-sm-10">
-                                                <h5 th:text="${content.title}">
-                                                    769:video:comets:604_902dce9848ac482eb433f15c2cb0c401#3025</h5>
+                                        <div class="form-group" th:if="${content.content_tag=='moment'}">
+                                            <label for="program_id" class="control-label col-sm-2">图片/视频地址:</label>
+                                            <div class="col-sm-10" th:each="contentImageUrl:${contentImageUrlList}">
+                                            <a th:href="@{${contentImageUrl}}" th:text="${contentImageUrl}" target="blank"></a>
                                             </div>
                                         </div>
                                           <div class="form-group">