Merge branch 'dev'

liwei2917
2 parents 247bc88f 350d4af1
Showing 7 changed files with 78 additions and 47 deletions
src/main/java/com/cnlive/shenhe/api/ContentControllerApi.java
src/main/java/com/cnlive/shenhe/entity/ShyContent.java
src/main/java/com/cnlive/shenhe/job/ContentJob.java
src/main/java/com/cnlive/shenhe/serviceImpl/ContentServiceImpl.java
src/main/java/com/cnlive/shenhe/utils/AntiFraudUtil.java
src/main/resources/mapper/ShyContentMapper.xml
src/main/resources/templates/page/contentDetail.html
@@ -68,7 +68,8 @@ public class ContentControllerApi {
             }
             shyContent1.setCreate_date(CommonUtils.getCurrentTime());
             shyContent1.setCallback(json.getString("callback"));//回调地址
-            shyContent1.setContent_url(json.getString("contentUrl"));//图文发布的url
+            shyContent1.setContent_url(json.getString("contentUrl"));//图文发布h5的url
+            shyContent1.setContent_pc_url(json.getString("contentPCUrl"));//图文发布pc的url
             shyContent1.setSp_id(json.getInteger("spId"));//spid
             shyContent1.setContent_tag("content");//图文标签
             shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态
@@ -98,7 +99,8 @@ public class ContentControllerApi {
         }
         shyContent.setCreate_date(CommonUtils.getCurrentTime());
         shyContent.setCallback(json.getString("callback"));//回调地址
-        shyContent.setContent_url(json.getString("contentUrl"));//图文发布的url
+        shyContent.setContent_url(json.getString("contentUrl"));//图文发布h5的url
+        shyContent.setContent_pc_url(json.getString("contentPCUrl"));//图文发布pc的url
         shyContent.setSp_id(json.getInteger("spId"));//spid
         shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态
         shyContent.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间
@@ -146,7 +148,7 @@ public class ContentControllerApi {
     		shyContent1.setSp_id(json.getInteger("spId"));//spid
     		shyContent1.setAuthor(json.getString("userId"));//用户id
     		shyContent1.setSource(json.getString("nickName"));//用户昵称
-    		shyContent1.setVideoId(json.getString("videoId"));//关联videoId
+    		shyContent1.setVideo_id(json.getString("videoId"));//关联videoId
     		shyContent1.setContent_tag("moment");//图文标签
     		shyContent1.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态
     		shyContent1.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间
@@ -177,7 +179,7 @@ public class ContentControllerApi {
     	shyContent.setSp_id(json.getInteger("spId"));//spid
     	shyContent.setAuthor(json.getString("userId"));//用户id
 		shyContent.setSource(json.getString("nickName"));//用户昵称
-		shyContent.setVideoId(json.getString("videoId"));//关联videoId
+		shyContent.setVideo_id(json.getString("videoId"));//关联videoId
     	shyContent.setReceive_status(CommonConst.RECEIVE_BEFORE);//领取状态
     	shyContent.setLast_update(CommonUtils.getCurrentTime());//最后一次更新时间
     	boolean YorN = contentService.impotContent(shyContent);
@@ -19,11 +19,6 @@ public class ShyContent {
     private Integer sp_id;
     /**
-     * 内容标题
-     */
-    private String title;
-
-    /**
      * 标题图片(头像)
      */
     private String title_image;
@@ -34,11 +29,16 @@ public class ShyContent {
     private String content_tag;
     /**
-     * 图文发布的url
+     * 图文发布h5的url
      */
     private String content_url;
     /**
+     * 图文发布pc的地址
+     */
+    private String content_pc_url;
+
+    /**
      * 审核类型，1:免审，2:机审，3:人工审
      */
     private Integer shenhe_type;
@@ -66,7 +66,7 @@ public class ShyContent {
     /**
      * 关联的点播id
      */
-    private String videoId;
+    private String video_id;
     /**
      * 图文的创建时间
@@ -102,12 +102,19 @@ public class ShyContent {
      * 审核意见
      */
     private String shenhe_msg;
+
+    /**
+     * 内容标题
+     */
+    private String title;
     /**
      * sp名称
      */
     @Transient
     private String sp_desc;
+    
+   
     /**
      * @return id
@@ -160,24 +167,6 @@ public class ShyContent {
     }
     /**
-     * 获取内容标题
-     *
-     * @return title - 内容标题
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * 设置内容标题
-     *
-     * @param title 内容标题
-     */
-    public void setTitle(String title) {
-        this.title = title;
-    }
-
-    /**
      * 获取标题图片(头像)
      *
      * @return title_image - 标题图片(头像)
@@ -214,24 +203,42 @@ public class ShyContent {
     }
     /**
-     * 获取图文发布的url
+     * 获取图文发布h5的url
      *
-     * @return content_url - 图文发布的url
+     * @return content_url - 图文发布h5的url
      */
     public String getContent_url() {
         return content_url;
     }
     /**
-     * 设置图文发布的url
+     * 设置图文发布h5的url
      *
-     * @param content_url 图文发布的url
+     * @param content_url 图文发布h5的url
      */
     public void setContent_url(String content_url) {
         this.content_url = content_url;
     }
     /**
+     * 获取图文发布pc的地址
+     *
+     * @return content_pc_url - 图文发布pc的地址
+     */
+    public String getContent_pc_url() {
+        return content_pc_url;
+    }
+
+    /**
+     * 设置图文发布pc的地址
+     *
+     * @param content_pc_url 图文发布pc的地址
+     */
+    public void setContent_pc_url(String content_pc_url) {
+        this.content_pc_url = content_pc_url;
+    }
+
+    /**
      * 获取审核类型，1:免审，2:机审，3:人工审
      *
      * @return shenhe_type - 审核类型，1:免审，2:机审，3:人工审
@@ -324,19 +331,19 @@ public class ShyContent {
     /**
      * 获取关联的点播id
      *
-     * @return videoId - 关联的点播id
+     * @return video_id - 关联的点播id
      */
-    public String getVideoId() {
-        return videoId;
+    public String getVideo_id() {
+        return video_id;
     }
     /**
      * 设置关联的点播id
      *
-     * @param videoId 关联的点播id
+     * @param video_id 关联的点播id
      */
-    public void setVideoId(String videoId) {
-        this.videoId = videoId;
+    public void setVideo_id(String video_id) {
+        this.video_id = video_id;
     }
     /**
@@ -472,5 +479,21 @@ public class ShyContent {
 	public void setSp_desc(String sp_desc) {
 		this.sp_desc = sp_desc;
 	}
+    /**
+     * 获取内容标题
+     *
+     * @return title - 内容标题
+     */
+    public String getTitle() {
+        return title;
+    }
+    /**
+     * 设置内容标题
+     *
+     * @param title 内容标题
+     */
+    public void setTitle(String title) {
+        this.title = title;
+    }
 }
 \ No newline at end of file
@@ -68,7 +68,7 @@ public class ContentJob {
              for (ShyContent content : shyContentList) {
             	 logger.info("定时发送数美检测的content_id："+content.getId());
               //数美图片过滤
-             contentService.contentFilter(content,"NEWS");
+             contentService.contentFilter(content,"DEFAULT_LOGO");
              }
          }
     }
@@ -238,10 +238,10 @@ public class ContentServiceImpl {
 				//如果当前图文是朋友圈的视频，通知点播云
 				if(CommonUtils.isNotEmpty(content.getContent_tag())
 						&&content.getContent_tag().equals("moment")
-						&&CommonUtils.isNotEmpty(content.getVideoId())
+						&&CommonUtils.isNotEmpty(content.getVideo_id())
 						&&state==CommonConst.AUDIT_REFUSE){
 					ShyVideos shyVideos1 = new ShyVideos();
-			        shyVideos1.setVideo_id(content.getVideoId());
+			        shyVideos1.setVideo_id(content.getVideo_id());
 			        List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
 			        if (listshyVideos.size() > 0) {
 			            ShyVideos shyVideos = listshyVideos.get(0);
@@ -385,7 +385,7 @@ try {
         JSONObject data = new JSONObject();
         data.put("contents", contents);
         data.put("tokenId", tokenId);
-        data.put("channel", StringUtils.isNotEmpty(channel) ? channel : "NEWS");
+        data.put("channel", StringUtils.isNotEmpty(channel) ? channel : "DEFAULT_LOGO");
         userData.put("data", data);
         return HttpClientUtils.httpPost(REQUEST_URL_ARTICLE, userData,false);
@@ -8,16 +8,16 @@
     <id column="id" jdbcType="INTEGER" property="id" />
     <result column="content_id" jdbcType="VARCHAR" property="content_id" />
     <result column="sp_id" jdbcType="INTEGER" property="sp_id" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="title_image" jdbcType="VARCHAR" property="title_image" />
     <result column="content_tag" jdbcType="VARCHAR" property="content_tag" />
     <result column="content_url" jdbcType="VARCHAR" property="content_url" />
+    <result column="content_pc_url" jdbcType="VARCHAR" property="content_pc_url" />
     <result column="shenhe_type" jdbcType="INTEGER" property="shenhe_type" />
     <result column="content_status" jdbcType="INTEGER" property="content_status" />
     <result column="callback" jdbcType="VARCHAR" property="callback" />
     <result column="source" jdbcType="VARCHAR" property="source" />
     <result column="author" jdbcType="VARCHAR" property="author" />
-    <result column="videoId" jdbcType="VARCHAR" property="videoId" />
+    <result column="video_id" jdbcType="VARCHAR" property="video_id" />
     <result column="content_time" jdbcType="TIMESTAMP" property="content_time" />
     <result column="create_date" jdbcType="TIMESTAMP" property="create_date" />
     <result column="last_update" jdbcType="TIMESTAMP" property="last_update" />
@@ -25,5 +25,6 @@
     <result column="auditor_id" jdbcType="VARCHAR" property="auditor_id" />
     <result column="updater" jdbcType="VARCHAR" property="updater" />
     <result column="shenhe_msg" jdbcType="VARCHAR" property="shenhe_msg" />
+    <result column="title" jdbcType="LONGVARCHAR" property="title" />
   </resultMap>
 </mapper>
 \ No newline at end of file
@@ -85,8 +85,13 @@
                                                 <h5 th:text="${content.sp_id}+'('+${content.sp_desc}+')'">821403</h5>
                                             </div>
                                         </div>
-
-
+                                        <div class="form-group">
+                                            <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">