diff --git a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java index 3af2056..6bebd98 100644 --- a/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java +++ b/suimangAdmin/src/main/java/com/iformall/controller/video/VideoController.java @@ -98,7 +98,7 @@ public class VideoController extends BaseController { return new ResultData(ErrorCode.PICTURE_ENDWIDTH_ERROR); } VideUploadResult result = videoFactory.getExcutor(videoType).uploadVideoStream(title, multiReq.getInputStream(),fileFormat); - result.setSize(String.valueOf(size)); + result.setSize(size); return new ResultData(result); } catch (Exception e) { logger.error(e.getMessage()); diff --git a/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java b/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java index 2340409..33a0d66 100644 --- a/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java +++ b/suimangAdmin/src/main/java/com/iformall/schedule/VideoSchedule.java @@ -41,6 +41,7 @@ public class VideoSchedule { if (videoDetail.isSuccess() && StringUtils.isNotBlank(videoDetail.getDuration()) && !"0.0".equals(videoDetail.getDuration())) { video.setVideoTime(videoDetail.getDuration()); + video.setVideoSize(videoDetail.getSize()); userMouldVideoService.updateById(video); } } catch (Exception e) { diff --git a/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java index c3c4bea..0ed6d0f 100644 --- a/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java +++ b/suimangService/src/main/java/com/iformall/domain/po/sm/UserMouldVideo.java @@ -64,6 +64,9 @@ public class UserMouldVideo extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="名称",name="title") private String title; + @io.swagger.annotations.ApiModelProperty(value="封面图",name="coverImg") + private String coverImg; + @io.swagger.annotations.ApiModelProperty(value="备注",name="remark") private String remark; @@ -79,8 +82,10 @@ public class UserMouldVideo extends TenantEntity { } @io.swagger.annotations.ApiModelProperty(value="",name="videoPath") private String videoPath; - @io.swagger.annotations.ApiModelProperty(value="视频时长",name="videoTime") + @io.swagger.annotations.ApiModelProperty(value="视频时长(秒)",name="videoTime") private String videoTime; + @io.swagger.annotations.ApiModelProperty(value="视频大小(byte)",name="videoSize") + private Long videoSize; @io.swagger.annotations.ApiModelProperty(value="EnumVideoStatus 视频状态",name="videoStatus") private Integer videoStatus; @io.swagger.annotations.ApiModelProperty(value="生成视频信息",name="videoMsg") diff --git a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml index 524a95a..787cc5c 100644 --- a/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml +++ b/suimangService/src/main/resources/mapper/UserMouldVideoMapper.xml @@ -15,10 +15,12 @@ + + @@ -30,7 +32,7 @@ `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`, - `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` @@ -107,7 +109,7 @@ select `id`, `type`, `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` from user_mould_video @@ -116,7 +118,7 @@ diff --git a/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java b/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java index 637897d..bd90aee 100644 --- a/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java +++ b/suimangVideo/src/main/java/com/iformall/video/aliyun/AliyunVideoExcutor.java @@ -147,6 +147,7 @@ public class AliyunVideoExcutor implements VideoExcutor { result.setVideoUrl(playInfo.getPlayURL()); result.setHeight(playInfo.getHeight()); result.setWidth(playInfo.getWidth()); + result.setSize(playInfo.getSize()); break; } GetPlayInfoResponse.VideoBase videoBase = response.getVideoBase(); diff --git a/suimangVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java b/suimangVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java index 2ac73aa..cdd5f76 100644 --- a/suimangVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java +++ b/suimangVideo/src/main/java/com/iformall/video/entity/VideUploadResult.java @@ -12,7 +12,7 @@ public class VideUploadResult { private String coverURL;//视频封面 private String duration;//视频时长 private String title;//视频标题 - private String size;//视频大小 + private Long size;//视频大小 b private boolean success = false; private String msg;