From 94ed7562ea65f561b68d78c7a4dbee9ab82a5025 Mon Sep 17 00:00:00 2001 From: cjw Date: Tue, 4 Jun 2024 16:54:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84=EF=BC=9B=E6=96=87=E4=BB=B6=E4=B8=8A=E4=BC=A0=E4=BC=98?= =?UTF-8?q?=E5=8C=96=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 6 -- ruoyi-admin/pom.xml | 5 - ruoyi-modules/pom.xml | 1 - ruoyi-modules/ruoyi-file/pom.xml | 100 ------------------ ruoyi-modules/ruoyi-system/pom.xml | 17 +++ .../controller/file}/FileController.java | 4 +- .../file}/SysCatalogResourceController.java | 8 +- .../file}/SysCatalogTextbookController.java | 8 +- .../file}/SysHomeBannerController.java | 8 +- .../file}/SysHomeShowController.java | 8 +- .../file}/SysHomeTrendController.java | 8 +- .../file}/SysOssResourceController.java | 8 +- .../file}/SysOssTextbookController.java | 8 +- .../file}/SysTeacherController.java | 12 +-- .../controller/system/SysOssController.java | 31 +++--- .../system}/domain/SysCatalogResource.java | 2 +- .../system}/domain/SysCatalogTextbook.java | 2 +- .../dromara/system}/domain/SysHomeBanner.java | 2 +- .../dromara/system}/domain/SysHomeShow.java | 2 +- .../dromara/system}/domain/SysHomeTrend.java | 2 +- .../org/dromara/system/domain/SysOss.java | 5 - .../system}/domain/SysOssResource.java | 18 ++-- .../system}/domain/SysOssTextbook.java | 19 ++-- .../dromara/system}/domain/SysTeacher.java | 2 +- .../dromara/system}/domain/bo/OssFileBo.java | 6 +- .../domain/bo/SysCatalogResourceBo.java | 4 +- .../domain/bo/SysCatalogTextbookBo.java | 4 +- .../system}/domain/bo/SysHomeBannerBo.java | 4 +- .../system}/domain/bo/SysHomeShowBo.java | 4 +- .../system}/domain/bo/SysHomeTrendBo.java | 4 +- .../system}/domain/bo/SysOssResourceBo.java | 23 ++-- .../system}/domain/bo/SysOssTextbookBo.java | 22 ++-- .../system}/domain/bo/SysTeacherBo.java | 4 +- .../domain/vo/SysCatalogResourceVo.java | 4 +- .../domain/vo/SysCatalogTextbookVo.java | 4 +- .../system}/domain/vo/SysHomeBannerVo.java | 4 +- .../system}/domain/vo/SysHomeShowVo.java | 4 +- .../system}/domain/vo/SysHomeTrendVo.java | 4 +- .../system}/domain/vo/SysOssResourceVo.java | 4 +- .../system}/domain/vo/SysOssTextbookVo.java | 4 +- .../system/domain/vo/SysOssUploadVo.java | 5 - .../dromara/system/domain/vo/SysOssVo.java | 5 - .../system}/domain/vo/SysTeacherImportVo.java | 2 +- .../system}/domain/vo/SysTeacherVo.java | 4 +- .../listener/SysTeacherImportListener.java | 10 +- .../mapper/SysCatalogResourceMapper.java | 6 +- .../mapper/SysCatalogTextbookMapper.java | 6 +- .../system}/mapper/SysHomeBannerMapper.java | 6 +- .../system}/mapper/SysHomeShowMapper.java | 6 +- .../system}/mapper/SysHomeTrendMapper.java | 6 +- .../system}/mapper/SysOssResourceMapper.java | 6 +- .../system}/mapper/SysOssTextbookMapper.java | 6 +- .../system}/mapper/SysTeacherMapper.java | 6 +- .../dromara/system}/service/IFileService.java | 2 +- .../service/ISysCatalogResourceService.java | 6 +- .../service/ISysCatalogTextbookService.java | 6 +- .../service/ISysHomeBannerService.java | 6 +- .../system}/service/ISysHomeShowService.java | 6 +- .../system}/service/ISysHomeTrendService.java | 6 +- .../service/ISysOssResourceService.java | 6 +- .../system/service/ISysOssService.java | 6 +- .../service/ISysOssTextbookService.java | 6 +- .../system}/service/ISysTeacherService.java | 6 +- .../system}/service/impl/FileService.java | 4 +- .../impl/SysCatalogResourceServiceImpl.java | 16 +-- .../impl/SysCatalogTextbookServiceImpl.java | 16 +-- .../impl/SysHomeBannerServiceImpl.java | 12 +-- .../service/impl/SysHomeShowServiceImpl.java | 12 +-- .../service/impl/SysHomeTrendServiceImpl.java | 12 +-- .../impl/SysOssResourceServiceImpl.java | 12 +-- .../service/impl/SysOssServiceImpl.java | 57 +++++----- .../impl/SysOssTextbookServiceImpl.java | 12 +-- .../service/impl/SysTeacherServiceImpl.java | 12 +-- .../system}/SysCatalogResourceMapper.xml | 4 +- .../system}/SysCatalogTextbookMapper.xml | 4 +- .../mapper/system/SysHomeBannerMapper.xml} | 2 +- .../mapper/system/SysHomeShowMapper.xml} | 2 +- .../mapper/system/SysHomeTrendMapper.xml} | 2 +- .../mapper/system}/SysOssResourceMapper.xml | 2 +- .../mapper/system/SysOssTextbookMapper.xml} | 2 +- .../mapper/system}/SysTeacherMapper.xml | 2 +- 81 files changed, 297 insertions(+), 407 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-file/pom.xml rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/FileController.java (91%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysCatalogResourceController.java (94%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysCatalogTextbookController.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysHomeBannerController.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysHomeShowController.java (94%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysHomeTrendController.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysOssResourceController.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysOssTextbookController.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file/controller => ruoyi-system/src/main/java/org/dromara/system/controller/file}/SysTeacherController.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysCatalogResource.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysCatalogTextbook.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysHomeBanner.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysHomeShow.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysHomeTrend.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysOssResource.java (63%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysOssTextbook.java (67%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/SysTeacher.java (97%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/OssFileBo.java (81%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysCatalogResourceBo.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysCatalogTextbookBo.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysHomeBannerBo.java (94%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysHomeShowBo.java (95%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysHomeTrendBo.java (94%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysOssResourceBo.java (56%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysOssTextbookBo.java (55%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/bo/SysTeacherBo.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysCatalogResourceVo.java (92%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysCatalogTextbookVo.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysHomeBannerVo.java (92%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysHomeShowVo.java (90%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysHomeTrendVo.java (91%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysOssResourceVo.java (85%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysOssTextbookVo.java (87%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysTeacherImportVo.java (98%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/domain/vo/SysTeacherVo.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/listener/SysTeacherImportListener.java (94%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysCatalogResourceMapper.java (79%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysCatalogTextbookMapper.java (79%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysHomeBannerMapper.java (68%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysHomeShowMapper.java (68%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysHomeTrendMapper.java (68%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysOssResourceMapper.java (69%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysOssTextbookMapper.java (69%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/mapper/SysTeacherMapper.java (68%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/IFileService.java (89%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysCatalogResourceService.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysCatalogTextbookService.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysHomeBannerService.java (91%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysHomeShowService.java (91%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysHomeTrendService.java (91%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysOssResourceService.java (92%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysOssTextbookService.java (92%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/ISysTeacherService.java (92%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/FileService.java (96%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysCatalogResourceServiceImpl.java (94%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysCatalogTextbookServiceImpl.java (94%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysHomeBannerServiceImpl.java (92%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysHomeShowServiceImpl.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysHomeTrendServiceImpl.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysOssResourceServiceImpl.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysOssTextbookServiceImpl.java (93%) rename ruoyi-modules/{ruoyi-file/src/main/java/org/dromara/file => ruoyi-system/src/main/java/org/dromara/system}/service/impl/SysTeacherServiceImpl.java (95%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file => ruoyi-system/src/main/resources/mapper/system}/SysCatalogResourceMapper.xml (76%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file => ruoyi-system/src/main/resources/mapper/system}/SysCatalogTextbookMapper.xml (76%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file/SysHomeTrendMapper.xml => ruoyi-system/src/main/resources/mapper/system/SysHomeBannerMapper.xml} (70%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file/SysHomeBannerMapper.xml => ruoyi-system/src/main/resources/mapper/system/SysHomeShowMapper.xml} (71%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file/SysOssTextbookMapper.xml => ruoyi-system/src/main/resources/mapper/system/SysHomeTrendMapper.xml} (71%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file => ruoyi-system/src/main/resources/mapper/system}/SysOssResourceMapper.xml (70%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file/SysHomeShowMapper.xml => ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml} (70%) rename ruoyi-modules/{ruoyi-file/src/main/resources/mapper/file => ruoyi-system/src/main/resources/mapper/system}/SysTeacherMapper.xml (71%) diff --git a/pom.xml b/pom.xml index 9e18b09..87b2b3b 100644 --- a/pom.xml +++ b/pom.xml @@ -347,12 +347,6 @@ ${revision} - - org.dromara - ruoyi-file - ${revision} - - com.luhuiguo diff --git a/ruoyi-admin/pom.xml b/ruoyi-admin/pom.xml index 4e8ed3d..0bc96c3 100644 --- a/ruoyi-admin/pom.xml +++ b/ruoyi-admin/pom.xml @@ -58,11 +58,6 @@ ruoyi-system - - org.dromara - ruoyi-file - - org.dromara ruoyi-job diff --git a/ruoyi-modules/pom.xml b/ruoyi-modules/pom.xml index 73dadb2..a87e344 100644 --- a/ruoyi-modules/pom.xml +++ b/ruoyi-modules/pom.xml @@ -13,7 +13,6 @@ ruoyi-generator ruoyi-job ruoyi-system - ruoyi-file ruoyi-modules diff --git a/ruoyi-modules/ruoyi-file/pom.xml b/ruoyi-modules/ruoyi-file/pom.xml deleted file mode 100644 index 42342ef..0000000 --- a/ruoyi-modules/ruoyi-file/pom.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - org.dromara - ruoyi-modules - ${revision} - - 4.0.0 - - ruoyi-file - - 校本资源模块 - - - - - org.dromara - ruoyi-common-core - - - org.dromara - ruoyi-common-mybatis - - - - org.dromara - ruoyi-common-oss - - - - org.dromara - ruoyi-common-log - - - - org.dromara - ruoyi-common-tenant - - - - org.dromara - ruoyi-common-security - - - - org.dromara - ruoyi-common-web - - - org.dromara - ruoyi-common-idempotent - - - - org.dromara - ruoyi-common-sensitive - - - - org.dromara - ruoyi-common-encrypt - - - - org.dromara - ruoyi-common-translation - - - - - org.dromara - ruoyi-common-excel - - - - org.dromara - ruoyi-system - - - - com.luhuiguo - aspose-words - - - com.luhuiguo - aspose-pdf - - - com.luhuiguo - aspose-cells - - - com.luhuiguo - aspose-slides - - - - diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index acf33ce..3642895 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -95,6 +95,23 @@ ruoyi-common-websocket + + com.luhuiguo + aspose-words + + + com.luhuiguo + aspose-pdf + + + com.luhuiguo + aspose-cells + + + com.luhuiguo + aspose-slides + + diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/FileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/FileController.java similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/FileController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/FileController.java index 827e661..9cf7e24 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/FileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/FileController.java @@ -1,8 +1,8 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; -import org.dromara.file.service.IFileService; +import org.dromara.system.service.IFileService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogResourceController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java index f1a1313..983c504 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; @@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysCatalogResourceBo; -import org.dromara.file.domain.vo.SysCatalogResourceVo; -import org.dromara.file.service.ISysCatalogResourceService; +import org.dromara.system.domain.bo.SysCatalogResourceBo; +import org.dromara.system.domain.vo.SysCatalogResourceVo; +import org.dromara.system.service.ISysCatalogResourceService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogTextbookController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java index 01cab8b..cb69812 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; @@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysCatalogTextbookBo; -import org.dromara.file.domain.vo.SysCatalogTextbookVo; -import org.dromara.file.service.ISysCatalogTextbookService; +import org.dromara.system.domain.bo.SysCatalogTextbookBo; +import org.dromara.system.domain.vo.SysCatalogTextbookVo; +import org.dromara.system.service.ISysCatalogTextbookService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeBannerController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeBannerController.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeBannerController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeBannerController.java index e35a694..8504b67 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeBannerController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeBannerController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; @@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysHomeBannerBo; -import org.dromara.file.domain.vo.SysHomeBannerVo; -import org.dromara.file.service.ISysHomeBannerService; +import org.dromara.system.domain.bo.SysHomeBannerBo; +import org.dromara.system.domain.vo.SysHomeBannerVo; +import org.dromara.system.service.ISysHomeBannerService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeShowController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeShowController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java index 8644542..07389cc 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeShowController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; @@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysHomeShowBo; -import org.dromara.file.domain.vo.SysHomeShowVo; -import org.dromara.file.service.ISysHomeShowService; +import org.dromara.system.domain.bo.SysHomeShowBo; +import org.dromara.system.domain.vo.SysHomeShowVo; +import org.dromara.system.service.ISysHomeShowService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeTrendController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeTrendController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java index bc63ba8..46768da 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeTrendController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; @@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysHomeTrendBo; -import org.dromara.file.domain.vo.SysHomeTrendVo; -import org.dromara.file.service.ISysHomeTrendService; +import org.dromara.system.domain.bo.SysHomeTrendBo; +import org.dromara.system.domain.vo.SysHomeTrendVo; +import org.dromara.system.service.ISysHomeTrendService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssResourceController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssResourceController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java index 55cff3c..5873e78 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssResourceController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; @@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysOssResourceBo; -import org.dromara.file.domain.vo.SysOssResourceVo; -import org.dromara.file.service.ISysOssResourceService; +import org.dromara.system.domain.bo.SysOssResourceBo; +import org.dromara.system.domain.vo.SysOssResourceVo; +import org.dromara.system.service.ISysOssResourceService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssTextbookController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssTextbookController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java index 6e71bb6..305096b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssTextbookController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.validation.constraints.NotEmpty; @@ -13,9 +13,9 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysOssTextbookBo; -import org.dromara.file.domain.vo.SysOssTextbookVo; -import org.dromara.file.service.ISysOssTextbookService; +import org.dromara.system.domain.bo.SysOssTextbookBo; +import org.dromara.system.domain.vo.SysOssTextbookVo; +import org.dromara.system.service.ISysOssTextbookService; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysTeacherController.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysTeacherController.java index 6eaa922..52a594b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysTeacherController.java @@ -1,4 +1,4 @@ -package org.dromara.file.controller; +package org.dromara.system.controller.file; import cn.dev33.satoken.annotation.SaCheckPermission; import jakarta.servlet.http.HttpServletResponse; @@ -16,11 +16,11 @@ import org.dromara.common.log.enums.BusinessType; 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.file.domain.bo.SysTeacherBo; -import org.dromara.file.domain.vo.SysTeacherImportVo; -import org.dromara.file.domain.vo.SysTeacherVo; -import org.dromara.file.listener.SysTeacherImportListener; -import org.dromara.file.service.ISysTeacherService; +import org.dromara.system.domain.bo.SysTeacherBo; +import org.dromara.system.domain.vo.SysTeacherImportVo; +import org.dromara.system.domain.vo.SysTeacherVo; +import org.dromara.system.listener.SysTeacherImportListener; +import org.dromara.system.service.ISysTeacherService; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; 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 b17a516..c9707b6 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 @@ -3,26 +3,24 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; +import jakarta.validation.constraints.NotEmpty; +import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.web.core.BaseController; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; 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.SysOssBo; import org.dromara.system.domain.vo.SysOssUploadVo; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.ISysOssService; -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.constraints.NotEmpty; -import lombok.RequiredArgsConstructor; import org.springframework.http.MediaType; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import java.io.IOException; import java.util.Arrays; import java.util.List; @@ -76,7 +74,6 @@ public class SysOssController extends BaseController { SysOssVo oss = ossService.upload(file); SysOssUploadVo uploadVo = new SysOssUploadVo(); uploadVo.setUrl(oss.getUrl()); - uploadVo.setFileName(oss.getOriginalName()); uploadVo.setOssId(oss.getOssId().toString()); return R.ok(uploadVo); } @@ -86,11 +83,11 @@ public class SysOssController extends BaseController { * * @param ossId OSS对象ID */ - @SaCheckPermission("system:oss:download") - @GetMapping("/download/{ossId}") - public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { - ossService.download(ossId, response); - } +// @SaCheckPermission("system:oss:download") +// @GetMapping("/download/{ossId}") +// public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { +// ossService.download(ossId, response); +// } /** * 删除OSS对象存储 @@ -112,9 +109,15 @@ public class SysOssController extends BaseController { */ @SaCheckPermission("system:oss:identifier") @GetMapping("/identifier") - public R identifier(@NotEmpty(message = "MD5不能为空") String md5) { - Long ossId = ossService.getIdByMd5(md5); - return R.ok(ossId); + public R identifier(@NotEmpty(message = "MD5不能为空") String md5) { + SysOssVo oss = ossService.getByMd5(md5); + SysOssUploadVo uploadVo = new SysOssUploadVo(); + if (ObjectUtil.isNotNull(oss)) { + uploadVo.setUrl(oss.getUrl()); + uploadVo.setOssId(oss.getOssId().toString()); + } + return R.ok(uploadVo); + } } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogResource.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogResource.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java index e236ec4..8b39aab 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogResource.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogTextbook.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogTextbook.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java index 505f7a6..b9ef101 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogTextbook.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeBanner.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeBanner.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java index 4ba3e1a..3791db8 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeBanner.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeShow.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeShow.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java index b48ec53..837d53e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeShow.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeTrend.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeTrend.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java index 9e03e99..9c0ec11 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeTrend.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; import org.dromara.common.tenant.core.TenantEntity; import com.baomidou.mybatisplus.annotation.*; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java index 027f3ed..23872fa 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java @@ -32,11 +32,6 @@ public class SysOss extends BaseEntity { */ private String fileMd5; - /** - * 原名 - */ - private String originalName; - /** * 文件后缀名 */ diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssResource.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java similarity index 63% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssResource.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java index d1f7152..63723b7 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssResource.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java @@ -1,11 +1,10 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; - -import java.io.Serial; +import org.dromara.common.mybatis.core.domain.BaseEntity; /** * 【请填写功能名称】对象 sys_oss_resource @@ -18,8 +17,8 @@ import java.io.Serial; @TableName("sys_oss_resource") public class SysOssResource extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; + @TableId(value = "id") + private Long id; /** * @@ -31,5 +30,10 @@ public class SysOssResource extends BaseEntity { */ private Long catalogId; + /** + * 文件名 + */ + private String fileName; + } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssTextbook.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java similarity index 67% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssTextbook.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java index d2b8461..76258f8 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssTextbook.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java @@ -1,11 +1,10 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; -import org.dromara.common.mybatis.core.domain.BaseEntity; -import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; - -import java.io.Serial; +import org.dromara.common.mybatis.core.domain.BaseEntity; /** * 【请填写功能名称】对象 sys_oss_textbook @@ -18,9 +17,8 @@ import java.io.Serial; @TableName("sys_oss_textbook") public class SysOssTextbook extends BaseEntity { - @Serial - private static final long serialVersionUID = 1L; - + @TableId(value = "id") + private Long id; /** * */ @@ -36,5 +34,10 @@ public class SysOssTextbook extends BaseEntity { */ private Integer type; + /** + * 文件名 + */ + private String fileName; + } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java similarity index 97% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java index 34ab863..0984f54 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain; +package org.dromara.system.domain; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/OssFileBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OssFileBo.java similarity index 81% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/OssFileBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OssFileBo.java index 7347d2b..cad825a 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/OssFileBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OssFileBo.java @@ -1,9 +1,9 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMappers; -import org.dromara.file.domain.SysOssResource; -import org.dromara.file.domain.SysOssTextbook; +import org.dromara.system.domain.SysOssResource; +import org.dromara.system.domain.SysOssTextbook; /** *

TODO

diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogResourceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogResourceBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java index 63d31b2..9a09dee 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogResourceBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java @@ -1,6 +1,6 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; -import org.dromara.file.domain.SysCatalogResource; +import org.dromara.system.domain.SysCatalogResource; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogTextbookBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogTextbookBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java index d941a9a..e25a836 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogTextbookBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java @@ -1,6 +1,6 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; -import org.dromara.file.domain.SysCatalogTextbook; +import org.dromara.system.domain.SysCatalogTextbook; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeBannerBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeBannerBo.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeBannerBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeBannerBo.java index 01a412c..599f8e0 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeBannerBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeBannerBo.java @@ -1,6 +1,6 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; -import org.dromara.file.domain.SysHomeBanner; +import org.dromara.system.domain.SysHomeBanner; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeShowBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java similarity index 95% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeShowBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java index 29f33b2..c9e1415 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeShowBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java @@ -1,6 +1,6 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; -import org.dromara.file.domain.SysHomeShow; +import org.dromara.system.domain.SysHomeShow; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeTrendBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeTrendBo.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeTrendBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeTrendBo.java index 7205df4..da2c959 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeTrendBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeTrendBo.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; import io.github.linpeilie.annotations.AutoMapper; import jakarta.validation.constraints.NotBlank; @@ -8,7 +8,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.file.domain.SysHomeTrend; +import org.dromara.system.domain.SysHomeTrend; /** * 学校动态业务对象 sys_home_trend diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssResourceBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java similarity index 56% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssResourceBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java index eb24e9c..7ba264b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssResourceBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java @@ -1,8 +1,8 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; -import org.dromara.file.domain.SysOssResource; -import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; +import org.dromara.system.domain.SysOssResource; +import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.EditGroup; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; @@ -20,17 +20,18 @@ import jakarta.validation.constraints.*; @AutoMapper(target = SysOssResource.class, reverseConvertGenerate = false) public class SysOssResourceBo extends BaseEntity { - /** - * - */ - @NotNull(message = "不能为空", groups = { EditGroup.class }) + + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long id; + + @NotNull(message = "资源id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long ossId; - /** - * - */ - @NotNull(message = "不能为空", groups = { EditGroup.class }) + @NotNull(message = "目录id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long catalogId; + @NotNull(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class}) + private String fileName; + } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssTextbookBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java similarity index 55% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssTextbookBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java index 5e6c283..488e9e1 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssTextbookBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java @@ -1,6 +1,6 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; -import org.dromara.file.domain.SysOssTextbook; +import org.dromara.system.domain.SysOssTextbook; import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; @@ -20,22 +20,22 @@ import jakarta.validation.constraints.*; @AutoMapper(target = SysOssTextbook.class, reverseConvertGenerate = false) public class SysOssTextbookBo extends BaseEntity { - /** - * - */ - @NotNull(message = "不能为空", groups = { EditGroup.class }) + @NotNull(message = "主键不能为空", groups = {EditGroup.class}) + private Long id; + + @NotNull(message = "资源id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long ossId; - /** - * - */ - @NotNull(message = "不能为空", groups = { EditGroup.class }) + @NotNull(message = "目录id不能为空", groups = {AddGroup.class, EditGroup.class}) private Long catalogId; + @NotNull(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class}) + private String fileName; + /** * 1课件，2课堂，3作业，4试卷 */ - @NotNull(message = "1课件，2课堂，3作业，4试卷不能为空", groups = { AddGroup.class, EditGroup.class }) + @NotNull(message = "资源类型不能为空", groups = {AddGroup.class, EditGroup.class}) private Integer type; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTeacherBo.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTeacherBo.java index 63b8340..150173c 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTeacherBo.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain.bo; +package org.dromara.system.domain.bo; import com.fasterxml.jackson.annotation.JsonFormat; import io.github.linpeilie.annotations.AutoMapper; @@ -9,7 +9,7 @@ import lombok.EqualsAndHashCode; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.mybatis.core.domain.BaseEntity; -import org.dromara.file.domain.SysTeacher; +import org.dromara.system.domain.SysTeacher; import java.util.Date; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogResourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java similarity index 92% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogResourceVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java index 13318b3..440b181 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogResourceVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java @@ -1,8 +1,8 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.file.domain.SysCatalogResource; +import org.dromara.system.domain.SysCatalogResource; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogTextbookVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogTextbookVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java index 3dc7cbf..2a3ac5a 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogTextbookVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java @@ -1,8 +1,8 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.file.domain.SysCatalogTextbook; +import org.dromara.system.domain.SysCatalogTextbook; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeBannerVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeBannerVo.java similarity index 92% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeBannerVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeBannerVo.java index 94732d1..367abe0 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeBannerVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeBannerVo.java @@ -1,11 +1,11 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapping; import lombok.Data; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.file.domain.SysHomeBanner; +import org.dromara.system.domain.SysHomeBanner; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeShowVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java similarity index 90% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeShowVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java index 8e3cea6..5937fa3 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeShowVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java @@ -1,8 +1,8 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.file.domain.SysHomeShow; +import org.dromara.system.domain.SysHomeShow; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeTrendVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeTrendVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java index 86756d3..bb5fd0c 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeTrendVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java @@ -1,8 +1,8 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.file.domain.SysHomeTrend; +import org.dromara.system.domain.SysHomeTrend; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssResourceVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java similarity index 85% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssResourceVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java index 4297ff2..5b52893 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssResourceVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java @@ -1,8 +1,8 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.file.domain.SysOssResource; +import org.dromara.system.domain.SysOssResource; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssTextbookVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java similarity index 87% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssTextbookVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java index 67b98cd..d6edd8a 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssTextbookVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java @@ -1,8 +1,8 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import io.github.linpeilie.annotations.AutoMapper; import lombok.Data; -import org.dromara.file.domain.SysOssTextbook; +import org.dromara.system.domain.SysOssTextbook; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java index 11e0ff8..09c2e1f 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java @@ -15,11 +15,6 @@ public class SysOssUploadVo { */ private String url; - /** - * 文件名 - */ - private String fileName; - /** * 对象存储主键 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java index 8d5c429..88858a8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java @@ -32,11 +32,6 @@ public class SysOssVo implements Serializable { */ private String fileName; - /** - * 原名 - */ - private String originalName; - /** * 文件后缀名 */ diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherImportVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherImportVo.java similarity index 98% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherImportVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherImportVo.java index c2aa0d1..9dd1a63 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherImportVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherImportVo.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import com.alibaba.excel.annotation.ExcelProperty; import lombok.Data; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherVo.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherVo.java index 8b7df57..cbed2b6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherVo.java @@ -1,4 +1,4 @@ -package org.dromara.file.domain.vo; +package org.dromara.system.domain.vo; import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; @@ -9,7 +9,7 @@ import org.dromara.common.excel.annotation.ExcelDictFormat; import org.dromara.common.excel.convert.ExcelDictConvert; import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.constant.TransConstant; -import org.dromara.file.domain.SysTeacher; +import org.dromara.system.domain.SysTeacher; import java.io.Serial; import java.io.Serializable; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/listener/SysTeacherImportListener.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/listener/SysTeacherImportListener.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java index de420cf..51fe75a 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/listener/SysTeacherImportListener.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java @@ -1,4 +1,4 @@ -package org.dromara.file.listener; +package org.dromara.system.listener; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; @@ -12,10 +12,10 @@ import org.dromara.common.core.utils.ValidatorUtils; import org.dromara.common.excel.core.ExcelListener; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.satoken.utils.LoginHelper; -import org.dromara.file.domain.bo.SysTeacherBo; -import org.dromara.file.domain.vo.SysTeacherImportVo; -import org.dromara.file.domain.vo.SysTeacherVo; -import org.dromara.file.service.ISysTeacherService; +import org.dromara.system.domain.bo.SysTeacherBo; +import org.dromara.system.domain.vo.SysTeacherImportVo; +import org.dromara.system.domain.vo.SysTeacherVo; +import org.dromara.system.service.ISysTeacherService; import java.util.List; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogResourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java similarity index 79% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogResourceMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java index acc47ab..b69970a 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogResourceMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java @@ -1,12 +1,12 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.file.domain.SysCatalogResource; -import org.dromara.file.domain.vo.SysCatalogResourceVo; +import org.dromara.system.domain.SysCatalogResource; +import org.dromara.system.domain.vo.SysCatalogResourceVo; /** * 目录-专题资源Mapper接口 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogTextbookMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogTextbookMapper.java similarity index 79% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogTextbookMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogTextbookMapper.java index 1360037..e37162c 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogTextbookMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogTextbookMapper.java @@ -1,12 +1,12 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.file.domain.SysCatalogTextbook; -import org.dromara.file.domain.vo.SysCatalogTextbookVo; +import org.dromara.system.domain.SysCatalogTextbook; +import org.dromara.system.domain.vo.SysCatalogTextbookVo; /** * 目录-同步教材Mapper接口 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeBannerMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeBannerMapper.java similarity index 68% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeBannerMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeBannerMapper.java index 9053e52..648a853 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeBannerMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeBannerMapper.java @@ -1,9 +1,9 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.file.domain.SysHomeBanner; -import org.dromara.file.domain.vo.SysHomeBannerVo; +import org.dromara.system.domain.SysHomeBanner; +import org.dromara.system.domain.vo.SysHomeBannerVo; /** * 门户BannerMapper接口 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeShowMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeShowMapper.java similarity index 68% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeShowMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeShowMapper.java index c7eddae..5f8a03c 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeShowMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeShowMapper.java @@ -1,8 +1,8 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.file.domain.SysHomeShow; -import org.dromara.file.domain.vo.SysHomeShowVo; +import org.dromara.system.domain.SysHomeShow; +import org.dromara.system.domain.vo.SysHomeShowVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeTrendMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeTrendMapper.java similarity index 68% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeTrendMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeTrendMapper.java index 57c86f7..d594f6e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeTrendMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeTrendMapper.java @@ -1,8 +1,8 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.file.domain.SysHomeTrend; -import org.dromara.file.domain.vo.SysHomeTrendVo; +import org.dromara.system.domain.SysHomeTrend; +import org.dromara.system.domain.vo.SysHomeTrendVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssResourceMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssResourceMapper.java similarity index 69% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssResourceMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssResourceMapper.java index d9c7b9f..838eec7 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssResourceMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssResourceMapper.java @@ -1,10 +1,10 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.file.domain.SysOssResource; -import org.dromara.file.domain.vo.SysOssResourceVo; +import org.dromara.system.domain.SysOssResource; +import org.dromara.system.domain.vo.SysOssResourceVo; /** * 【请填写功能名称】Mapper接口 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssTextbookMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java similarity index 69% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssTextbookMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java index 283dc8f..d3d7a31 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssTextbookMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java @@ -1,10 +1,10 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; -import org.dromara.file.domain.SysOssTextbook; -import org.dromara.file.domain.vo.SysOssTextbookVo; +import org.dromara.system.domain.SysOssTextbook; +import org.dromara.system.domain.vo.SysOssTextbookVo; /** * 【请填写功能名称】Mapper接口 diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysTeacherMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTeacherMapper.java similarity index 68% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysTeacherMapper.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTeacherMapper.java index 16a1312..9510c7c 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysTeacherMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTeacherMapper.java @@ -1,8 +1,8 @@ -package org.dromara.file.mapper; +package org.dromara.system.mapper; import org.apache.ibatis.annotations.Mapper; -import org.dromara.file.domain.SysTeacher; -import org.dromara.file.domain.vo.SysTeacherVo; +import org.dromara.system.domain.SysTeacher; +import org.dromara.system.domain.vo.SysTeacherVo; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; /** diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/IFileService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFileService.java similarity index 89% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/IFileService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFileService.java index 82b0043..18ab830 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/IFileService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFileService.java @@ -1,4 +1,4 @@ -package org.dromara.file.service; +package org.dromara.system.service; import jakarta.servlet.http.HttpServletResponse; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogResourceService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogResourceService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java index 6412b84..8cf9450 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogResourceService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java @@ -1,10 +1,10 @@ -package org.dromara.file.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.file.domain.bo.SysCatalogResourceBo; -import org.dromara.file.domain.vo.SysCatalogResourceVo; +import org.dromara.system.domain.bo.SysCatalogResourceBo; +import org.dromara.system.domain.vo.SysCatalogResourceVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogTextbookService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogTextbookService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java index 5a3bed3..7ebe8e1 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogTextbookService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java @@ -1,10 +1,10 @@ -package org.dromara.file.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.file.domain.bo.SysCatalogTextbookBo; -import org.dromara.file.domain.vo.SysCatalogTextbookVo; +import org.dromara.system.domain.bo.SysCatalogTextbookBo; +import org.dromara.system.domain.vo.SysCatalogTextbookVo; import java.util.List; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeBannerService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeBannerService.java similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeBannerService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeBannerService.java index cd7e9d9..1389156 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeBannerService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeBannerService.java @@ -1,7 +1,7 @@ -package org.dromara.file.service; +package org.dromara.system.service; -import org.dromara.file.domain.vo.SysHomeBannerVo; -import org.dromara.file.domain.bo.SysHomeBannerBo; +import org.dromara.system.domain.vo.SysHomeBannerVo; +import org.dromara.system.domain.bo.SysHomeBannerBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeShowService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeShowService.java similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeShowService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeShowService.java index 34bf3aa..0327407 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeShowService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeShowService.java @@ -1,7 +1,7 @@ -package org.dromara.file.service; +package org.dromara.system.service; -import org.dromara.file.domain.vo.SysHomeShowVo; -import org.dromara.file.domain.bo.SysHomeShowBo; +import org.dromara.system.domain.vo.SysHomeShowVo; +import org.dromara.system.domain.bo.SysHomeShowBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeTrendService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeTrendService.java similarity index 91% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeTrendService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeTrendService.java index a7182dc..789f929 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeTrendService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeTrendService.java @@ -1,7 +1,7 @@ -package org.dromara.file.service; +package org.dromara.system.service; -import org.dromara.file.domain.vo.SysHomeTrendVo; -import org.dromara.file.domain.bo.SysHomeTrendBo; +import org.dromara.system.domain.vo.SysHomeTrendVo; +import org.dromara.system.domain.bo.SysHomeTrendBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssResourceService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java similarity index 92% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssResourceService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java index 4d2a229..7a01518 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssResourceService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java @@ -1,10 +1,10 @@ -package org.dromara.file.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.file.domain.bo.SysOssResourceBo; -import org.dromara.file.domain.vo.SysOssResourceVo; +import org.dromara.system.domain.bo.SysOssResourceBo; +import org.dromara.system.domain.vo.SysOssResourceVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java index aab7097..c4d5cc1 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java @@ -4,11 +4,9 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.vo.SysOssVo; -import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; import java.io.File; -import java.io.IOException; import java.util.Collection; import java.util.List; @@ -66,7 +64,7 @@ public interface ISysOssService { * @param ossId OSS对象ID * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 */ - void download(Long ossId, HttpServletResponse response) throws IOException; +// void download(Long ossId, HttpServletResponse response) throws IOException; /** * 删除OSS对象存储 @@ -84,7 +82,7 @@ public interface ISysOssService { * @param md5 文件在数据库中的唯一标识 * @return SysOssVo 对象，包含文件信息 */ - Long getIdByMd5(String md5); + SysOssVo getByMd5(String md5); diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssTextbookService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java similarity index 92% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssTextbookService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java index 8dcf5ae..3442049 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssTextbookService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java @@ -1,10 +1,10 @@ -package org.dromara.file.service; +package org.dromara.system.service; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.file.domain.bo.SysOssTextbookBo; -import org.dromara.file.domain.vo.SysOssTextbookVo; +import org.dromara.system.domain.bo.SysOssTextbookBo; +import org.dromara.system.domain.vo.SysOssTextbookVo; import java.util.Collection; import java.util.List; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysTeacherService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTeacherService.java similarity index 92% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysTeacherService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTeacherService.java index 554f29c..85292eb 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysTeacherService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTeacherService.java @@ -1,7 +1,7 @@ -package org.dromara.file.service; +package org.dromara.system.service; -import org.dromara.file.domain.vo.SysTeacherVo; -import org.dromara.file.domain.bo.SysTeacherBo; +import org.dromara.system.domain.vo.SysTeacherVo; +import org.dromara.system.domain.bo.SysTeacherBo; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/FileService.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FileService.java similarity index 96% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/FileService.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FileService.java index 4bd336e..8a6e7e8 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/FileService.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FileService.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import com.aspose.cells.Workbook; import com.aspose.slides.Presentation; @@ -7,7 +7,7 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.factory.OssFactory; -import org.dromara.file.service.IFileService; +import org.dromara.system.service.IFileService; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.ISysOssService; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogResourceServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java index 3d91cbe..392a447 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -13,13 +13,13 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.file.domain.SysCatalogResource; -import org.dromara.file.domain.SysOssResource; -import org.dromara.file.domain.bo.SysCatalogResourceBo; -import org.dromara.file.domain.vo.SysCatalogResourceVo; -import org.dromara.file.mapper.SysCatalogResourceMapper; -import org.dromara.file.mapper.SysOssResourceMapper; -import org.dromara.file.service.ISysCatalogResourceService; +import org.dromara.system.domain.SysCatalogResource; +import org.dromara.system.domain.SysOssResource; +import org.dromara.system.domain.bo.SysCatalogResourceBo; +import org.dromara.system.domain.vo.SysCatalogResourceVo; +import org.dromara.system.mapper.SysCatalogResourceMapper; +import org.dromara.system.mapper.SysOssResourceMapper; +import org.dromara.system.service.ISysCatalogResourceService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java similarity index 94% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogTextbookServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java index 70b3564..db29bab 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; @@ -13,13 +13,13 @@ import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.redis.utils.CacheUtils; -import org.dromara.file.domain.SysCatalogTextbook; -import org.dromara.file.domain.SysOssTextbook; -import org.dromara.file.domain.bo.SysCatalogTextbookBo; -import org.dromara.file.domain.vo.SysCatalogTextbookVo; -import org.dromara.file.mapper.SysCatalogTextbookMapper; -import org.dromara.file.mapper.SysOssTextbookMapper; -import org.dromara.file.service.ISysCatalogTextbookService; +import org.dromara.system.domain.SysCatalogTextbook; +import org.dromara.system.domain.SysOssTextbook; +import org.dromara.system.domain.bo.SysCatalogTextbookBo; +import org.dromara.system.domain.vo.SysCatalogTextbookVo; +import org.dromara.system.mapper.SysCatalogTextbookMapper; +import org.dromara.system.mapper.SysOssTextbookMapper; +import org.dromara.system.service.ISysCatalogTextbookService; import org.springframework.stereotype.Service; import java.util.ArrayList; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeBannerServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeBannerServiceImpl.java similarity index 92% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeBannerServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeBannerServiceImpl.java index 64584d6..d8fa844 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeBannerServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeBannerServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,11 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.dromara.file.domain.bo.SysHomeBannerBo; -import org.dromara.file.domain.vo.SysHomeBannerVo; -import org.dromara.file.domain.SysHomeBanner; -import org.dromara.file.mapper.SysHomeBannerMapper; -import org.dromara.file.service.ISysHomeBannerService; +import org.dromara.system.domain.bo.SysHomeBannerBo; +import org.dromara.system.domain.vo.SysHomeBannerVo; +import org.dromara.system.domain.SysHomeBanner; +import org.dromara.system.mapper.SysHomeBannerMapper; +import org.dromara.system.service.ISysHomeBannerService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeShowServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeShowServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java index 4359559..d7f91b2 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeShowServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -9,11 +9,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.dromara.file.domain.bo.SysHomeShowBo; -import org.dromara.file.domain.vo.SysHomeShowVo; -import org.dromara.file.domain.SysHomeShow; -import org.dromara.file.mapper.SysHomeShowMapper; -import org.dromara.file.service.ISysHomeShowService; +import org.dromara.system.domain.bo.SysHomeShowBo; +import org.dromara.system.domain.vo.SysHomeShowVo; +import org.dromara.system.domain.SysHomeShow; +import org.dromara.system.mapper.SysHomeShowMapper; +import org.dromara.system.service.ISysHomeShowService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeTrendServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeTrendServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java index 175f464..05da6d7 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeTrendServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.StringUtils; @@ -8,12 +8,12 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; +import org.dromara.system.service.ISysHomeTrendService; import org.springframework.stereotype.Service; -import org.dromara.file.domain.bo.SysHomeTrendBo; -import org.dromara.file.domain.vo.SysHomeTrendVo; -import org.dromara.file.domain.SysHomeTrend; -import org.dromara.file.mapper.SysHomeTrendMapper; -import org.dromara.file.service.ISysHomeTrendService; +import org.dromara.system.domain.bo.SysHomeTrendBo; +import org.dromara.system.domain.vo.SysHomeTrendVo; +import org.dromara.system.domain.SysHomeTrend; +import org.dromara.system.mapper.SysHomeTrendMapper; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysOssResourceServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysOssResourceServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java index bbe1d55..cfee09b 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysOssResourceServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssResourceServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,11 +9,11 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.file.domain.SysOssResource; -import org.dromara.file.domain.bo.SysOssResourceBo; -import org.dromara.file.domain.vo.SysOssResourceVo; -import org.dromara.file.mapper.SysOssResourceMapper; -import org.dromara.file.service.ISysOssResourceService; +import org.dromara.system.domain.SysOssResource; +import org.dromara.system.domain.bo.SysOssResourceBo; +import org.dromara.system.domain.vo.SysOssResourceVo; +import org.dromara.system.mapper.SysOssResourceMapper; +import org.dromara.system.service.ISysOssResourceService; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.ISysOssService; import org.springframework.stereotype.Service; 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 a4b9997..31a4137 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 @@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.apache.commons.codec.digest.DigestUtils; import org.dromara.common.core.constant.CacheNames; @@ -17,7 +16,6 @@ import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.core.utils.file.FileUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.oss.core.OssClient; @@ -31,7 +29,6 @@ import org.dromara.system.mapper.SysOssMapper; import org.dromara.system.service.ISysOssService; import org.jetbrains.annotations.NotNull; import org.springframework.cache.annotation.Cacheable; -import org.springframework.http.MediaType; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -138,7 +135,6 @@ public class SysOssServiceImpl implements ISysOssService, OssService { Map params = bo.getParams(); LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName()); - lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), SysOss::getOriginalName, bo.getOriginalName()); lqw.eq(StringUtils.isNotBlank(bo.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix()); lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl()); lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, @@ -168,18 +164,18 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * @param ossId OSS对象ID * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 */ - @Override - public void download(Long ossId, HttpServletResponse response) throws IOException { - SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); - if (ObjectUtil.isNull(sysOss)) { - throw new ServiceException("文件数据不存在!"); - } - FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); - response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); - OssClient storage = OssFactory.instance(sysOss.getService()); - long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream()); - response.setContentLengthLong(contentLength); - } +// @Override +// public void download(Long ossId, HttpServletResponse response) throws IOException { +// SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); +// if (ObjectUtil.isNull(sysOss)) { +// throw new ServiceException("文件数据不存在!"); +// } +// FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); +// response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); +// OssClient storage = OssFactory.instance(sysOss.getService()); +// long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream()); +// response.setContentLengthLong(contentLength); +// } /** * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 @@ -197,16 +193,16 @@ public class SysOssServiceImpl implements ISysOssService, OssService { String md5; try { md5 = DigestUtils.md5Hex(file.getInputStream()); - Long ossId = this.getIdByMd5(md5); - if (ObjectUtil.isNotNull(ossId)) { - return SpringUtils.getAopProxy(this).getById(ossId); + SysOssVo byMd5 = this.getByMd5(md5); + if (ObjectUtil.isNotNull(byMd5)) { + return byMd5; } uploadResult = storage.uploadSuffix(file.getBytes(), suffix); } catch (IOException e) { throw new ServiceException(e.getMessage()); } // 保存文件信息 - return buildResultEntity(originalfileName, md5, suffix, storage.getConfigKey(), uploadResult); + return buildResultEntity(md5, suffix, storage.getConfigKey(), uploadResult); } /** @@ -223,25 +219,24 @@ public class SysOssServiceImpl implements ISysOssService, OssService { String md5; try (FileInputStream fileInputStream = new FileInputStream(file)) { md5 = DigestUtils.md5Hex(fileInputStream); - Long ossId = this.getIdByMd5(md5); - if (ObjectUtil.isNotNull(ossId)) { - return SpringUtils.getAopProxy(this).getById(ossId); + SysOssVo byMd5 = this.getByMd5(md5); + if (ObjectUtil.isNotNull(byMd5)) { + return byMd5; } } catch (IOException e) { throw new ServiceException(e.getMessage()); } UploadResult uploadResult = storage.uploadSuffix(file, suffix); // 保存文件信息 - return buildResultEntity(originalfileName, md5, suffix, storage.getConfigKey(), uploadResult); + return buildResultEntity(md5, suffix, storage.getConfigKey(), uploadResult); } @NotNull - private SysOssVo buildResultEntity(String originalfileName, String md5, String suffix, String configKey, UploadResult uploadResult) { + private SysOssVo buildResultEntity(String md5, String suffix, String configKey, UploadResult uploadResult) { SysOss oss = new SysOss(); oss.setUrl(uploadResult.getUrl()); oss.setFileSuffix(suffix); oss.setFileName(uploadResult.getFilename()); - oss.setOriginalName(originalfileName); oss.setService(configKey); oss.setFileMd5(md5); baseMapper.insert(oss); @@ -292,12 +287,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService { * @return SysOssVo 对象，包含文件信息 */ @Override - public Long getIdByMd5(String md5) { - SysOss sysOss = baseMapper.selectOne(new LambdaQueryWrapper().eq(SysOss::getFileMd5, md5)); - if (ObjectUtil.isNotNull(sysOss)) { - return sysOss.getOssId(); - } else { - return null; - } + public SysOssVo getByMd5(String md5) { + return baseMapper.selectVoOne(new LambdaQueryWrapper().eq(SysOss::getFileMd5, md5)); + } } diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysOssTextbookServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java similarity index 93% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysOssTextbookServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java index 31a78f0..c7cdf5e 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysOssTextbookServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssTextbookServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.util.ObjectUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; @@ -9,11 +9,11 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MapstructUtils; import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.TableDataInfo; -import org.dromara.file.domain.SysOssTextbook; -import org.dromara.file.domain.bo.SysOssTextbookBo; -import org.dromara.file.domain.vo.SysOssTextbookVo; -import org.dromara.file.mapper.SysOssTextbookMapper; -import org.dromara.file.service.ISysOssTextbookService; +import org.dromara.system.domain.SysOssTextbook; +import org.dromara.system.domain.bo.SysOssTextbookBo; +import org.dromara.system.domain.vo.SysOssTextbookVo; +import org.dromara.system.mapper.SysOssTextbookMapper; +import org.dromara.system.service.ISysOssTextbookService; import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.service.ISysOssService; import org.springframework.stereotype.Service; diff --git a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTeacherServiceImpl.java similarity index 95% rename from ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java rename to ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTeacherServiceImpl.java index 9ded850..eaa6caf 100644 --- a/ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysTeacherServiceImpl.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysTeacherServiceImpl.java @@ -1,4 +1,4 @@ -package org.dromara.file.service.impl; +package org.dromara.system.service.impl; import cn.hutool.core.util.ObjectUtil; import org.dromara.common.core.exception.ServiceException; @@ -11,11 +11,11 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import org.dromara.file.domain.bo.SysTeacherBo; -import org.dromara.file.domain.vo.SysTeacherVo; -import org.dromara.file.domain.SysTeacher; -import org.dromara.file.mapper.SysTeacherMapper; -import org.dromara.file.service.ISysTeacherService; +import org.dromara.system.domain.bo.SysTeacherBo; +import org.dromara.system.domain.vo.SysTeacherVo; +import org.dromara.system.domain.SysTeacher; +import org.dromara.system.mapper.SysTeacherMapper; +import org.dromara.system.service.ISysTeacherService; import java.util.List; import java.util.Map; diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogResourceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml similarity index 76% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogResourceMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml index 7c3e05b..51fd500 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogResourceMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml @@ -2,9 +2,9 @@ - + - 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 diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogTextbookMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml similarity index 76% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogTextbookMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml index ebd4c84..511b353 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogTextbookMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml @@ -2,8 +2,8 @@ - - select ct.catalog_id,ct.parent_id, ct.catalog_name, ct.type, ct.order_num, count(ot.oss_id) as `resourceNum` from sys_catalog_textbook ct left join sys_oss_textbook ot on ot.catalog_id = ct.catalog_id diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeTrendMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeBannerMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeTrendMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeBannerMapper.xml index cd934db..9333497 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeTrendMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeBannerMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeBannerMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeShowMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeBannerMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeShowMapper.xml index d28ca2c..6d9dda6 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeBannerMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeShowMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssTextbookMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeTrendMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssTextbookMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeTrendMapper.xml index e7cb306..523b900 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssTextbookMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeTrendMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssResourceMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssResourceMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssResourceMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssResourceMapper.xml index 649c563..bd90f61 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssResourceMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssResourceMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeShowMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml similarity index 70% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeShowMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml index 9ddc2a5..e02fa48 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeShowMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml @@ -2,6 +2,6 @@ - + diff --git a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysTeacherMapper.xml b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTeacherMapper.xml similarity index 71% rename from ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysTeacherMapper.xml rename to ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTeacherMapper.xml index 36577e3..1dd2aad 100644 --- a/ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysTeacherMapper.xml +++ b/ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTeacherMapper.xml @@ -2,6 +2,6 @@ - +