From 9a67b942192a2b15084f6689966286b984f26499 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 25 Jun 2024 15:01:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=91=E7=9A=84=E7=A9=BA?= =?UTF-8?q?=E9=97=B4=E7=B1=BB=E5=9E=8B=EF=BC=9B=E9=97=A8=E6=88=B7=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E6=B7=BB=E5=8A=A0=E7=A7=9F=E6=88=B7id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/portal/PortalController.java | 43 ++++++++++++++----- .../dromara/system/domain/SysOssPerson.java | 5 +++ .../system/domain/bo/SysOssPersonBo.java | 6 +++ .../system/domain/vo/SysOssPersonVo.java | 5 +++ .../impl/SysCatalogResourceServiceImpl.java | 1 + .../service/impl/SysOssPersonServiceImpl.java | 1 + .../system/SysCatalogResourceMapper.xml | 4 +- .../mapper/system/SysOssTextbookMapper.xml | 1 - 8 files changed, 53 insertions(+), 13 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java index 7886dcf..7910897 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java @@ -3,12 +3,15 @@ package org.dromara.system.controller.portal; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaIgnore; import cn.hutool.core.lang.tree.Tree; +import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; +import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; +import org.dromara.common.tenant.helper.TenantHelper; import org.dromara.common.web.core.BaseController; import org.dromara.system.domain.bo.*; import org.dromara.system.domain.vo.*; @@ -47,7 +50,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/banner/list") - public TableDataInfo bannerList(SysHomeBannerBo bo, PageQuery pageQuery) { + public TableDataInfo bannerList(HttpServletRequest request,SysHomeBannerBo bo, PageQuery pageQuery) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); return bannerService.queryPageList(bo, pageQuery); } @@ -56,7 +61,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/show/list") - public TableDataInfo showList(SysHomeShowBo bo, PageQuery pageQuery) { + public TableDataInfo showList(HttpServletRequest request,SysHomeShowBo bo, PageQuery pageQuery) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); return showService.queryPageList(bo, pageQuery); } @@ -77,7 +84,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/trend/list") - public TableDataInfo trendList(SysHomeTrendBo bo, PageQuery pageQuery) { + public TableDataInfo trendList(HttpServletRequest request,SysHomeTrendBo bo, PageQuery pageQuery) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); return trendService.queryPageList(bo, pageQuery); } @@ -98,7 +107,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/resource/catalog/pageList") - public TableDataInfo pageList(SysCatalogResourceBo bo, PageQuery pageQuery) { + public TableDataInfo pageList(HttpServletRequest request,SysCatalogResourceBo bo, PageQuery pageQuery) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); return resourceService.queryProtalPageList(bo, pageQuery); } @@ -107,7 +118,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/resource/catalog/tree") - public R>> treeList(SysCatalogResourceBo bo) { + public R>> treeList(HttpServletRequest request,SysCatalogResourceBo bo) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); List> trees = resourceService.buildTreeSelect(bo); return R.ok(trees); } @@ -118,7 +131,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/resource/catalog/list") - public R> resourceCatalogList(SysCatalogResourceBo bo) { + public R> resourceCatalogList(HttpServletRequest request,SysCatalogResourceBo bo) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); List list = resourceService.queryList(bo); return R.ok(list); } @@ -128,7 +143,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/resource/list") - public TableDataInfo resourceList(SysOssResourceBo bo, PageQuery pageQuery) { + public TableDataInfo resourceList(HttpServletRequest request,SysOssResourceBo bo, PageQuery pageQuery) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); return ossResourceService.queryPageList(bo, pageQuery); } @@ -150,7 +167,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/textbook/catalog/tree") - public R>> treeList(SysCatalogTextbookBo bo) { + public R>> treeList(HttpServletRequest request,SysCatalogTextbookBo bo) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); List> trees = textbookService.buildTreeSelect(bo); return R.ok(trees); } @@ -160,7 +179,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/textbook/catalog/list") - public R> textbookCatalogList(SysCatalogTextbookBo bo) { + public R> textbookCatalogList(HttpServletRequest request,SysCatalogTextbookBo bo) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); List list = textbookService.queryList(bo); return R.ok(list); } @@ -170,7 +191,9 @@ public class PortalController extends BaseController { */ @SaIgnore @GetMapping("/textbook/list") - public TableDataInfo textbookList(SysOssTextbookBo bo, PageQuery pageQuery) { + public TableDataInfo textbookList(HttpServletRequest request,SysOssTextbookBo bo, PageQuery pageQuery) { + String tenantId = ServletUtils.getHeader(request, "Tenantid"); + TenantHelper.setDynamic(tenantId); return ossTextbookService.queryPageList(bo, pageQuery); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java index ca87c64..cd10711 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java @@ -38,6 +38,11 @@ public class SysOssPerson extends TenantEntity { */ private Long catalogId; + /** + * 1课件，2课堂，3作业，4试卷 + */ + private Integer type; + /** * */ 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 ec88441..5a6781b 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 @@ -29,6 +29,12 @@ public class SysOssPersonBo extends BaseEntity { @NotNull(message = "目录id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long catalogId; + /** + * 1课件，2课堂，3作业，4试卷 + */ + @NotNull(message = "资源类型不能为空", groups = {AddGroup.class, EditGroup.class}) + private Integer type; + @NotBlank(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class}) private String fileName; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java index 79bf6dc..9deaaf6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java @@ -41,6 +41,11 @@ public class SysOssPersonVo implements Serializable { */ private Long catalogId; + /** + * 1课件，2课堂，3作业，4试卷 + */ + private Integer type; + /** * */ 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 61e316e..9cb7270 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 @@ -216,6 +216,7 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService @Override public List> buildTreeSelect(SysCatalogResourceBo bo) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); + lqw.eq(SysCatalogResource::getDelFlag, 0); List voList = baseMapper.selectVoList(lqw); return buildCatalogTreeSelect(voList); } 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 80eac15..44701f3 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 @@ -87,6 +87,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService { private Wrapper buildQueryWrapper(SysOssPersonBo bo) { QueryWrapper wrapper = Wrappers.query(); wrapper.eq(ObjectUtil.isNotNull(bo.getCreateBy()), "op.create_by", bo.getCreateBy()) + .eq(ObjectUtil.isNotNull(bo.getType()), "op.type", bo.getType()) .eq(StringUtils.isNotEmpty(bo.getFileSuffix()), "op.file_suffix", bo.getFileSuffix()) .like(StringUtils.isNotEmpty(bo.getFileName()), "op.file_name", bo.getFileName()) .and(ObjectUtil.isNotNull(bo.getCatalogId()), w -> { 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 1923bf6..6329a03 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 @@ -8,7 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select cr.catalog_id,cr.parent_id, cr.catalog_name, cr.order_num, count(sor.oss_id) as `resourceNum` from sys_catalog_resource cr left join sys_oss_resource sor on sor.catalog_id = cr.catalog_id - where FIND_IN_SET(#{catalogId}, cr.ancestors) + where cr.del_flag = 0 and FIND_IN_SET(#{catalogId}, cr.ancestors) group by cr.catalog_id having cr.parent_id = #{catalogId} order by cr.order_num @@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select ot.*, o.volume from sys_oss_textbook ot - left join sys_oss o on o.oss_id = ot.oss_id ${ew.getCustomSqlSegment}