From 0d337286b12f358bfcf92305a286230cedd871f0 Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 17 Jul 2024 16:12:03 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=9B=AE=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E6=95=B0=E9=87=8F=E7=BB=9F=E8=AE=A1=EF=BC=8C=E5=85=B6?= =?UTF-8?q?=E4=BB=96bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/SysCatalogResourceController.java | 10 +++----- .../file/SysCatalogTextbookController.java | 6 ++--- .../file/SysOssResourceController.java | 3 +++ .../file/SysOssTextbookController.java | 4 +++ .../mapper/SysCatalogResourceMapper.java | 5 +++- .../mapper/SysCatalogTextbookMapper.java | 2 ++ .../service/ISysCatalogResourceService.java | 10 +++++--- .../service/ISysCatalogTextbookService.java | 11 ++++---- .../service/ISysOssResourceService.java | 8 ++++++ .../service/ISysOssTextbookService.java | 8 ++++++ .../impl/SysCatalogResourceServiceImpl.java | 25 +++++++++++++------ .../impl/SysCatalogTextbookServiceImpl.java | 16 ++++++------ .../service/impl/SysOssPersonServiceImpl.java | 3 +++ .../impl/SysOssResourceServiceImpl.java | 7 ++++++ .../impl/SysOssTextbookServiceImpl.java | 10 ++++++++ .../system/SysCatalogResourceMapper.xml | 19 +++++++------- .../system/SysCatalogTextbookMapper.xml | 9 +++++++ 17 files changed, 110 insertions(+), 46 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 3610a63..812aeee 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 @@ -9,8 +9,6 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.CatalogDragBo; import org.dromara.system.domain.bo.SysCatalogResourceBo; @@ -37,8 +35,6 @@ public class SysCatalogResourceController extends BaseController { private final ISysCatalogResourceService resourceService; - - /** * 查询目录-专题资源列表 */ @@ -50,12 +46,12 @@ public class SysCatalogResourceController extends BaseController { } /** - * 查询同步教材列表 + * 查询专题资源列表 */ @SaCheckPermission("catalog:resource:pageList") @GetMapping("/pageList") - public TableDataInfo list(SysCatalogResourceBo bo, PageQuery pageQuery) { - return resourceService.queryPageList(bo, pageQuery); + public R> pageList(SysCatalogResourceBo bo) { + return R.ok(resourceService.queryPageList(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 dd8f082..2f40c0b 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 @@ -9,8 +9,6 @@ import org.dromara.common.core.validate.EditGroup; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.CatalogDragBo; import org.dromara.system.domain.bo.SysCatalogTextbookBo; @@ -51,8 +49,8 @@ public class SysCatalogTextbookController extends BaseController { */ @SaCheckPermission("catalog:textbook:pageList") @GetMapping("/pageList") - public TableDataInfo list(SysCatalogTextbookBo bo, PageQuery pageQuery) { - return textbookService.queryPageList(bo, pageQuery); + public R> pageList(SysCatalogTextbookBo bo) { + return R.ok(textbookService.queryPageList(bo)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java index 0ccd154..70ad428 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java @@ -82,6 +82,9 @@ public class SysOssResourceController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysOssResourceBo bo) { + if (!sysOssResourceService.checkNameUnique(bo)) { + return R.fail("上传'" + bo.getFileName() + "'失败，名称已存在"); + } return toAjax(sysOssResourceService.insertByBo(bo)); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java index e09ef4d..14b26dd 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java @@ -82,6 +82,9 @@ public class SysOssTextbookController extends BaseController { @RepeatSubmit() @PostMapping() public R add(@Validated(AddGroup.class) @RequestBody SysOssTextbookBo bo) { + if (!sysOssTextbookService.checkNameUnique(bo)) { + return R.fail("上传'" + bo.getFileName() + "'失败，名称已存在"); + } return toAjax(sysOssTextbookService.insertByBo(bo)); } @@ -150,6 +153,7 @@ public class SysOssTextbookController extends BaseController { public R preview(@NotNull(message = "主键不能为空") @PathVariable Long id) throws Exception { return R.ok("操作成功", sysOssTextbookService.preview(id)); } + /** * 定稿 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java index b6cc0e3..3cf8be7 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java @@ -16,7 +16,6 @@ import org.dromara.system.domain.vo.SysCatalogResourceVo; */ @Mapper public interface SysCatalogResourceMapper extends BaseMapperPlus { - Page selectPageList(@Param("page") Page page, @Param("catalogId") Long catalogId); Page selectProtalPageList(@Param("page") Page page, @Param("tenantId") String tenantId); @@ -27,4 +26,8 @@ public interface SysCatalogResourceMapper extends BaseMapperPlus queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery); + //TableDataInfo queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery); + List queryPageList(SysCatalogResourceBo bo); /** * 分页查询门户资源列表 @@ -74,7 +76,7 @@ public interface ISysCatalogResourceService { /** * 校验并批量删除目录-专题资源信息 * - * @param catalogId 待删除的主键 + * @param catalogId 待删除的主键 * @return 是否删除成功 */ int deleteById(Long catalogId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java index 7307610..f2ef66b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java @@ -3,8 +3,6 @@ package org.dromara.system.service; import cn.hutool.core.lang.tree.Tree; import com.baomidou.mybatisplus.core.conditions.Wrapper; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.SysCatalogTextbook; import org.dromara.system.domain.bo.CatalogDragBo; import org.dromara.system.domain.bo.SysCatalogTextbookBo; @@ -39,12 +37,13 @@ public interface ISysCatalogTextbookService { /** * 分页查询同步教材列表 + * 新版修改逻辑，保留接口不动 * - * @param bo 查询条件 - * @param pageQuery 分页参数 + * @param bo 查询条件 + * //@param pageQuery 分页参数 * @return 门户Banner分页列表 */ - TableDataInfo queryPageList(SysCatalogTextbookBo bo, PageQuery pageQuery); + List queryPageList(SysCatalogTextbookBo bo); /** * 新增目录-同步教材 @@ -65,7 +64,7 @@ public interface ISysCatalogTextbookService { /** * 校验并批量删除目录-同步教材信息 * - * @param catalogId 待删除的主键 + * @param catalogId 待删除的主键 * @return 是否删除成功 */ int deleteById(Long catalogId); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java index e4e63f1..92efed8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java @@ -94,4 +94,12 @@ public interface ISysOssResourceService { String preview(Long id); + /** + * 校验名称是否唯一 + * + * @param resource 文件信息 + * @return 结果 + */ + boolean checkNameUnique(SysOssResourceBo resource); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java index ed45e3f..c759ed4 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java @@ -103,4 +103,12 @@ public interface ISysOssTextbookService { Boolean finalize(SysOssTextbookBo bo); + /** + * 校验名称是否唯一 + * + * @param textbook 文件信息 + * @return 结果 + */ + boolean checkNameUnique(SysOssTextbookBo textbook); + } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index 1645ff1..8d5ac02 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.exception.ServiceException; @@ -75,16 +74,28 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService /** * 管理使用,页面 + * 新版修改逻辑，保留接口不动 * - * @param bo 查询条件 - * @param pageQuery 分页参数 + * @param bo 查询条件 + * //@param pageQuery 分页参数 * @return */ +// @Override +// public TableDataInfo queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery) { +// //todo +// Page result = baseMapper.selectPageList(pageQuery.build(), bo.getCatalogId()); +// return TableDataInfo.build(result); +// } @Override - public TableDataInfo queryPageList(SysCatalogResourceBo bo, PageQuery pageQuery) { - //todo - Page result = baseMapper.selectPageList(pageQuery.build(), bo.getCatalogId()); - return TableDataInfo.build(result); + public List queryPageList(SysCatalogResourceBo bo) { + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .eq(SysCatalogResource::getParentId, bo.getCatalogId()) + .eq(SysCatalogResource::getDelFlag, 0)); + for (SysCatalogResourceVo one : list) { + long num = baseMapper.countOssNum(one.getCatalogId()); + one.setResourceNum(num); + } + return list; } /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java index 65cf6c5..e0c2e22 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java @@ -8,7 +8,6 @@ import com.baomidou.lock.annotation.Lock4j; import com.baomidou.mybatisplus.core.conditions.Wrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheNames; import org.dromara.common.core.exception.ServiceException; @@ -16,8 +15,6 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.TreeBuildUtils; -import org.dromara.common.mybatis.core.page.PageQuery; -import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; import org.dromara.system.domain.SysCatalogTextbook; @@ -74,10 +71,15 @@ public class SysCatalogTextbookServiceImpl implements ISysCatalogTextbookService } @Override - public TableDataInfo queryPageList(SysCatalogTextbookBo bo, PageQuery pageQuery) { - //todo - Page result = baseMapper.selectPageUserList(pageQuery.build(), bo.getCatalogId()); - return TableDataInfo.build(result); + public List queryPageList(SysCatalogTextbookBo bo) { + List list = baseMapper.selectVoList(new LambdaQueryWrapper() + .eq(SysCatalogTextbook::getParentId, bo.getCatalogId()) + .eq(SysCatalogTextbook::getDelFlag, 0)); + for (SysCatalogTextbookVo one : list) { + long num = baseMapper.countOssNum(one.getCatalogId()); + one.setResourceNum(num); + } + return list; } private LambdaQueryWrapper buildQueryWrapper(SysCatalogTextbookBo bo) { 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 7abfcce..1f25e07 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 @@ -16,6 +16,7 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.satoken.utils.LoginHelper; +import org.dromara.system.constant.StatusConstants; import org.dromara.system.domain.SysCatalogPerson; import org.dromara.system.domain.SysOssPerson; import org.dromara.system.domain.SysOssTextbook; @@ -239,6 +240,8 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { date.setFilePath(path); date.setType(ossPerson.getType()); date.setOssType(1); + date.setStatus(StatusConstants.IN_USE); + date.setFinalizeStatus(StatusConstants.DISABLED); date.setCreateDept(ossPerson.getCreateDept()); date.setCreateBy(ossPerson.getCreateBy()); date.setUpdateBy(ossPerson.getCreateBy()); 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 89124e2..f0b94ab 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 @@ -281,4 +281,11 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService { baseMapper.addPreviewNum(id); return ossService.getUrlById(ossResource.getOssId()); } + @Override + public boolean checkNameUnique(SysOssResourceBo resource) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysOssResource::getFileName, resource.getFileName()) + .eq(SysOssResource::getDelFlag, 0)); + return !exist; + } } 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 86feb66..d8bc630 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 @@ -282,6 +282,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { date.setType(ossTextbook.getType()); date.setOssType(ossTextbook.getOssType()); date.setStatus(ossTextbook.getStatus()); + date.setFinalizeStatus(ossTextbook.getFinalizeStatus()); date.setCreateDept(ossTextbook.getCreateDept()); date.setCreateBy(ossTextbook.getCreateBy()); date.setUpdateBy(LoginHelper.getUserId()); @@ -379,6 +380,15 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService { return baseMapper.insert(date) > 0; } + @Override + public boolean checkNameUnique(SysOssTextbookBo textBook) { + boolean exist = baseMapper.exists(new LambdaQueryWrapper() + .eq(SysOssTextbook::getFileName, textBook.getFileName()) + .eq(SysOssTextbook::getOssType, textBook.getOssType()) + .eq(SysOssTextbook::getDelFlag, 0)); + return !exist; + } + private LambdaQueryWrapper buildRecordQueryWrapper(SysTextbookRecord data) { return new LambdaQueryWrapper() .eq(SysTextbookRecord::getOssTextbookId, data.getOssTextbookId()) diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml index a45b3e9..2f02a04 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml @@ -4,16 +4,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - - + + diff --git a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml index 35eaa52..b5b85ff 100644 --- a/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml @@ -45,4 +45,13 @@ + +