@@ -98,7 +98,7 @@ public class VideoController extends BaseController { | |||||
return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); | return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); | ||||
} | } | ||||
VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoStream(title, multiReq.getInputStream(),fileFormat); | VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoStream(title, multiReq.getInputStream(),fileFormat); | ||||
result.setSize(String.valueOf(size)); | |||||
result.setSize(size); | |||||
return new ResultData(result); | return new ResultData(result); | ||||
} catch (Exception e) { | } catch (Exception e) { | ||||
logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
@@ -41,6 +41,7 @@ public class VideoSchedule { | |||||
if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) | if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) | ||||
&& !"0.0".equals(videoDetail.getDuration())) { | && !"0.0".equals(videoDetail.getDuration())) { | ||||
video.setVideoTime(videoDetail.getDuration()); | video.setVideoTime(videoDetail.getDuration()); | ||||
video.setVideoSize(videoDetail.getSize()); | |||||
userMouldVideoService.updateById(video); | userMouldVideoService.updateById(video); | ||||
} | } | ||||
} catch (Exception e) { | } catch (Exception e) { | ||||
@@ -64,6 +64,9 @@ public class UserMouldVideo extends TenantEntity { | |||||
@io.swagger.annotations.ApiModelProperty(value="名称",name="title") | @io.swagger.annotations.ApiModelProperty(value="名称",name="title") | ||||
private String title; | private String title; | ||||
@io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") | |||||
private String coverImg; | |||||
@io.swagger.annotations.ApiModelProperty(value="备注",name="remark") | @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") | ||||
private String remark; | private String remark; | ||||
@@ -79,8 +82,10 @@ public class UserMouldVideo extends TenantEntity { | |||||
} | } | ||||
@io.swagger.annotations.ApiModelProperty(value="",name="videoPath") | @io.swagger.annotations.ApiModelProperty(value="",name="videoPath") | ||||
private String videoPath; | private String videoPath; | ||||
@io.swagger.annotations.ApiModelProperty(value="视频时长",name="videoTime") | |||||
@io.swagger.annotations.ApiModelProperty(value="视频时长(秒)",name="videoTime") | |||||
private String videoTime; | private String videoTime; | ||||
@io.swagger.annotations.ApiModelProperty(value="视频大小(byte)",name="videoSize") | |||||
private Long videoSize; | |||||
@io.swagger.annotations.ApiModelProperty(value="EnumVideoStatus 视频状态",name="videoStatus") | @io.swagger.annotations.ApiModelProperty(value="EnumVideoStatus 视频状态",name="videoStatus") | ||||
private Integer videoStatus; | private Integer videoStatus; | ||||
@io.swagger.annotations.ApiModelProperty(value="生成视频信息",name="videoMsg") | @io.swagger.annotations.ApiModelProperty(value="生成视频信息",name="videoMsg") | ||||
@@ -15,10 +15,12 @@ | |||||
<result column="background_mould_id" jdbcType="BIGINT" property="backgroundMouldId"/> | <result column="background_mould_id" jdbcType="BIGINT" property="backgroundMouldId"/> | ||||
<result column="background_mould_sm_id" jdbcType="VARCHAR" property="backgroundMouldSmId"/> | <result column="background_mould_sm_id" jdbcType="VARCHAR" property="backgroundMouldSmId"/> | ||||
<result column="title" jdbcType="VARCHAR" property="title"/> | <result column="title" jdbcType="VARCHAR" property="title"/> | ||||
<result column="cover_img" jdbcType="VARCHAR" property="coverImg"/> | |||||
<result column="remark" jdbcType="VARCHAR" property="remark"/> | <result column="remark" jdbcType="VARCHAR" property="remark"/> | ||||
<result column="video_id" jdbcType="VARCHAR" property="videoId"/> | <result column="video_id" jdbcType="VARCHAR" property="videoId"/> | ||||
<result column="video_path" jdbcType="VARCHAR" property="videoPath"/> | <result column="video_path" jdbcType="VARCHAR" property="videoPath"/> | ||||
<result column="video_time" jdbcType="VARCHAR" property="videoTime"/> | <result column="video_time" jdbcType="VARCHAR" property="videoTime"/> | ||||
<result column="video_size" jdbcType="BIGINT" property="videoSize"/> | |||||
<result column="video_status" jdbcType="INTEGER" property="videoStatus"/> | <result column="video_status" jdbcType="INTEGER" property="videoStatus"/> | ||||
<result column="video_msg" jdbcType="VARCHAR" property="videoMsg"/> | <result column="video_msg" jdbcType="VARCHAR" property="videoMsg"/> | ||||
@@ -30,7 +32,7 @@ | |||||
<sql id="allColumns"> | <sql id="allColumns"> | ||||
`id`, `tenant_id`, `parent_tenant_id`, `user_id`, `type`, | `id`, `tenant_id`, `parent_tenant_id`, `user_id`, `type`, | ||||
`person_mould_id`, `person_mould_sm_id`, `voice_mould_id`, `voice_mould_sm_id`, `paperwork`, `background_mould_id`, `background_mould_sm_id`, | `person_mould_id`, `person_mould_sm_id`, `voice_mould_id`, `voice_mould_sm_id`, `paperwork`, `background_mould_id`, `background_mould_sm_id`, | ||||
`title`, `remark`, `video_id`, `video_path`, `video_time`, `video_status`, `video_msg`, `create_video_date`, `create_date`, `update_date` | |||||
`title`, `cover_img`, `remark`, `video_id`, `video_path`, `video_time`, `video_size`, `video_status`, `video_msg`, `create_video_date`, `create_date`, `update_date` | |||||
</sql> | </sql> | ||||
<sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||
@@ -107,7 +109,7 @@ | |||||
select | select | ||||
`id`, `type`, | `id`, `type`, | ||||
`paperwork`, | `paperwork`, | ||||
`title`, `remark`, `video_id`, `video_path`, `video_time`,`video_status`, | |||||
`title`, `cover_img`, `remark`, `video_id`, `video_path`, `video_time`, `video_size`, `video_status`, | |||||
`create_video_date`, `create_date`, `update_date` | `create_video_date`, `create_date`, `update_date` | ||||
from user_mould_video | from user_mould_video | ||||
<include refid="dynamicWhereConditions"/> | <include refid="dynamicWhereConditions"/> | ||||
@@ -116,7 +118,7 @@ | |||||
<select id="findVideo" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | <select id="findVideo" parameterType="java.util.HashMap" resultMap="BaseResultMap"> | ||||
select | select | ||||
`video_id`, `video_path`, `video_time`,`video_status`,`video_msg` | |||||
`video_id`, `video_path`, `video_time`, `video_size`, `video_status`, `video_msg` | |||||
from user_mould_video | from user_mould_video | ||||
where `id` = #{id} | where `id` = #{id} | ||||
</select> | </select> | ||||
@@ -147,6 +147,7 @@ public class AliyunVideoExcutor implements VideoExcutor { | |||||
result.setVideoUrl(playInfo.getPlayURL()); | result.setVideoUrl(playInfo.getPlayURL()); | ||||
result.setHeight(playInfo.getHeight()); | result.setHeight(playInfo.getHeight()); | ||||
result.setWidth(playInfo.getWidth()); | result.setWidth(playInfo.getWidth()); | ||||
result.setSize(playInfo.getSize()); | |||||
break; | break; | ||||
} | } | ||||
GetPlayInfoResponse.VideoBase videoBase = response.getVideoBase(); | GetPlayInfoResponse.VideoBase videoBase = response.getVideoBase(); | ||||
@@ -12,7 +12,7 @@ public class VideUploadResult { | |||||
private String coverURL;//视频封面 | private String coverURL;//视频封面 | ||||
private String duration;//视频时长 | private String duration;//视频时长 | ||||
private String title;//视频标题 | private String title;//视频标题 | ||||
private String size;//视频大小 | |||||
private Long size;//视频大小 b | |||||
private boolean success = false; | private boolean success = false; | ||||
private String msg; | private String msg; | ||||