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

门户新增目录信息；移动复制增加后缀名

This commit is contained in:
cjw 2024-06-19 17:03:17 +08:00
parent c2d42da958
commit 213766b48c
5 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,22 +2,19 @@ package org.dromara.system.controller.portal;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
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.SysHomeBannerBo;
import org.dromara.system.domain.bo.SysHomeShowBo;
import org.dromara.system.domain.bo.SysHomeTrendBo;
import org.dromara.system.domain.vo.SysHomeBannerVo;
import org.dromara.system.domain.vo.SysHomeShowVo;
import org.dromara.system.domain.vo.SysHomeTrendVo;
import org.dromara.system.service.ISysHomeBannerService;
import org.dromara.system.service.ISysHomeShowService;
import org.dromara.system.service.ISysHomeTrendService;
import org.dromara.system.domain.bo.*;
import org.dromara.system.domain.vo.*;
import org.dromara.system.service.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* <p>门户接口<p>
*
@ -36,6 +33,12 @@ public class PortalController extends BaseController {
private final ISysHomeTrendService sysHomeTrendService;
private final ISysCatalogResourceService resourceService;
private final ISysOssResourceService sysOssResourceService;
private final ISysCatalogTextbookService textbookService;
private final ISysOssTextbookService sysOssTextbookService;
/**
* 查询门户Banner列表
@ -64,4 +67,42 @@ public class PortalController extends BaseController {
return sysHomeTrendService.queryPageList(bo, pageQuery);
}
/**
* 查询目录-专题资源
*/
@SaIgnore
@GetMapping("/resource/catalog/list")
public R<List<SysCatalogResourceVo>> list(SysCatalogResourceBo bo) {
List<SysCatalogResourceVo> list = resourceService.queryList(bo);
return R.ok(list);
}
/**
* 查询专题资源列表
*/
@SaIgnore
@GetMapping("/resource/list")
public TableDataInfo<SysOssResourceVo> list(SysOssResourceBo bo, PageQuery pageQuery) {
return sysOssResourceService.queryPageList(bo, pageQuery);
}
/**
* 查询目录-同步教材
*/
@SaIgnore
@GetMapping("/textbook/catalog/list")
public R<List<SysCatalogTextbookVo>> list(SysCatalogTextbookBo bo) {
List<SysCatalogTextbookVo> list = textbookService.queryList(bo);
return R.ok(list);
}
/**
* 查询同步教材列表
*/
@SaIgnore
@GetMapping("/textbook/list")
public TableDataInfo<SysOssTextbookVo> list(SysOssTextbookBo bo, PageQuery pageQuery) {
return sysOssTextbookService.queryPageList(bo, pageQuery);
}
}

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

@ -189,6 +189,7 @@ public class SysOssPersonServiceImpl implements ISysOssPersonService {
String path = catalogService.selectCatalogNameById(bo.getCatalogId());
date.setCatalogId(bo.getCatalogId());
date.setFileName(ossPerson.getFileName());
date.setFileSuffix(ossPerson.getFileSuffix());
date.setFilePath(path);
return date;
}

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

@ -209,6 +209,7 @@ public class SysOssResourceServiceImpl implements ISysOssResourceService {
String path = catalogService.selectCatalogNameById(bo.getCatalogId());
date.setCatalogId(bo.getCatalogId());
date.setFileName(ossResource.getFileName());
date.setFileSuffix(ossResource.getFileSuffix());
date.setFilePath(path);
date.setStatus(ossResource.getStatus());
return date;

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

@ -208,6 +208,7 @@ public class SysOssTextbookServiceImpl implements ISysOssTextbookService {
String path = catalogService.selectCatalogNameById(bo.getCatalogId());
date.setCatalogId(bo.getCatalogId());
date.setFileName(ossTextbook.getFileName());
date.setFileSuffix(ossTextbook.getFileSuffix());
date.setFilePath(path);
date.setType(ossTextbook.getType());
date.setStatus(ossTextbook.getStatus());

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

@ -78,7 +78,6 @@ public class SysTeacherServiceImpl implements ISysTeacherService {
private LambdaQueryWrapper<SysTeacher> buildQueryWrapper(SysTeacherBo bo) {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysTeacher> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getDeptId() != null, SysTeacher::getDeptId, bo.getDeptId());
lqw.like(StringUtils.isNotBlank(bo.getTeacherName()), SysTeacher::getTeacherName, bo.getTeacherName());
lqw.like(StringUtils.isNotBlank(bo.getPhonenumber()), SysTeacher::getPhonenumber, bo.getPhonenumber());
lqw.and(ObjectUtil.isNotNull(bo.getDeptId()), w -> {