模板下载

src/main/java/com/izouma/wenlvju/dto/ProgUploadDTO.java

@@ -1,14 +1,9 @@
 package com.izouma.wenlvju.dto;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.alibaba.excel.annotation.ExcelIgnore;
 import com.alibaba.excel.annotation.ExcelProperty;
 import com.izouma.wenlvju.annotations.EnumFormat;
-import com.izouma.wenlvju.domain.performance.Participant;
-import com.izouma.wenlvju.domain.performance.Programme;
 import com.izouma.wenlvju.enums.CompetitionGroup;
 import com.izouma.wenlvju.utils.excel.EnumExcelConverter;
-import com.izouma.wenlvju.utils.excel.LocalDateConverter;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -18,7 +13,6 @@ import lombok.NoArgsConstructor;
 
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import java.time.LocalDate;
 
 @Data
 @AllArgsConstructor

src/main/java/com/izouma/wenlvju/dto/ProgrammeDTO.java

@@ -80,6 +80,9 @@ public class ProgrammeDTO {
     @ExcelIgnore
     private String video;
 
+    @ExcelIgnore
+    private String annex;
+
     @ExcelIgnore
     private int status;
 

src/main/java/com/izouma/wenlvju/service/performance/ProgrammeService.java

@@ -219,9 +219,9 @@ public class ProgrammeService {
                 .stream()
                 .collect(Collectors.toMap(GradingOrganization::getName, GradingOrganization::getId));
 
-        Map<String, Long> artTypeMap = artTypeRepo.findAll()
+        Map<String, ArtType> artTypeMap = artTypeRepo.findAll()
                 .stream()
-                .collect(Collectors.toMap(ArtType::getName, ArtType::getId));
+                .collect(Collectors.toMap(ArtType::getName, artType -> artType));
 
 
         List<Participant> participants = new ArrayList<>();
@@ -229,10 +229,11 @@ public class ProgrammeService {
         for (ProgUploadDTO dto : dtos) {
             if (dto.getName() != null && dto.getSpecialty() != null) {
                 Programme programme = new Programme(dto);
+                ArtType specialty = artTypeMap.get(dto.getSpecialty());
                 programme.setOrganizationId(organization.getId());
                 programme.setGradingOrganizationId(gradeMap.get(dto.getGradingOrganization()));
                 programme.setPerformanceId(performance);
-                programme.setSpecialtyId(artTypeMap.get(dto.getSpecialty()));
+                programme.setSpecialtyId(specialty.getId());
                 String level = dto.getLevel();
                 if (StrUtil.isNotBlank(level)) {
                     level = level.substring(0, 2);
@@ -249,14 +250,21 @@ public class ProgrammeService {
                     uploadFile = FileUtils.findByName(destDir, dto.getVideo());
                 }
                 if (ObjectUtil.isNotNull(uploadFile) && uploadFile.exists()) {
-                    // 上传
-                    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);
+                    // 视频
+                    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();