zh

src/main/java/com/zh/project0512/controller/manage/ReferenceController.java

@@ -9,6 +9,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.zh.project0512.annotation.AdminCheckAuthorityAnnotation;
 import com.zh.project0512.annotation.AdminTokenValid;
 import com.zh.project0512.model.*;
+import com.zh.project0512.model.vo.FileUploadParamVo;
 import com.zh.project0512.service.IReferenceBrandService;
 import com.zh.project0512.service.IReferenceService;
 import com.zh.project0512.service.IReferenceTagService;
@@ -62,7 +63,7 @@ public class ReferenceController {
         private Integer groupId;
         @Schema(title = "文件地址列表")
         @NotEmpty(message = "fileUrl列表不能为空")
-        private List<String> fileUrlList;
+        private List<FileUploadParamVo> fileUrlList;
         @Schema(title = "封面图片地址", description = "视频文件请上传封面图片")
         private String coverUrl;
         @Schema(title = "时长", description = "视频文件请上传时长")
@@ -78,15 +79,23 @@ public class ReferenceController {
     @AdminTokenValid
     @AdminCheckAuthorityAnnotation(jurisdictionId = "7")
     public Result add(@Validated @RequestBody AddRParam param) {
-        List<String> list = param.getFileUrlList();
+        List<FileUploadParamVo> list = param.getFileUrlList();
         List<Reference> l = new ArrayList<>();
 //        List<TopicActivity> ta = new ArrayList<>();
         List<Integer> tagList = param.getTagList();
         List<Integer> brandList = param.getBrandList();
-        for (String e : list) {
+        for (FileUploadParamVo e : list) {
-            if (e.lastIndexOf(".") != -1) {
+            String url = e.getUrl();
-                l.add(new Reference().setTitle(param.getTitle()).setGroupId(param.getGroupId()).setCoverUrl(param.getCoverUrl()).setCreatAt(LocalDateTime.now())
+            if (url != null && url.lastIndexOf(".") != -1) {
-                    .setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf(".")))).setDuration(param.getDuration()));
+                l.add(new Reference()
+                    .setTitle(param.getTitle())
+                    .setGroupId(param.getGroupId())
+                    .setCoverUrl(param.getCoverUrl())
+                    .setCreatAt(LocalDateTime.now())
+                    .setDuration(e.getDuration())
+                    .setFileUrl(url)
+                    .setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf("."))))
+                    );
 //                ta.add(new TopicActivity().setTitle(param.getTitle()).setCover(param.getCoverUrl()).setCreatAt(LocalDateTime.now())
 //                    .setContent(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf(".")))));
             }

src/main/java/com/zh/project0512/controller/manage/TaskController.java

@@ -11,6 +11,7 @@ import com.zh.project0512.annotation.AdminTokenValid;
 import com.zh.project0512.model.*;
 import com.zh.project0512.model.validatedDemo.TaskValidGroup1;
 import com.zh.project0512.model.validatedDemo.TaskValidGroup2;
+import com.zh.project0512.model.vo.FileUploadParamVo;
 import com.zh.project0512.service.*;
 import com.zh.project0512.utils.CustomUtil;
 import com.zh.project0512.utils.FileTypeUtil;
@@ -102,14 +103,15 @@ public class TaskController {
             taskDepartmentService.addGroup(departmentList, id);
         }
         // 上传任务时同时上传素材
-        List<String> referenceUrlList = task.getReferenceUrlList();
+        List<FileUploadParamVo> referenceUrlList = task.getReferenceUrlList();
         if (referenceUrlList != null && referenceUrlList.size() > 0) {
             List<Reference> l = new ArrayList<>();
 //            List<TopicActivity> ta = new ArrayList<>();
-            for (String e : referenceUrlList) {
+            for (FileUploadParamVo e : referenceUrlList) {
-                if (e.lastIndexOf(".") != -1) {
+                String url = e.getUrl();
-                    l.add(new Reference().setTitle(task.getTitle()).setCoverUrl(task.getCoverUrl()).setCreatAt(LocalDateTime.now())
+                if (url != null && e.getUrl().lastIndexOf(".") != -1) {
-                        .setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf(".")))));
+                    l.add(new Reference().setTitle(task.getTitle()).setCoverUrl(task.getCoverUrl()).setDuration(e.getDuration()).setCreatAt(LocalDateTime.now())
+                        .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf(".")))));
 //                    ta.add(new TopicActivity().setTitle(task.getTitle()).setCover(task.getCoverUrl()).setCreatAt(LocalDateTime.now())
 //                        .setContent(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf(".")))));
                 }
@@ -134,11 +136,12 @@ public class TaskController {
                     .setFileUrl(e.getFileUrl()).setType(FileTypeUtil.getcontentTypeNum(e.getFileUrl().substring(e.getFileUrl().lastIndexOf("."))))));
             }
         }
-        List<String> teachRefeUrlList = task.getTeachRefeUrlList();
+        List<FileUploadParamVo> teachRefeUrlList = task.getTeachRefeUrlList();
-        for (String e : teachRefeUrlList) {
+        for (FileUploadParamVo e : teachRefeUrlList) {
-            if (e.lastIndexOf(".") != -1) {
+            String url = e.getUrl();
-                l2.add(new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now())
+            if (url != null && url.lastIndexOf(".") != -1) {
-                    .setFileUrl(e).setType(FileTypeUtil.getcontentTypeNum(e.substring(e.lastIndexOf(".")))));
+                l2.add(new TaskTeachRefe().setTaskId(id).setCreatAt(LocalDateTime.now()).setDuration(e.getDuration())
+                    .setFileUrl(url).setType(FileTypeUtil.getcontentTypeNum(url.substring(url.lastIndexOf(".")))));
             }
         }
         if (l2.size() > 0) {

src/main/java/com/zh/project0512/model/Task.java

@@ -10,6 +10,7 @@ import java.util.List;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.zh.project0512.model.validatedDemo.TaskValidGroup1;
 import com.zh.project0512.model.validatedDemo.TaskValidGroup2;
+import com.zh.project0512.model.vo.FileUploadParamVo;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Parameters;
 import io.swagger.v3.oas.annotations.media.Schema;
@@ -53,6 +54,12 @@ public class Task extends Model {
     @NotNull(message = "副标题不能为空",groups = {TaskValidGroup1.class})
     private String subtitle;
 
+    /**
+     * 图文介绍
+     */
+    @Schema(title="图文介绍")
+    private String imgText;
+
     /**
      * 封面路径
      */
@@ -112,7 +119,7 @@ public class Task extends Model {
 
     @Schema(title="上传素材url列表")
     @TableField(exist = false)
-    private List<String> referenceUrlList;
+    private List<FileUploadParamVo> referenceUrlList;
 
     @Schema(title="选择教程id列表")
     @TableField(exist = false)
@@ -120,7 +127,7 @@ public class Task extends Model {
 
     @Schema(title="上传教程url列表")
     @TableField(exist = false)
-    private List<String> teachRefeUrlList;
+    private List<FileUploadParamVo> teachRefeUrlList;
 
     @Schema(title="接受任务部门列表")
     @TableField(exist = false)

src/main/java/com/zh/project0512/model/vo/FileUploadParamVo.java

@@ -0,0 +1,25 @@
+package com.zh.project0512.model.vo;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class FileUploadParamVo implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    @Schema(title = "文件地址")
+    private String url;
+
+    @Schema(title = "时长(视频需要)")
+    private Integer duration;
+
+    @Schema(title = "封面地址(视频需要)")
+    private String cover;
+}