Merge branch 'master-bak' into 'master'

feat C1001801

See merge request rays/pcloud-common-parent!63

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/ConvertQueueDto.java

@@ -6,6 +6,7 @@ package com.pcloud.common.core.dto;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 /**
  * @描述：
@@ -89,7 +90,7 @@ public class ConvertQueueDto implements Serializable {
 	/**
 	 * 视频时长
 	 */
-	private Integer duration;
+	private BigDecimal duration;
 
 	/**
 	 * 视频m3u8地址
@@ -120,11 +121,11 @@ public class ConvertQueueDto implements Serializable {
 		this.m3u8Url = m3u8Url;
 	}
 
-	public Integer getDuration() {
+	public BigDecimal getDuration() {
 		return duration;
 	}
 
-	public void setDuration(Integer duration) {
+	public void setDuration(BigDecimal duration) {
 		this.duration = duration;
 	}
 

pcloud-common-core/src/main/java/com/pcloud/common/core/dto/dubbing/AudioDTO.java

@@ -4,6 +4,7 @@
 package com.pcloud.common.core.dto.dubbing;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 
 import com.alibaba.fastjson.JSONObject;
 
@@ -27,7 +28,7 @@ public class AudioDTO implements Serializable {
 	/**
 	 * 时长
 	 */
-	private int duration;
+	private BigDecimal duration;
 
 	/**
 	 * 文件地址
@@ -42,7 +43,7 @@ public class AudioDTO implements Serializable {
 	/**
 	 * 语音文件插入时间点
 	 */
-	private int start;
+	private BigDecimal start;
 
 	/**
 	 * id
@@ -73,11 +74,11 @@ public class AudioDTO implements Serializable {
 		this.fileName = fileName;
 	}
 
-	public int getDuration() {
+	public BigDecimal getDuration() {
 		return duration;
 	}
 
-	public void setDuration(int duration) {
+	public void setDuration(BigDecimal duration) {
 		this.duration = duration;
 	}
 
@@ -89,11 +90,11 @@ public class AudioDTO implements Serializable {
 		this.fileUrl = fileUrl;
 	}
 
-	public int getStart() {
+	public BigDecimal getStart() {
 		return start;
 	}
 
-	public void setStart(int start) {
+	public void setStart(BigDecimal start) {
 		this.start = start;
 	}
 

pcloud-common/src/main/java/com/pcloud/common/dto/OssMediaInfoDTO.java

 package com.pcloud.common.dto;
 
+import java.math.BigDecimal;
+
 /**
  * 
  * @author：songx
@@ -30,7 +32,7 @@ public class OssMediaInfoDTO extends BaseDto {
 	/**
 	 * 时长
 	 */
-	private Integer duration;
+	private BigDecimal duration;
 
 	/**
 	 * 文件大小
@@ -61,11 +63,11 @@ public class OssMediaInfoDTO extends BaseDto {
 		this.obejctKey = obejctKey;
 	}
 
-	public Integer getDuration() {
+	public BigDecimal getDuration() {
 		return duration;
 	}
 
-	public void setDuration(Integer duration) {
+	public void setDuration(BigDecimal duration) {
 		this.duration = duration;
 	}
 

pcloud-common/src/main/java/com/pcloud/common/entity/UploadResultInfo.java

@@ -9,6 +9,8 @@ package com.pcloud.common.entity;
 import com.alibaba.fastjson.JSON;
 import com.fasterxml.jackson.annotation.JsonInclude;
 
+import java.math.BigDecimal;
+
 import io.swagger.annotations.ApiModelProperty;
 
 /**
@@ -92,7 +94,7 @@ public class UploadResultInfo extends BaseEntity {
 	/**
 	 * 持续时长
 	 */
-	private Integer duration;
+	private BigDecimal duration;
 
 	/**
 	 * 封面图
@@ -189,11 +191,11 @@ public class UploadResultInfo extends BaseEntity {
 		this.pilotUrl = pilotUrl;
 	}
 
-	public Integer getDuration() {
+	public BigDecimal getDuration() {
 		return duration;
 	}
 
-	public void setDuration(Integer duration) {
+	public void setDuration(BigDecimal duration) {
 		this.duration = duration;
 	}
 

pcloud-common/src/main/java/com/pcloud/common/utils/aliyun/OssUtils.java

@@ -5,6 +5,7 @@ import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.InputStream;
 import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.List;
@@ -1050,8 +1051,7 @@ public class OssUtils {
         ossMediaInfoDTO.setLocation(AliyunConstant.getOssRegion(bucketName));
         ossMediaInfoDTO.setObejctKey(objectKey);
         ossMediaInfoDTO.setSize(StringUtil.isEmpty(format.getSize()) ? 0L : Long.parseLong(format.getSize()));
-        ossMediaInfoDTO.setDuration(
-                StringUtil.isEmpty(format.getDuration()) ? 0 : new Double(format.getDuration()).intValue());
+        ossMediaInfoDTO.setDuration(StringUtil.isEmpty(format.getDuration()) ? BigDecimal.ZERO : new BigDecimal(format.getDuration()));
         LOGGER.info("【aliOSS】获取媒体信息，仅限经过转码的音视频文件,<END>.[ossMediaInfoDTO]=" + ossMediaInfoDTO);
         return ossMediaInfoDTO;
     }
@@ -1168,7 +1168,8 @@ public class OssUtils {
         uploadResultInfo.setFlag(true);
         uploadResultInfo.setFinish(true);
         if (!StringUtil.isEmpty(duration)) {
-            uploadResultInfo.setDuration(new Double(duration).intValue());
+            // 20190930 韩双力保留四位
+            uploadResultInfo.setDuration(new BigDecimal(duration));
         }
         return uploadResultInfo;
     }