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

Merge branch 'dev.caojiawei' into dev

This commit is contained in:
cjw 2024-07-15 14:02:17 +08:00
parent 4c1ced76dc f72c1c6495
commit cd3191ab60
2 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/StatisticController.java
View File

@ -1,6 +1,5 @@
package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaIgnore;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.web.core.BaseController;
@ -78,7 +77,6 @@ public class StatisticController extends BaseController {
/**
* 资源使用排行榜
*/
@SaIgnore
@GetMapping("/upload/num")
public R<List<StatisticNumVo>> getUploadNum() {
return R.ok(statisticService.getUploadNum());

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

@ -1,6 +1,5 @@
package org.dromara.system.controller.portal;
import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.lang.tree.Tree;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.validation.constraints.NotNull;
@ -46,7 +45,6 @@ public class PortalController extends BaseController {
/**
* 查询门户Banner列表
*/
@SaIgnore
@GetMapping("/banner/list")
public TableDataInfo<SysHomeBannerVo> bannerList(HttpServletRequest request,SysHomeBannerBo bo, PageQuery pageQuery) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -57,7 +55,6 @@ public class PortalController extends BaseController {
/**
* 查询学校名师列表
*/
@SaIgnore
@GetMapping("/show/list")
public TableDataInfo<SysHomeShowVo> showList(HttpServletRequest request,SysHomeShowBo bo, PageQuery pageQuery) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -70,7 +67,6 @@ public class PortalController extends BaseController {
*
* @param showId 主键
*/
@SaIgnore
@GetMapping("/show/{showId}")
public R<SysHomeShowVo> getShowInfo(@NotNull(message = "主键不能为空")
@PathVariable Long showId) {
@ -80,7 +76,6 @@ public class PortalController extends BaseController {
/**
* 查询学校动态列表
*/
@SaIgnore
@GetMapping("/trend/list")
public TableDataInfo<SysHomeTrendVo> trendList(HttpServletRequest request,SysHomeTrendBo bo, PageQuery pageQuery) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -93,7 +88,6 @@ public class PortalController extends BaseController {
*
* @param trendId 主键
*/
@SaIgnore
@GetMapping("/trend/{trendId}")
public R<SysHomeTrendVo> getTrendInfo(@NotNull(message = "主键不能为空")
@PathVariable Long trendId) {
@ -103,7 +97,6 @@ public class PortalController extends BaseController {
/**
* 分页查询目录-专题资源
*/
@SaIgnore
@GetMapping("/resource/catalog/pageList")
public TableDataInfo<SysCatalogResourceVo> pageList(HttpServletRequest request,SysCatalogResourceBo bo, PageQuery pageQuery) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -115,7 +108,6 @@ public class PortalController extends BaseController {
/**
* 查询目录-专题资源
*/
@SaIgnore
@GetMapping("/resource/catalog/tree")
public R<List<Tree<Long>>> treeList(HttpServletRequest request,SysCatalogResourceBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -128,7 +120,6 @@ public class PortalController extends BaseController {
/**
* 查询目录-专题资源
*/
@SaIgnore
@GetMapping("/resource/catalog/list")
public R<List<SysCatalogResourceVo>> resourceCatalogList(HttpServletRequest request,SysCatalogResourceBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -140,7 +131,6 @@ public class PortalController extends BaseController {
/**
* 查询专题资源列表
*/
@SaIgnore
@GetMapping("/resource/list")
public TableDataInfo<SysOssResourceVo> resourceList(HttpServletRequest request,SysOssResourceBo bo, PageQuery pageQuery) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -148,14 +138,13 @@ public class PortalController extends BaseController {
return ossResourceService.queryPageList(bo, pageQuery);
}
@SaIgnore
@GetMapping("/resource/{id}")
public R<SysOssResourceVo> getResourceInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(ossResourceService.queryById(id));
}
@SaIgnore
@PostMapping("/resource/preview/{id}")
public R<String> resourcePreview(@PathVariable Long id) {
return R.ok("操作成功",ossResourceService.preview(id));
@ -164,7 +153,6 @@ public class PortalController extends BaseController {
/**
* 查询目录-同步教材
*/
@SaIgnore
@GetMapping("/textbook/catalog/tree")
public R<List<Tree<Long>>> treeList(HttpServletRequest request,SysCatalogTextbookBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -176,7 +164,6 @@ public class PortalController extends BaseController {
/**
* 查询目录-同步教材
*/
@SaIgnore
@GetMapping("/textbook/catalog/list")
public R<List<SysCatalogTextbookVo>> textbookCatalogList(HttpServletRequest request,SysCatalogTextbookBo bo) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -188,7 +175,6 @@ public class PortalController extends BaseController {
/**
* 查询同步教材列表
*/
@SaIgnore
@GetMapping("/textbook/list")
public TableDataInfo<SysOssTextbookVo> textbookList(HttpServletRequest request,SysOssTextbookBo bo, PageQuery pageQuery) {
String tenantId = ServletUtils.getHeader(request, "Tenantid");
@ -196,14 +182,12 @@ public class PortalController extends BaseController {
return ossTextbookService.queryPageList(bo, pageQuery);
}
@SaIgnore
@GetMapping("/textbook/{id}")
public R<SysOssTextbookVo> getTextbookInfo(@NotNull(message = "主键不能为空")
@PathVariable Long id) {
return R.ok(ossTextbookService.queryById(id));
}
@SaIgnore
@PostMapping("/textbook/preview/{id}")
public R<String> textbookPreview(@PathVariable Long id) {
return R.ok("操作成功",ossTextbookService.preview(id));