From 1f72880806fb1e11e151660bf40898f97391095a Mon Sep 17 00:00:00 2001 From: cjw Date: Wed, 26 Jun 2024 17:11:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E6=9D=83?= =?UTF-8?q?=E9=99=90=E4=BC=98=E5=8C=96=EF=BC=9B=E7=A7=9F=E6=88=B7=E4=B8=BB?= =?UTF-8?q?=E9=94=AE=E8=87=AA=E5=A2=9E=EF=BC=9B=E5=88=A0=E9=99=A4=E5=86=97?= =?UTF-8?q?=E4=BD=99=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/SysCatalogPersonController.java | 13 -------- .../file/SysHomeShowController.java | 2 -- .../file/SysHomeTrendController.java | 1 - .../file/SysOssPersonController.java | 30 +++---------------- .../file/SysOssResourceController.java | 10 ------- .../file/SysOssTextbookController.java | 11 ------- .../controller/system/SysOssController.java | 29 +++++++++++++++--- .../org/dromara/system/domain/SysTenant.java | 3 +- .../system/domain/SysTenantPackage.java | 11 ++++--- .../system/domain/vo/SysCatalogPersonVo.java | 14 +-------- .../service/impl/SysOssServiceImpl.java | 2 -- .../service/impl/SysTenantServiceImpl.java | 2 +- 12 files changed, 40 insertions(+), 88 deletions(-) diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogPersonController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogPersonController.java index 7066a28..e294c2b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogPersonController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogPersonController.java @@ -1,13 +1,11 @@ package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; -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.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; @@ -44,17 +42,6 @@ public class SysCatalogPersonController extends BaseController { return R.ok(list); } - /** - * 导出目录-我的空间列表 - */ - @SaCheckPermission("catalog:person:export") - @Log(title = "目录-我的空间", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysCatalogPersonBo bo, HttpServletResponse response) { - List list = personService.queryList(bo); - ExcelUtil.exportExcel(list, "目录-我的空间", SysCatalogPersonVo.class, response); - } - /** * 获取目录-我的空间详细信息 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java index 07389cc..41aa262 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java @@ -44,8 +44,6 @@ public class SysHomeShowController extends BaseController { return sysHomeShowService.queryPageList(bo, pageQuery); } - - /** * 获取学校名师详细信息 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java index 46768da..53e1fd2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java @@ -44,7 +44,6 @@ public class SysHomeTrendController extends BaseController { return sysHomeTrendService.queryPageList(bo, pageQuery); } - /** * 获取学校动态详细信息 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java index fc09f87..ef8e9f0 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssPersonController.java @@ -7,7 +7,6 @@ import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; @@ -39,29 +38,18 @@ public class SysOssPersonController extends BaseController { /** * 查询资源-我的空间列表 */ - @SaCheckPermission("oss:person:pageList") + @SaCheckPermission("file:person:pageList") @GetMapping("/pageList") public TableDataInfo list(SysOssPersonBo bo, PageQuery pageQuery) { return sysOssPersonService.queryPageList(bo, pageQuery); } - /** - * 导出资源-我的空间列表 - */ - @SaCheckPermission("oss:person:export") - @Log(title = "资源-我的空间", businessType = BusinessType.EXPORT) - @PostMapping("/export") - public void export(SysOssPersonBo bo, HttpServletResponse response) { - List list = sysOssPersonService.queryList(bo); - ExcelUtil.exportExcel(list, "资源-我的空间", SysOssPersonVo.class, response); - } - /** * 获取资源-我的空间详细信息 * * @param id 主键 */ - @SaCheckPermission("oss:person:query") + @SaCheckPermission("file:person:query") @GetMapping("/{id}") public R getInfo(@NotNull(message = "主键不能为空") @PathVariable Long id) { @@ -71,7 +59,7 @@ public class SysOssPersonController extends BaseController { /** * 新增资源-我的空间 */ - @SaCheckPermission("oss:person:add") + @SaCheckPermission("file:person:add") @Log(title = "资源-我的空间", businessType = BusinessType.INSERT) @RepeatSubmit() @PostMapping() @@ -79,23 +67,13 @@ public class SysOssPersonController extends BaseController { return toAjax(sysOssPersonService.insertByBo(bo)); } - /** - * 修改资源-我的空间 - */ -// @SaCheckPermission("oss:person:edit") -// @Log(title = "资源-我的空间", businessType = BusinessType.UPDATE) -// @RepeatSubmit() -// @PutMapping() -// public R edit(@Validated(EditGroup.class) @RequestBody SysOssPersonBo bo) { -// return toAjax(sysOssPersonService.updateByBo(bo)); -// } /** * 删除资源-我的空间 * * @param ids 主键串 */ - @SaCheckPermission("oss:person:remove") + @SaCheckPermission("file:person:remove") @Log(title = "资源-我的空间", businessType = BusinessType.DELETE) @DeleteMapping("/{ids}") public R remove(@NotEmpty(message = "主键不能为空") 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 5d08e0d..7fc2179 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 @@ -76,16 +76,6 @@ public class SysOssResourceController extends BaseController { return toAjax(sysOssResourceService.insertByBo(bo)); } - /** - * 修改专题资源文件 - */ -// @SaCheckPermission("file:resource:edit") -// @Log(title = "【更新专题资源】", businessType = BusinessType.UPDATE) -// @RepeatSubmit() -// @PutMapping() -// public R edit(@Validated(EditGroup.class) @RequestBody SysOssResourceBo bo) { -// return toAjax(sysOssResourceService.updateByBo(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 2798c6c..94d9e44 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 @@ -77,17 +77,6 @@ public class SysOssTextbookController extends BaseController { return toAjax(sysOssTextbookService.insertByBo(bo)); } - /** - * 修改同步教材的文件 - */ -// @SaCheckPermission("file:textbook:edit") -// @Log(title = "【更新同步教材】", businessType = BusinessType.UPDATE) -// @RepeatSubmit() -// @PutMapping() -// public R edit(@Validated(EditGroup.class) @RequestBody SysOssTextbookBo bo) { -// return toAjax(sysOssTextbookService.updateByBo(bo)); -// } - /** * 删除同步教材的文件 * diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java index 3a4a117..22bae52 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java @@ -2,6 +2,7 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; +import cn.dev33.satoken.annotation.SaMode; import cn.hutool.core.util.ObjectUtil; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; @@ -42,7 +43,12 @@ public class SysOssController extends BaseController { /** * 查询OSS对象存储列表 */ - @SaCheckPermission("system:oss:list") + @SaCheckPermission(value = { + "system:oss:list", + "file:person:pageList", + "file:resource:pageList", + "file:textbook:pageList"}, + mode = SaMode.OR) @GetMapping("/list") public TableDataInfo list(@Validated(QueryGroup.class) SysOssBo bo, PageQuery pageQuery) { return ossService.queryPageList(bo, pageQuery); @@ -53,7 +59,12 @@ public class SysOssController extends BaseController { * * @param ossIds OSS对象ID串 */ - @SaCheckPermission("system:oss:list") + @SaCheckPermission(value = { + "system:oss:list", + "file:person:pageList", + "file:resource:pageList", + "file:textbook:pageList"}, + mode = SaMode.OR) @GetMapping("/listByIds/{ossIds}") public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { @@ -66,7 +77,12 @@ public class SysOssController extends BaseController { * * @param file 文件 */ - @SaCheckPermission("system:oss:upload") + @SaCheckPermission(value = { + "system:oss:upload", + "file:person:add", + "file:resource:add", + "file:textbook:add"}, + mode = SaMode.OR) @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) @PostMapping(value = "/upload", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public R upload(@RequestPart("file") MultipartFile file) { @@ -97,7 +113,12 @@ public class SysOssController extends BaseController { * * @param ossIds OSS对象ID串 */ - @SaCheckPermission("system:oss:remove") + @SaCheckPermission(value = { + "system:oss:remove", + "file:person:remove", + "file:resource:remove", + "file:textbook:remove"}, + mode = SaMode.OR) @Log(title = "OSS对象存储", businessType = BusinessType.DELETE) @DeleteMapping("/{ossIds}") public R remove(@NotEmpty(message = "主键不能为空") diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java index a564a40..aa67062 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenant.java @@ -1,5 +1,6 @@ package org.dromara.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; @@ -26,7 +27,7 @@ public class SysTenant extends BaseEntity { /** * id */ - @TableId(value = "id") + @TableId(value = "id", type = IdType.AUTO) private Long id; /** diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java index f7e423f..1b1b1e8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTenantPackage.java @@ -1,12 +1,15 @@ package org.dromara.system.domain; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serial; - import org.dromara.common.mybatis.core.domain.BaseEntity; +import java.io.Serial; + /** * 租户套餐对象 sys_tenant_package * @@ -23,7 +26,7 @@ public class SysTenantPackage extends BaseEntity { /** * 租户套餐id */ - @TableId(value = "package_id") + @TableId(value = "package_id", type = IdType.AUTO) private Long packageId; /** * 套餐名称 diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogPersonVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogPersonVo.java index 4993da9..ad92ad6 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogPersonVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogPersonVo.java @@ -1,16 +1,11 @@ package org.dromara.system.domain.vo; -import org.dromara.system.domain.SysCatalogPerson; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; -import com.alibaba.excel.annotation.ExcelProperty; -import org.dromara.common.excel.annotation.ExcelDictFormat; -import org.dromara.common.excel.convert.ExcelDictConvert; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; +import org.dromara.system.domain.SysCatalogPerson; import java.io.Serial; import java.io.Serializable; -import java.util.Date; @@ -21,7 +16,6 @@ import java.util.Date; * @date 2024-06-13 */ @Data -@ExcelIgnoreUnannotated @AutoMapper(target = SysCatalogPerson.class) public class SysCatalogPersonVo implements Serializable { @@ -31,37 +25,31 @@ public class SysCatalogPersonVo implements Serializable { /** * 目录id */ - @ExcelProperty(value = "目录id") private Long catalogId; /** * 用户编号 */ - @ExcelProperty(value = "用户编号") private Long userId; /** * 父目录id */ - @ExcelProperty(value = "父目录id") private Long parentId; /** * 祖级列表 */ - @ExcelProperty(value = "祖级列表") private String ancestors; /** * 目录名称 */ - @ExcelProperty(value = "目录名称") private String catalogName; /** * 显示顺序 */ - @ExcelProperty(value = "显示顺序") private Long orderNum; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java index 97a125d..9f29f1d 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java @@ -344,8 +344,6 @@ public class SysOssServiceImpl implements ISysOssService, OssService { xls.save(os, com.aspose.cells.SaveFormat.XLSX); } if ((".ppt").equals(sysOss.getFileSuffix())) { - //LoadOptions options = new LoadOptions(); - //options.set Presentation ppt = new Presentation(is); ppt.save(os, com.aspose.slides.SaveFormat.Pdf); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java index e40aec0..6c29055 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTenantServiceImpl.java @@ -169,7 +169,7 @@ public class SysTenantServiceImpl implements ISysTenantService { schoolVolume.setTenantId(tenantId); schoolVolume.setType(1); schoolVolume.setTotalVolume(volume); - ossVolumeMapper.insert(personVolume); + ossVolumeMapper.insert(schoolVolume); // 创建部门: 公司名是部门名称 SysDept dept = new SysDept(); dept.setTenantId(tenantId);