mozhe
/
school-file-api
5
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

添加我的空间类型；门户接口添加租户id

This commit is contained in:
cjw 2024-06-25 15:01:02 +08:00
parent a83bdf69ab
commit 9a67b94219
8 changed files with 53 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/portal/PortalController.java
View File

@ -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<SysHomeBannerVo> bannerList(SysHomeBannerBo bo, PageQuery pageQuery) {
public TableDataInfo<SysHomeBannerVo> 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<SysHomeShowVo> showList(SysHomeShowBo bo, PageQuery pageQuery) {
public TableDataInfo<SysHomeShowVo> 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<SysHomeTrendVo> trendList(SysHomeTrendBo bo, PageQuery pageQuery) {
public TableDataInfo<SysHomeTrendVo> 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<SysCatalogResourceVo> pageList(SysCatalogResourceBo bo, PageQuery pageQuery) {
public TableDataInfo<SysCatalogResourceVo> 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<List<Tree<Long>>> treeList(SysCatalogResourceBo bo) {
public R<List<Tree<Long>>> treeList(HttpServletRequest request,SysCatalogResourceBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
TenantHelper.setDynamic(tenantId);
List<Tree<Long>> trees = resourceService.buildTreeSelect(bo);
return R.ok(trees);
}
@ -118,7 +131,9 @@ public class PortalController extends BaseController {
*/
@SaIgnore
@GetMapping("/resource/catalog/list")
public R<List<SysCatalogResourceVo>> resourceCatalogList(SysCatalogResourceBo bo) {
public R<List<SysCatalogResourceVo>> resourceCatalogList(HttpServletRequest request,SysCatalogResourceBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
TenantHelper.setDynamic(tenantId);
List<SysCatalogResourceVo> list = resourceService.queryList(bo);
return R.ok(list);
}
@ -128,7 +143,9 @@ public class PortalController extends BaseController {
*/
@SaIgnore
@GetMapping("/resource/list")
public TableDataInfo<SysOssResourceVo> resourceList(SysOssResourceBo bo, PageQuery pageQuery) {
public TableDataInfo<SysOssResourceVo> 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<List<Tree<Long>>> treeList(SysCatalogTextbookBo bo) {
public R<List<Tree<Long>>> treeList(HttpServletRequest request,SysCatalogTextbookBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
TenantHelper.setDynamic(tenantId);
List<Tree<Long>> trees = textbookService.buildTreeSelect(bo);
return R.ok(trees);
}
@ -160,7 +179,9 @@ public class PortalController extends BaseController {
*/
@SaIgnore
@GetMapping("/textbook/catalog/list")
public R<List<SysCatalogTextbookVo>> textbookCatalogList(SysCatalogTextbookBo bo) {
public R<List<SysCatalogTextbookVo>> textbookCatalogList(HttpServletRequest request,SysCatalogTextbookBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
TenantHelper.setDynamic(tenantId);
List<SysCatalogTextbookVo> list = textbookService.queryList(bo);
return R.ok(list);
}
@ -170,7 +191,9 @@ public class PortalController extends BaseController {
*/
@SaIgnore
@GetMapping("/textbook/list")
public TableDataInfo<SysOssTextbookVo> textbookList(SysOssTextbookBo bo, PageQuery pageQuery) {
public TableDataInfo<SysOssTextbookVo> textbookList(HttpServletRequest request,SysOssTextbookBo bo, PageQuery pageQuery) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
TenantHelper.setDynamic(tenantId);
return ossTextbookService.queryPageList(bo, pageQuery);
}

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssPerson.java
View File

@ -38,6 +38,11 @@ public class SysOssPerson extends TenantEntity {
*/
private Long catalogId;
/**
* 1课件，2课堂，3作业，4试卷
*/
private Integer type;
/**
*
*/

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssPersonBo.java
View File

@ -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;
/**

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssPersonVo.java
View File

@ -41,6 +41,11 @@ public class SysOssPersonVo implements Serializable {
*/
private Long catalogId;
/**
* 1课件，2课堂，3作业，4试卷
*/
private Integer type;
/**
*
*/

1
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java
View File

@ -216,6 +216,7 @@ public class SysCatalogResourceServiceImpl implements ISysCatalogResourceService
@Override
public List<Tree<Long>> buildTreeSelect(SysCatalogResourceBo bo) {
LambdaQueryWrapper<SysCatalogResource> lqw = buildQueryWrapper(bo);
lqw.eq(SysCatalogResource::getDelFlag, 0);
List<SysCatalogResourceVo> voList = baseMapper.selectVoList(lqw);
return buildCatalogTreeSelect(voList);
}

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

@ -87,6 +87,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService {
private Wrapper<SysOssPerson> buildQueryWrapper(SysOssPersonBo bo) {
QueryWrapper<SysOssPerson> 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 -> {

4
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml
View File

@ -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 id="selectProtalPageList" resultType="org.dromara.system.domain.vo.SysCatalogResourceVo">
with recursive cte as (select *
from sys_catalog_resource
where parent_id = 100
where type = 2
union all
select d.*
from sys_catalog_resource d

1
ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml
View File

@ -13,7 +13,6 @@
<select id="selectPageAwaitList" resultType="org.dromara.system.domain.vo.SysOssTextbookVo">
select ot.*, o.volume
from sys_oss_textbook ot
left join sys_oss o on o.oss_id = ot.oss_id
${ew.getCustomSqlSegment}
</select>