licailing 4 жил өмнө
parent
commit
de1b494d54

+ 17 - 14
src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -300,7 +300,7 @@ public class ProgrammeService {
             for (ProgUploadDTO dto : dtos) {
                 if (dto.getName() != null && dto.getSpecialty() != null) {
                     Programme programme = new Programme(dto);
-                    System.out.println(dto.getSpecialty());
+//                    System.out.println(dto.getSpecialty());
                     ArtType specialty = artTypeMap.get(dto.getSpecialty());
                     programme.setOrganizationId(organization.getId());
                     programme.setGradingOrganizationId(gradeMap.get(dto.getGradingOrganization()));
@@ -330,20 +330,23 @@ public class ProgrammeService {
                     }
                     if (ObjectUtil.isNotNull(uploadFile) && uploadFile.exists()) {
                         // 视频
-                        if (!specialty.getCode().startsWith("03")) {
-                            // 上传
-                            String videoPath = "video/" + new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date())
-                                    + RandomStringUtils.randomAlphabetic(8)
-                                    + "." + FilenameUtils.getExtension(uploadFile.getName());
-                            String url = storageService.uploadFromInputStream(new FileInputStream(uploadFile), videoPath);
-                            VideoObject vo = new VideoObject();
-                            vo.setSrc(url);
-                            programme.setVideo(vo);
-                        } else {
-                            // 图片
-                            programme.setAnnex(this.saveImg(uploadFile));
+                        if (ObjectUtil.isNotNull(specialty)) {
+                            if (!specialty.getCode().startsWith("03")) {
+                                // 上传
+                                String videoPath = "video/" + new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date())
+                                        + RandomStringUtils.randomAlphabetic(8)
+                                        + "." + FilenameUtils.getExtension(uploadFile.getName());
+                                String url = storageService.uploadFromInputStream(new FileInputStream(uploadFile), videoPath);
+                                VideoObject vo = new VideoObject();
+                                vo.setSrc(url);
+                                programme.setVideo(vo);
+                            } else {
+                                // 图片
+                                programme.setAnnex(this.saveImg(uploadFile));
+                            }
                         }
 
+
                     }
 
                     pid = programmeRepo.save(programme).getId();
@@ -395,7 +398,7 @@ public class ProgrammeService {
         } finally {
             FileUtils.delFiles(destDir);
 
-         }
+        }
     }
 
     private String saveImg(File uploadFile) throws FileNotFoundException {