submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/course/service/impl/CourseHandoutsServiceImpl.java

@@ -41,10 +41,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -82,6 +79,7 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
         queryBo.setHandoutsId(courseHandoutsVo.getHandoutsId());
         List<CourseFileVo> courseFileVos = iCourseFileService.queryList(queryBo);
         if (CollectionUtils.isEmpty(courseFileVos)){
+            courseHandoutsVo.setFileList(new ArrayList<>());
             return courseHandoutsVo;
         }
         List<CourseFileVo> fileVos = courseFileVos.stream().filter(item -> item.getParentId() == 0L).collect(Collectors.toList());
@@ -283,10 +281,13 @@ public class CourseHandoutsServiceImpl extends ServiceImpl<CourseHandoutsMapper,
                 try {
                     //文件
                     CourseFile courseFile = new CourseFile();
-                    //上传oss
-                    String ossPath = ossService.uploadInputStream(multipartFile.getInputStream(), 17);
+                    //上传阿里云
+                    OssRequest ossRequest = new OssRequest();
+                    ossRequest.setFile(multipartFile);
+                    ossRequest.setImageStatus(17);
+                    String upload = ossService.upload(ossRequest);
                     courseFile.setUrlName(multipartFile.getOriginalFilename());
-                    courseFile.setUrl(ossPath);
+                    courseFile.setUrl(upload);
                     courseFile.setStatus(1);
                     courseFile.setSort(1);
                     courseFile.setCreateTime(DateUtils.getNowTime());