From c3a46b95779b8cdf98a06275d9d29830a1e8e7fb Mon Sep 17 00:00:00 2001
From: cjw <miko20001@163.com>
Date: Fri, 14 Jun 2024 15:06:18 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9Etextbook=E7=9A=84=E5=AE=A1?=
 =?UTF-8?q?=E6=A0=B8=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/system/domain/SysOssTextbook.java | 15 +++++++----
 .../system/domain/bo/SysOssPersonBo.java      | 25 ++++++-------------
 .../system/domain/bo/SysOssTextbookBo.java    | 10 ++++++++
 .../system/domain/vo/SysOssTextbookVo.java    | 15 +++++++++++
 .../impl/SysOssTextbookServiceImpl.java       |  1 +
 5 files changed, 43 insertions(+), 23 deletions(-)

diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java
index 5e8814f..40e5223 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java
@@ -29,11 +29,6 @@ public class SysOssTextbook extends BaseEntity {
      */
     private Long catalogId;
 
-    /**
-     * 1课件，2课堂，3作业，4试卷
-     */
-    private Integer type;
-
     /**
      * 文件名
      */
@@ -44,4 +39,14 @@ public class SysOssTextbook extends BaseEntity {
      */
     private String filePath;
 
+    /**
+     * 1课件，2课堂，3作业，4试卷
+     */
+    private Integer type;
+
+    /**
+     * 状态
+     */
+    private Integer status;
+
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java
index b0298e6..de11ca1 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java
@@ -20,35 +20,24 @@ import jakarta.validation.constraints.*;
 @AutoMapper(target = SysOssPerson.class, reverseConvertGenerate = false)
 public class SysOssPersonBo extends BaseEntity {
 
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+    @NotNull(message = "主键不能为空", groups = {EditGroup.class})
     private Long id;
 
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "资源id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long ossId;
 
-    /**
-     * 
-     */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotNull(message = "目录id不能为空", groups = {AddGroup.class, EditGroup.class})
     private Long catalogId;
 
-    /**
-     * 
-     */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+    @NotBlank(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class})
     private String fileName;
 
     /**
-     * 
+     * 文件路径
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String filePath;
 
+    private Integer status;
+
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java
index 488e9e1..174fa76 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java
@@ -32,11 +32,21 @@ public class SysOssTextbookBo extends BaseEntity {
     @NotNull(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class})
     private String fileName;
 
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
     /**
      * 1课件，2课堂，3作业，4试卷
      */
     @NotNull(message = "资源类型不能为空", groups = {AddGroup.class, EditGroup.class})
     private Integer type;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
index d6edd8a..911a9ca 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
@@ -33,10 +33,25 @@ public class SysOssTextbookVo implements Serializable {
      */
     private Long catalogId;
 
+    /**
+     * 文件名
+     */
+    private String fileName;
+
+    /**
+     * 文件路径
+     */
+    private String filePath;
+
     /**
      * 1课件，2课堂，3作业，4试卷
      */
     private Integer type;
 
+    /**
+     * 状态
+     */
+    private Integer status;
+
 
 }
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
index 81758ec..b953e99 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java
@@ -95,6 +95,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
         SysOssTextbook add = MapstructUtils.convert(bo, SysOssTextbook.class);
         String path = catalogService.selectCatalogNameById(add.getCatalogId());
         add.setFilePath(path);
+        add.setStatus(-1);
         validEntityBeforeSave(add);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {