添加定稿状态，修复bug

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java

@@ -42,7 +42,7 @@ public class SysCatalogResourceController extends BaseController {
     /**
      * 查询目录-专题资源列表
      */
-    @SaCheckPermission("catalog:resource:list")
+    //@SaCheckPermission("catalog:resource:list")
     @GetMapping("/list")
     public R<List<SysCatalogResourceVo>> list(SysCatalogResourceBo bo) {
         List<SysCatalogResourceVo> list = resourceService.queryList(bo);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java

@@ -39,7 +39,7 @@ public class SysCatalogTextbookController extends BaseController {
     /**
      * 查询目录-同步教材列表
      */
-    @SaCheckPermission("catalog:textbook:list")
+    //@SaCheckPermission("catalog:textbook:list")
     @GetMapping("/list")
     public R<List<SysCatalogTextbookVo>> list(SysCatalogTextbookBo bo) {
         List<SysCatalogTextbookVo> list = textbookService.queryList(bo);

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java

@@ -131,9 +131,7 @@ public class SysOssPersonController extends BaseController {
     /**
      * 预览
      *
-     * @param id
+     * @param id 主键
-     * @return
-     * @throws Exception
      */
     @SaCheckPermission("file:person:preview")
     @PostMapping("/preview/{id}")

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java

@@ -61,6 +61,11 @@ public class SysOssTextbook extends TenantEntity {
      */
     private Integer status;
 
+    /**
+     * 定稿状态
+     */
+    private Integer finalizeStatus;
+
     private Long downloadNum;
     private Long previewNum;
     private Long likeNum;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java

@@ -67,6 +67,11 @@ public class SysOssTextbookVo implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 定稿状态
+     */
+    private Integer finalizeStatus;
+
     private Long downloadNum;
     private Long previewNum;
     private Long likeNum;

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java

@@ -231,6 +231,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService {
     public boolean share(SysOssPersonBo bo) {
         SysOssPerson ossPerson = baseMapper.selectById(bo.getId());
         SysOssTextbook date = new SysOssTextbook();
+        date.setOssId(ossPerson.getOssId());
         String path = catalogTextbookService.selectCatalogNameById(bo.getCatalogId());
         date.setCatalogId(bo.getCatalogId());
         date.setFileName(ossPerson.getFileName());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java

@@ -163,7 +163,8 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService {
         add.setFileSuffix(suffix);
         String path = catalogService.selectCatalogNameById(add.getCatalogId());
         add.setFilePath(path);
-        add.setStatus(-1);
+        //add.setStatus(-1);
+        add.setStatus(1);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setOssId(add.getOssId());

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java

@@ -183,7 +183,9 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
         add.setFileSuffix(suffix);
         String path = catalogService.selectCatalogNameById(add.getCatalogId());
         add.setFilePath(path);
-        add.setStatus(-1);
+        //add.setStatus(-1);
+        add.setStatus(1);
+        add.setFinalizeStatus(StatusConstants.DISABLED);
         boolean flag = baseMapper.insert(add) > 0;
         if (flag) {
             bo.setOssId(add.getOssId());
@@ -355,7 +357,8 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
 
     @Override
     public Boolean finalize(SysOssTextbookBo bo) {
-        SysOssTextbook ossTextbook = baseMapper.selectById(bo.getId());
+        Long id = bo.getId();
+        SysOssTextbook ossTextbook = baseMapper.selectById(id);
         SysOssTextbook date = new SysOssTextbook();
         date.setOssId(ossTextbook.getOssId());
         date.setCatalogId(ossTextbook.getCatalogId());
@@ -365,9 +368,14 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
         date.setType(ossTextbook.getType());
         date.setOssType(2);
         date.setStatus(ossTextbook.getStatus());
+        date.setFinalizeStatus(StatusConstants.DISABLED);
         date.setCreateDept(ossTextbook.getCreateDept());
         date.setCreateBy(ossTextbook.getCreateBy());
         date.setUpdateBy(LoginHelper.getUserId());
+        SysOssTextbook update = new SysOssTextbook();
+        update.setId(id);
+        update.setFinalizeStatus(StatusConstants.IN_USE);
+        baseMapper.updateById(update);
         return baseMapper.insert(date) > 0;
     }