修改课程上传功能

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

@@ -9,17 +9,12 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
-import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.roncoo.education.course.common.bean.bo.PeriodUploadDocBO;
 import com.roncoo.education.course.service.dao.CourseAuditDao;
 import com.roncoo.education.course.service.dao.CourseChapterAuditDao;
 import com.roncoo.education.course.service.dao.CourseChapterPeriodAuditDao;
 import com.roncoo.education.course.service.dao.CourseVideoDao;
-import com.roncoo.education.course.service.dao.impl.mapper.entity.CourseAudit;
-import com.roncoo.education.course.service.dao.impl.mapper.entity.CourseChapterAudit;
-import com.roncoo.education.course.service.dao.impl.mapper.entity.CourseChapterPeriodAudit;
 import com.roncoo.education.course.service.dao.impl.mapper.entity.CourseVideo;
 import com.roncoo.education.system.common.bean.vo.SysVO;
 import com.roncoo.education.system.feign.web.IBossSys;
@@ -28,8 +23,6 @@ import com.roncoo.education.util.aliyun.AliyunUtil;
 import com.roncoo.education.util.base.BaseBiz;
 import com.roncoo.education.util.base.Result;
 import com.roncoo.education.util.config.ConfigUtil;
-import com.roncoo.education.util.enums.AuditStatusEnum;
-import com.roncoo.education.util.enums.IsDocEnum;
 import com.roncoo.education.util.enums.PlatformEnum;
 import com.roncoo.education.util.enums.VideoStatusEnum;
 import com.roncoo.education.util.polyv.PolyvUtil;
@@ -173,7 +166,6 @@ public class ApiUploadBiz extends BaseBiz {
 	 */
 	public Result<String> uploadPic(MultipartFile picFile) {
 		if (ObjectUtil.isNotNull(picFile) && !picFile.isEmpty()) {
-			// 没水印，单独上传
 			return Result.success(AliyunUtil.uploadPic(PlatformEnum.COURSE, picFile, BeanUtil.copyProperties(bossSys.getSys(), Aliyun.class)));
 		}
 		return Result.error("请选择上传的图片");
@@ -184,45 +176,8 @@ public class ApiUploadBiz extends BaseBiz {
 	 * 
 	 * @author wuyun
 	 */
-	public Result<String> uploadDoc(MultipartFile docFile, PeriodUploadDocBO bo) {
-		if (ObjectUtil.isNotNull(docFile) && !docFile.isEmpty()) { // 文档上传
-			CourseChapterPeriodAudit courseChapterPeriodAudit = courseChapterPeriodAuditDao.getById(bo.getPeriodId());
-			if (ObjectUtil.isNull(courseChapterPeriodAudit)) {
-				return Result.error("找不到课时信息");
-			}
-			SysVO sys = bossSys.getSys();
-			if (ObjectUtil.isNull(sys)) {
-				return Result.error("找不到系统配置信息");
-			}
-			if (StringUtils.isEmpty(sys.getAliyunAccessKeyId()) || StringUtils.isEmpty(sys.getAliyunAccessKeySecret())) {
-				return Result.error("accessKeyId或者accessKeySecret没配置");
-			}
-			if (StringUtils.isEmpty(sys.getAliyunOasVault()) || StringUtils.isEmpty(sys.getAliyunOssBucket()) || StringUtils.isEmpty(sys.getAliyunOssUrl())) {
-				return Result.error("oasVault,ossBucket或ossUrl没配置");
-			}
-			String url = AliyunUtil.uploadDoc(PlatformEnum.COURSE, docFile, BeanUtil.copyProperties(sys, Aliyun.class));
-
-			// 更新课程审核表为待审核状态
-			CourseAudit courseAudit = new CourseAudit();
-			courseAudit.setId(courseChapterPeriodAudit.getCourseId());
-			courseAudit.setAuditStatus(AuditStatusEnum.WAIT.getCode());
-			courseAuditDao.updateById(courseAudit);
-			// 更新章节审核表为待审核状态
-			CourseChapterAudit courseChapterAudit = new CourseChapterAudit();
-			courseChapterAudit.setId(courseChapterPeriodAudit.getChapterId());
-			courseChapterAudit.setAuditStatus(AuditStatusEnum.WAIT.getCode());
-			courseChapterAuditDao.updateById(courseChapterAudit);
-			// 更新课时审核信息
-			CourseChapterPeriodAudit periodAudit = new CourseChapterPeriodAudit();
-			periodAudit.setId(bo.getPeriodId());
-			periodAudit.setIsDoc(Integer.valueOf(IsDocEnum.YES.getCode()));
-			periodAudit.setDocName(docFile.getOriginalFilename());
-			periodAudit.setDocUrl(url);
-			periodAudit.setAuditStatus(AuditStatusEnum.WAIT.getCode());
-			courseChapterPeriodAuditDao.updateById(periodAudit);
-
-			return Result.success(url);
-		}
+	public Result<String> uploadDoc(MultipartFile docFile) {
+
 		return Result.error("请选择上传的文件");
 
 	}

roncoo-education-course/roncoo-education-course-service/src/main/java/com/roncoo/education/course/service/controller/gateway/ApiUploadController.java

@@ -4,12 +4,10 @@
 package com.roncoo.education.course.service.controller.gateway;
 
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import com.roncoo.education.course.common.bean.bo.PeriodUploadDocBO;
 import com.roncoo.education.course.common.interfaces.gateway.ApiUpload;
 import com.roncoo.education.course.service.biz.gateway.ApiUploadBiz;
 import com.roncoo.education.util.base.BaseController;
@@ -37,8 +35,8 @@ public class ApiUploadController extends BaseController implements ApiUpload {
 	}
 
 	@Override
-	public Result<String> uploadDoc(@RequestParam(name = "docFile", required = false) MultipartFile docFile, @RequestBody PeriodUploadDocBO bo) {
-		return biz.uploadDoc(docFile, bo);
+	public Result<String> uploadDoc(@RequestParam(name = "docFile", required = false) MultipartFile docFile) {
+		return biz.uploadDoc(docFile);
 	}
 
 }

roncoo-education-util/src/main/java/com/roncoo/education/util/aliyun/AliyunUtil.java

@@ -58,7 +58,7 @@ public final class AliyunUtil {
 		try {
 			downloadObject(ConfigUtil.ALIYUN_OSS_ENDPOINT, aliyun.getAliyunAccessKeyId(), aliyun.getAliyunAccessKeySecret(), aliyun.getAliyunOssBucket(), key, file);
 		} catch (IOException e) {
-			e.printStackTrace();
+			log.error("上传失败", e);
 		}
 		return file;
 	}
@@ -71,7 +71,7 @@ public final class AliyunUtil {
 			getOssClient(ConfigUtil.ALIYUN_OSS_ENDPOINT, aliyun.getAliyunAccessKeyId(), aliyun.getAliyunAccessKeySecret()).putObject(aliyun.getAliyunOssBucket(), filePath, file);
 			return aliyun.getAliyunOssUrl() + filePath;
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("上传失败", e);
 			return "";
 		}
 	}
@@ -86,7 +86,7 @@ public final class AliyunUtil {
 			getOssClient(ConfigUtil.ALIYUN_OSS_ENDPOINT, aliyun.getAliyunAccessKeyId(), aliyun.getAliyunAccessKeySecret()).putObject(aliyun.getAliyunOssBucket(), filePath, in);
 			return aliyun.getAliyunOssUrl() + filePath;
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("上传失败", e);
 			return "";
 		} finally {
 			if (in != null) {
@@ -106,7 +106,7 @@ public final class AliyunUtil {
 			putObjectForFile(ConfigUtil.ALIYUN_OSS_ENDPOINT, aliyun.getAliyunAccessKeyId(), aliyun.getAliyunAccessKeySecret(), aliyun.getAliyunOssBucket(), filePath, new FileInputStream(file), file.getName());
 			return aliyun.getAliyunOssUrl() + filePath;
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("上传失败", e);
 			return "";
 		}
 	}
@@ -121,7 +121,7 @@ public final class AliyunUtil {
 			putObjectForFile(ConfigUtil.ALIYUN_OSS_ENDPOINT, aliyun.getAliyunAccessKeyId(), aliyun.getAliyunAccessKeySecret(), aliyun.getAliyunOssBucket(), filePath, in, file.getOriginalFilename());
 			return aliyun.getAliyunOssUrl() + filePath;
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("上传失败", e);
 			return "";
 		} finally {
 			if (in != null) {
@@ -143,7 +143,7 @@ public final class AliyunUtil {
 			String filePath = url.replace(aliyun.getAliyunOssUrl(), "");
 			deleteObject(aliyun.getAliyunOssBucket(), filePath, aliyun);
 		} catch (Exception e) {
-			e.printStackTrace();
+			log.error("上传失败", e);
 		}
 	}