Merge branch 'dev'

周伟鹏
2 parents 6dcf9db4 543bc3d2
Showing 4 changed files with 46 additions and 11 deletions
src/main/java/com/cnlive/shenhe/api/VideosControllerApi.java
src/main/java/com/cnlive/shenhe/entity/ShyVideos.java
src/main/java/com/cnlive/shenhe/job/UsersSiteJob.java
src/main/resources/mapper/ShyVideosMapper.xml
@@ -72,6 +72,8 @@ public class VideosControllerApi {
         //g得到视频id去查询是否已有
         String videoId = json.getString("videoId");
         shyVideos1.setVideo_id(videoId);
+        Integer duration = json.getInteger("duration");
+        if (CommonUtils.isNotNull(duration)) duration = duration / 1000;
         //查询一下 存在，更新 没有，插入
         List<ShyVideos> listshyVideos = videosService.findshyVideo(shyVideos1);
         if (listshyVideos.size() > 0) {
@@ -96,6 +98,7 @@ public class VideosControllerApi {
             shyVideos.setState(CommonConst.AUDIT_INTT);
             shyVideos.setBucket(json.getString("bucketName"));
             shyVideos.setPlat(json.getInteger("bucketType"));
+            shyVideos.setDuration(duration);
             boolean YorN = videosService.updateshyVideos(shyVideos);
             if (YorN == true) {
                 return new ResponseBean(ErrorEnum.SUCCESS);
@@ -110,6 +113,10 @@ public class VideosControllerApi {
         shyVideos1.setVideo_imgs(videoCoverUrl);
         if (CommonUtils.isNotEmpty(videoCoverUrl)) {
             String poster = json.getJSONObject("videoCoverUrl").getString("224*126");
+            if (CommonUtils.isEmpty(poster)) {
+                //ugc短视频只有一张图片
+                poster = json.getJSONObject("videoCoverUrl").getString("key");
+            }
             shyVideos1.setVideo_poster(poster);
         }
         shyVideos1.setVideo_desc(json.getString("videoIntro"));
@@ -122,7 +129,10 @@ public class VideosControllerApi {
         shyVideos1.setState(CommonConst.AUDIT_INTT);
         shyVideos1.setBucket(json.getString("bucketName"));
         shyVideos1.setPlat(json.getInteger("bucketType"));
-        shyVideos1 = avsample(shyVideos1);//请求抽帧
+        shyVideos1.setDuration(duration);
+        if (CommonUtils.isNotNull(duration) && duration > 80) {
+            shyVideos1 = avsample(shyVideos1);//视频至少可以抽8张，请求抽帧
+        }
         boolean result = videosService.impotVideo(shyVideos1);
         if (result == true) {
             return new ResponseBean(ErrorEnum.SUCCESS);
@@ -147,13 +157,14 @@ public class VideosControllerApi {
             String path = video_url.replace("//", "");
             path = path.substring(path.indexOf("/"), path.length());
-            String domian = video_url.replace(path,"");
+            String domian = video_url.replace(path, "");
             path = "/" + bucket + path;
             JSONObject attach = new JSONObject();
             JSONObject extParam = new JSONObject();
-            attach.put("num", 24);
-            extParam.put("domain",domian);
+            attach.put("interval", 10);
+            attach.put("strategy", 1);
+            extParam.put("domain", domian);
             if (CommonConst.KS_PLAT == plat) {
                 //金山
                 params.put("plat", 0);
@@ -185,7 +196,7 @@ public class VideosControllerApi {
             httpUtil.setParamMap(dataMap);
             Map<String, String> resultMap = httpUtil.post(url);
             JSONObject result = JSON.parseObject(resultMap.get("result"));
-            logger.info("请求抽帧结果：result:{}",result);
+            logger.info("请求抽帧结果：result:{}", result);
             Integer code = result.getInteger("code");
             if (code == 0) {
                 video.setAvsample(CommonConst.AVSAMPLE_ING);
 package com.cnlive.shenhe.entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.persistence.Transient;
 import java.util.Date;
+import javax.persistence.*;
 @Table(name = "shy_videos")
 public class ShyVideos {
@@ -126,8 +124,10 @@ public class ShyVideos {
     private Integer plat;
     /**
-     * 审核员
+     * 视频时长，单位s
      */
+    private Integer duration;
+
     @Transient
     private String auditor;
@@ -600,4 +600,22 @@ public class ShyVideos {
     public void setPlat(Integer plat) {
         this.plat = plat;
     }
+
+    /**
+     * 获取视频时长，单位s
+     *
+     * @return duration - 视频时长，单位s
+     */
+    public Integer getDuration() {
+        return duration;
+    }
+
+    /**
+     * 设置视频时长，单位s
+     *
+     * @param duration 视频时长，单位s
+     */
+    public void setDuration(Integer duration) {
+        this.duration = duration;
+    }
 }
 \ No newline at end of file
@@ -71,7 +71,7 @@ public class UsersSiteJob {
                     //用户信息入库
                     JSONObject user = data.getJSONObject(i);
                     Integer id = user.getInteger("sid");
-                    String user_id = CommonUtils.md5(id+"");
+                    String user_id = CommonUtils.md5(id + "");
                     String email = user.getString("email");
                     Integer spid = user.getInteger("new_sp_id");
                     String userLogo = user.getString("userLogo");
@@ -108,10 +108,15 @@ public class UsersSiteJob {
                     ShySites shySites = new ShySites();
                     shySites.setSpid(spid);
                     List<ShySites> shySitesList = shySitesMapper.select(shySites);
-                    if(shySitesList.isEmpty()){
+                    if (shySitesList.isEmpty()) {
                         shySites.setCompany(company);
                         shySites.setName(company_brief);
                         shySitesMapper.insertSelective(shySites);
+                    }else if(CommonUtils.isEmpty(shySitesList.get(0).getCompany()) || CommonUtils.isEmpty(shySitesList.get(0).getName())){
+                        shySites = shySitesList.get(0);
+                        shySites.setCompany(company);
+                        shySites.setName(company_brief);
+                        shySitesMapper.updateByPrimaryKeySelective(shySites);
                     }
                 }
@@ -32,5 +32,6 @@
     <result column="task_id" jdbcType="VARCHAR" property="task_id" />
     <result column="bucket" jdbcType="VARCHAR" property="bucket" />
     <result column="plat" jdbcType="INTEGER" property="plat" />
+    <result column="duration" jdbcType="INTEGER" property="duration" />
   </resultMap>
 </mapper>
 \ No newline at end of file