修改本地上传文档和图片的路径

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/biz/ApiUploadBiz.java

@@ -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

@@ -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

@@ -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