From a83bdf69ab9b4c8d39c645b2fdb3b951ba4f64f1 Mon Sep 17 00:00:00 2001 From: cjw Date: Mon, 24 Jun 2024 17:30:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bug=EF=BC=9B=E7=A7=9F?= =?UTF-8?q?=E6=88=B7=E6=95=B0=E6=8D=AE=E5=88=9D=E5=A7=8B=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/SysCatalogPersonController.java | 3 +- .../file/SysCatalogResourceController.java | 3 +- .../file/SysCatalogTextbookController.java | 3 +- .../system/mapper/SysCatalogPersonMapper.java | 2 ++ .../service/impl/SysOssServiceImpl.java | 26 ++++++++++++++-- .../service/impl/SysTenantServiceImpl.java | 30 ++++++++++++++++++- 6 files changed, 58 insertions(+), 9 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 9515d9e..7066a28 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 @@ -2,7 +2,6 @@ package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -107,7 +106,7 @@ public class SysCatalogPersonController extends BaseController { @SaCheckPermission("catalog:person:remove") @Log(title = "目录-我的空间", businessType = BusinessType.DELETE) @DeleteMapping("/{catalogId}") - public R remove(@NotEmpty(message = "主键不能为空") + public R remove(@NotNull(message = "主键不能为空") @PathVariable Long catalogId) { if (personService.hasChildByCatalogId(catalogId)) { return R.warn("存在下级,不允许删除"); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java index dddbdc4..baf610c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java @@ -1,7 +1,6 @@ package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -110,7 +109,7 @@ public class SysCatalogResourceController extends BaseController { @SaCheckPermission("catalog:resource:remove") @Log(title = "目录-专题资源", businessType = BusinessType.DELETE) @DeleteMapping("/{catalogId}") - public R remove(@NotEmpty(message = "主键不能为空") + public R remove(@NotNull(message = "主键不能为空") @PathVariable Long catalogId) { if (resourceService.hasChildByCatalogId(catalogId)) { return R.warn("存在下级,不允许删除"); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java index 186325e..b6a476b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java @@ -1,7 +1,6 @@ package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; -import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.NotNull; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; @@ -107,7 +106,7 @@ public class SysCatalogTextbookController extends BaseController { @SaCheckPermission("catalog:textbook:remove") @Log(title = "目录-同步教材", businessType = BusinessType.DELETE) @DeleteMapping("/{catalogId}") - public R remove(@NotEmpty(message = "主键不能为空") + public R remove(@NotNull(message = "主键不能为空") @PathVariable Long catalogId) { if (textbookService.hasChildByCatalogId(catalogId)) { return R.warn("存在下级,不允许删除"); diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogPersonMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogPersonMapper.java index 3d1e9b7..52282a2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogPersonMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogPersonMapper.java @@ -1,5 +1,6 @@ package org.dromara.system.mapper; +import org.apache.ibatis.annotations.Mapper; import org.dromara.system.domain.SysCatalogPerson; import org.dromara.system.domain.vo.SysCatalogPersonVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; @@ -10,6 +11,7 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; * @author cjw * @date 2024-06-13 */ +@Mapper public interface SysCatalogPersonMapper extends BaseMapperPlus { } 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 f22ede5..3928714 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 @@ -336,8 +336,14 @@ public class SysOssServiceImpl implements ISysOssService, OssService { xls.save(os, com.aspose.cells.SaveFormat.XLSX); } if ((".ppt").equals(sysOss.getFileSuffix())) { - Presentation xls = new Presentation(is); - xls.save(os, com.aspose.slides.SaveFormat.Pdf); + //LoadOptions options = new LoadOptions(); + //options.set + Presentation ppt = new Presentation(is); + ppt.save(os, com.aspose.slides.SaveFormat.Pdf); + } + if ((".pptx").equals(sysOss.getFileSuffix())) { + Presentation pptx = new Presentation(is); + pptx.save(os, com.aspose.slides.SaveFormat.Pdf); } int len = 0; while ((len = is.read(byteData)) != -1) { @@ -361,4 +367,20 @@ public class SysOssServiceImpl implements ISysOssService, OssService { } } } + + public static void main(String[] args) { + + // 验证License + try { + FileInputStream fileInput = new FileInputStream("D:/test.ppt"); + Presentation pres = new Presentation(fileInput); + FileOutputStream out = new FileOutputStream(new File("D:/test.pdf")); + pres.save(out, com.aspose.slides.SaveFormat.Pdf); + out.close(); + } catch (Exception e) { + System.out.println(e.getMessage()); + } + + + } } 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 516149f..0d485ae 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 @@ -53,6 +53,11 @@ public class SysTenantServiceImpl implements ISysTenantService { private final SysDictDataMapper dictDataMapper; private final SysConfigMapper configMapper; + private final SysCatalogPersonMapper catalogPersonMapper; + private final SysCatalogTextbookMapper catalogTextbookMapper; + private final SysCatalogResourceMapper catalogResourceMapper; + + /** * 查询租户 */ @@ -117,7 +122,9 @@ public class SysTenantServiceImpl implements ISysTenantService { // 获取所有租户编号 List tenantIds = baseMapper.selectObjs( - new LambdaQueryWrapper().select(SysTenant::getTenantId), x -> {return Convert.toStr(x);}); + new LambdaQueryWrapper().select(SysTenant::getTenantId), x -> { + return Convert.toStr(x); + }); String tenantId = generateTenantId(tenantIds); add.setTenantId(tenantId); boolean flag = baseMapper.insert(add) > 0; @@ -129,6 +136,27 @@ public class SysTenantServiceImpl implements ISysTenantService { // 根据套餐创建角色 Long roleId = createTenantRole(tenantId, bo.getPackageId()); + //创建默认资源目录 + SysCatalogPerson catalogPerson = new SysCatalogPerson(); + catalogPerson.setTenantId(tenantId); + catalogPerson.setCatalogName("我的空间"); + catalogPerson.setParentId(Constants.TOP_PARENT_ID); + catalogPerson.setAncestors(Constants.TOP_PARENT_ID.toString()); + catalogPersonMapper.insert(catalogPerson); + SysCatalogTextbook catalogTextbook = new SysCatalogTextbook(); + catalogTextbook.setTenantId(tenantId); + catalogTextbook.setCatalogName("同步教材"); + catalogTextbook.setParentId(Constants.TOP_PARENT_ID); + catalogTextbook.setAncestors(Constants.TOP_PARENT_ID.toString()); + catalogTextbook.setType(1); + catalogTextbookMapper.insert(catalogTextbook); + SysCatalogResource catalogResource = new SysCatalogResource(); + catalogResource.setTenantId(tenantId); + catalogResource.setCatalogName("专题资源"); + catalogResource.setParentId(Constants.TOP_PARENT_ID); + catalogResource.setAncestors(Constants.TOP_PARENT_ID.toString()); + catalogResource.setType(1); + catalogResourceMapper.insert(catalogResource); // 创建部门: 公司名是部门名称 SysDept dept = new SysDept(); dept.setTenantId(tenantId);