From ba2eec3a0c1dbea294c740e45505bd1768a63070 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 17 Jul 2024 14:59:24 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E7=A8=BF=E7=8A=B6?= =?UTF-8?q?=E6=80=81=EF=BC=8C=E4=BF=AE=E5=A4=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/SysCatalogResourceController.java | 2 +- .../file/SysCatalogTextbookController.java | 2 +- .../controller/file/SysOssPersonController.java | 4 +--- .../org/dromara/system/domain/SysOssTextbook.java | 5 +++++ .../dromara/system/domain/vo/SysOssTextbookVo.java | 5 +++++ .../system/service/impl/SysOssPersonServiceImpl.java | 1 + .../service/impl/SysOssResourceServiceImpl.java | 3 ++- .../service/impl/SysOssTextbookServiceImpl.java | 12 ++++++++++-- 8 files changed, 26 insertions(+), 8 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java index 2a4d74d..3610a63 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java +++ b/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(SysCatalogResourceBo bo) { List list = resourceService.queryList(bo); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java index bad44b9..dd8f082 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java +++ b/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(SysCatalogTextbookBo bo) { List list = textbookService.queryList(bo); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java index f0280ce..fdf75de 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java +++ b/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 - * @return - * @throws Exception + * @param id 主键 */ @SaCheckPermission("file:person:preview") @PostMapping("/preview/{id}") 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 945d97d..0a14dcf 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 @@ -61,6 +61,11 @@ public class SysOssTextbook extends TenantEntity { */ private Integer status; + /** + * 定稿状态 + */ + private Integer finalizeStatus; + private Long downloadNum; private Long previewNum; private Long likeNum; 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 b4f32e3..20302f6 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 @@ -67,6 +67,11 @@ public class SysOssTextbookVo implements Serializable { */ private Integer status; + /** + * 定稿状态 + */ + private Integer finalizeStatus; + private Long downloadNum; private Long previewNum; private Long likeNum; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java index 8d2dcf2..7abfcce 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssPersonServiceImpl.java +++ b/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()); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java index c8cd8c5..89124e2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java +++ b/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()); 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 1f38ff4..86feb66 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 @@ -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; }