Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
roncoo
roncoo-education
提交
f1eab9d5
R
roncoo-education
项目概览
roncoo
/
roncoo-education
大约 1 年 前同步成功
通知
146
Star
5
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
1
Wiki
分析
仓库
DevOps
项目成员
Pages
R
roncoo-education
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
1
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
f1eab9d5
编写于
3月 14, 2019
作者:
1
1074760496
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
修改本地上传文档和图片的路径
上级
90b07e0e
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
44 addition
and
67 deletion
+44
-67
roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/ApiUploadBiz.java
...com/roncoo/education/course/service/biz/ApiUploadBiz.java
+39
-64
roncoo-education-util/src/main/java/com/roncoo/education/util/enums/VideoTypeEnum.java
...n/java/com/roncoo/education/util/enums/VideoTypeEnum.java
+1
-1
roncoo-education-util/src/main/resources/system.properties
roncoo-education-util/src/main/resources/system.properties
+4
-2
未找到文件。
roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/ApiUploadBiz.java
浏览文件 @
f1eab9d5
...
...
@@ -105,73 +105,48 @@ public class ApiUploadBiz extends BaseBiz {
callbackExecutor
.
execute
(
new
Runnable
()
{
@Override
public
void
run
()
{
// 2、异步上传到保利威视
UploadFile
uploadFile
=
new
UploadFile
();
uploadFile
.
setTitle
(
fileName
);
uploadFile
.
setDesc
(
fileName
);
uploadFile
.
setTag
(
videoFile
.
getOriginalFilename
());
uploadFile
.
setCataid
(
1L
);
// 获取系统配置信息
SysVO
sys
=
bossSys
.
getSys
();
if
(
ObjectUtil
.
isNull
(
sys
))
{
Result
.
error
(
"未配置系统配置表"
);
}
if
(
sys
.
getFileType
().
equals
(
FileTypeEnum
.
LOCAL
.
getCode
()))
{
courseVideo
.
setVideoStatus
(
VideoStatusEnum
.
SUCCES
.
getCode
());
courseVideoDao
.
updateById
(
courseVideo
);
// 根据视频编号、课时ID查询课程视频信息
CourseVideo
courseVideo
=
courseVideoDao
.
getByVideoNoAndPeriodId
(
videoNo
,
Long
.
valueOf
(
0
));
// 根据视频编号更新视频信息
List
<
CourseVideo
>
list
=
courseVideoDao
.
listByVideoNo
(
videoNo
);
for
(
CourseVideo
video
:
list
)
{
video
.
setVideoLength
(
courseVideo
.
getVideoLength
());
video
.
setVideoVid
(
courseVideo
.
getVideoVid
());
video
.
setVideoStatus
(
VideoStatusEnum
.
SUCCES
.
getCode
());
video
.
setVideoOasId
(
courseVideo
.
getVideoOasId
());
courseVideoDao
.
updateById
(
video
);
}
FileStorage
fileStorage
=
new
FileStorage
();
fileStorage
.
setFileName
(
videoFile
.
getOriginalFilename
());
fileStorage
.
setFileNo
(
videoNo
);
fileStorage
.
setFileSize
(
videoFile
.
getSize
());
fileStorage
.
setFileType
(
FileStorageTypeEnum
.
VIDEO
.
getCode
());
fileStorage
.
setFileUrl
(
targetFile
.
toString
());
fileStorageDao
.
save
(
fileStorage
);
}
else
{
// 2、异步上传到保利威视
UploadFile
uploadFile
=
new
UploadFile
();
uploadFile
.
setTitle
(
fileName
);
uploadFile
.
setDesc
(
fileName
);
uploadFile
.
setTag
(
videoFile
.
getOriginalFilename
());
uploadFile
.
setCataid
(
1L
);
UploadFileResult
result
=
PolyvUtil
.
uploadFile
(
targetFile
,
uploadFile
,
sys
.
getPolyvWritetoken
());
if
(
result
==
null
)
{
// 上传异常,不再进行处理,定时任务会继续进行处理
return
;
}
courseVideo
.
setVideoLength
(
result
.
getDuration
());
courseVideo
.
setVideoVid
(
result
.
getVid
());
courseVideo
.
setVideoStatus
(
VideoStatusEnum
.
SUCCES
.
getCode
());
courseVideoDao
.
updateById
(
courseVideo
);
// 3、异步上传到阿里云
String
videoOasId
=
AliyunUtil
.
uploadDoc
(
PlatformEnum
.
COURSE
,
targetFile
,
BeanUtil
.
copyProperties
(
sys
,
Aliyun
.
class
));
courseVideo
.
setVideoOasId
(
videoOasId
);
courseVideoDao
.
updateById
(
courseVideo
);
// 根据视频编号、课时ID查询课程视频信息
CourseVideo
courseVideo
=
courseVideoDao
.
getByVideoNoAndPeriodId
(
videoNo
,
Long
.
valueOf
(
0
));
UploadFileResult
result
=
PolyvUtil
.
uploadFile
(
targetFile
,
uploadFile
,
sys
.
getPolyvWritetoken
());
if
(
result
==
null
)
{
// 上传异常,不再进行处理,定时任务会继续进行处理
return
;
}
// 根据视频编号更新视频信息
List
<
CourseVideo
>
list
=
courseVideoDao
.
listByVideoNo
(
videoNo
);
for
(
CourseVideo
video
:
list
)
{
video
.
setVideoLength
(
courseVideo
.
getVideoLength
());
video
.
setVideoVid
(
courseVideo
.
getVideoVid
());
video
.
setVideoStatus
(
VideoStatusEnum
.
SUCCES
.
getCode
());
video
.
setVideoOasId
(
courseVideo
.
getVideoOasId
());
courseVideoDao
.
updateById
(
video
);
}
courseVideo
.
setVideoLength
(
result
.
getDuration
());
courseVideo
.
setVideoVid
(
result
.
getVid
());
courseVideo
.
setVideoStatus
(
VideoStatusEnum
.
SUCCES
.
getCode
());
courseVideoDao
.
updateById
(
courseVideo
);
// 3、异步上传到阿里云
String
videoOasId
=
AliyunUtil
.
uploadDoc
(
PlatformEnum
.
COURSE
,
targetFile
,
BeanUtil
.
copyProperties
(
sys
,
Aliyun
.
class
));
courseVideo
.
setVideoOasId
(
videoOasId
);
courseVideoDao
.
updateById
(
courseVideo
);
// 根据视频编号、课时ID查询课程视频信息
CourseVideo
courseVideo
=
courseVideoDao
.
getByVideoNoAndPeriodId
(
videoNo
,
Long
.
valueOf
(
0
));
// 根据视频编号更新视频信息
List
<
CourseVideo
>
list
=
courseVideoDao
.
listByVideoNo
(
videoNo
);
for
(
CourseVideo
video
:
list
)
{
video
.
setVideoLength
(
courseVideo
.
getVideoLength
());
video
.
setVideoVid
(
courseVideo
.
getVideoVid
());
video
.
setVideoStatus
(
VideoStatusEnum
.
SUCCES
.
getCode
());
video
.
setVideoOasId
(
courseVideo
.
getVideoOasId
());
courseVideoDao
.
updateById
(
video
);
}
// 4、成功删除本地文件
if
(
targetFile
.
isFile
()
&&
targetFile
.
exists
())
{
targetFile
.
delete
();
}
// 4、成功删除本地文件
if
(
targetFile
.
isFile
()
&&
targetFile
.
exists
())
{
targetFile
.
delete
();
}
}
});
...
...
@@ -187,7 +162,7 @@ public class ApiUploadBiz extends BaseBiz {
* @author wuyun
*/
public
Result
<
String
>
uploadPic
(
MultipartFile
picFile
)
{
if
(
ObjectUtil
.
isNotNull
(
picFile
)
&&
!
picFile
.
isEmpty
()
)
{
if
(
ObjectUtil
.
isNotNull
(
picFile
))
{
// 获取系统配置信息
SysVO
sys
=
bossSys
.
getSys
();
if
(
ObjectUtil
.
isNull
(
sys
))
{
...
...
@@ -227,7 +202,7 @@ public class ApiUploadBiz extends BaseBiz {
* @author wuyun
*/
public
Result
<
String
>
uploadDoc
(
MultipartFile
docFile
)
{
if
(
ObjectUtil
.
isNotNull
(
docFile
)
&&
!
docFile
.
isEmpty
()
)
{
if
(
ObjectUtil
.
isNotNull
(
docFile
))
{
// 获取系统配置信息
SysVO
sys
=
bossSys
.
getSys
();
if
(
ObjectUtil
.
isNull
(
sys
))
{
...
...
roncoo-education-util/src/main/java/com/roncoo/education/util/enums/VideoTypeEnum.java
浏览文件 @
f1eab9d5
...
...
@@ -13,7 +13,7 @@ import lombok.Getter;
@AllArgsConstructor
public
enum
VideoTypeEnum
{
POLYV
(
1
,
"保利威视"
),
QINIU
(
2
,
"七牛"
)
,
LOCAL
(
3
,
"本地"
)
;
POLYV
(
1
,
"保利威视"
),
QINIU
(
2
,
"七牛"
);
private
Integer
code
;
...
...
roncoo-education-util/src/main/resources/system.properties
浏览文件 @
f1eab9d5
...
...
@@ -26,5 +26,7 @@ content_length=5000
#测试课程id
test_course
=
1085453180200448002
doc_storage_path
=
D:/RonCoo/doc/
pic_storage_path
=
D:/RonCoo/pic/
\ No newline at end of file
#本地上传文档路径
doc_storage_path
=
C:/RonCoo/doc/
#本地上传路径路径
pic_storage_path
=
C:/RonCoo/pic/
\ No newline at end of file
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录