From 8458e64aab474c0fc2f49ae4ff22fb11ce5cf6e2 Mon Sep 17 00:00:00 2001
From: “djh” <“3298565835@qq.com”>
Date: 星期一, 11 十一月 2024 16:55:28 +0800
Subject: [PATCH] 批次新增学员查询条件,新增题目导入接口

---
 exam-system/src/main/java/com/gkhy/exam/system/domain/ExResource.java |   43 +++++++++++++++++++++++++------------------
 1 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExResource.java b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExResource.java
index ec280bf..1dddcf6 100644
--- a/exam-system/src/main/java/com/gkhy/exam/system/domain/ExResource.java
+++ b/exam-system/src/main/java/com/gkhy/exam/system/domain/ExResource.java
@@ -5,15 +5,13 @@
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.gkhy.exam.common.validate.ResourceGroup;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;
 import lombok.Setter;
-import org.springframework.web.multipart.MultipartFile;
+import org.hibernate.validator.constraints.Length;
 
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import java.io.Serializable;
 import java.time.LocalDateTime;
@@ -50,11 +48,17 @@
     private Integer sort;
 
     @NotBlank(message = "资源名称不能为空")
-    @ApiModelProperty(value = "资源名称",required = true)
+    @Length(min = 0, max = 50, message = "资源名称长度不能超过{max}位")
+    @ApiModelProperty(value = "资源名称(字符长度50)",required = true)
     @TableField("name")
     private String name;
 
-    @NotEmpty(message = "公司id不能为空")
+    @NotBlank(message = "文件原始名称不能为空")
+    @Length(min = 0, max = 60, message = "文件原始名称长度不能超过{max}位")
+    @ApiModelProperty(value = "文件原始名称(字符长度60)",required = true)
+    @TableField("origin_name")
+    private String originName;
+
     @ApiModelProperty(value = "提交公司id",required = true)
     @TableField("company_id")
     private Long companyId;
@@ -63,16 +67,13 @@
     @TableField("privatize")
     private Integer privatize;
 
-    @NotBlank(message = "资源种类不能为空")
+    @NotNull(message = "资源种类不能为空")
     @ApiModelProperty(value = "资源种类(1:视频2:音频;3:文档)",required = true)
     @TableField("resource_type")
     private Integer resourceType;
 
-    @NotBlank(message = "资源类型不能为空")
-    @ApiModelProperty(value = "资源类型(文件media-type属性)",required = true)
-    @TableField("media_type")
-    private String mediaType;
 
+    @NotNull(message = "资源大小不能为空")
     @ApiModelProperty("资源大小(比特)")
     @TableField("resource_size")
     private Long resourceSize;
@@ -85,9 +86,15 @@
     @TableField("resource_length")
     private Long resourceLength;
 
-    @ApiModelProperty("资源vid")
-    @TableField("video_vid")
-    private String videoVid;
+    @NotBlank(message = "资源路径不能为空")
+    @ApiModelProperty("资源路径")
+    @TableField("resource_path")
+    private String resourcePath;
+
+    @NotBlank(message = "文件md5不能为空")
+    @ApiModelProperty("文件md5")
+    @TableField("md5")
+    private String md5;
 
     @ApiModelProperty("资源页数,单位页")
     @TableField("doc_page")
@@ -118,9 +125,9 @@
     private Integer version;
 
 
-
-    @NotNull(message = "上传对象不能为空",groups = {ResourceGroup.class})
-    @ApiModelProperty(value = "上传对象",required = true)
-    @TableField(exist = false)
-    private MultipartFile file;
+//
+//    @NotNull(message = "上传对象不能为空",groups = {ResourceGroup.class})
+//    @ApiModelProperty(value = "上传对象",required = true)
+//    @TableField(exist = false)
+//    private MultipartFile file;
 }

--
Gitblit v1.9.2