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

优化项目结构；文件上传优化；

This commit is contained in:
cjw 2024-06-04 16:54:22 +08:00
parent 54a1c30e3d
commit 94ed7562ea
81 changed files with 297 additions and 407 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pom.xml
View File

@ -347,12 +347,6 @@
<version>${revision}</version> <version>${revision}</version>
</dependency> </dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-file</artifactId>
<version>${revision}</version>
</dependency>
<!--office工具--> <!--office工具-->
<dependency> <dependency>
<groupId>com.luhuiguo</groupId> <groupId>com.luhuiguo</groupId>

5
ruoyi-admin/pom.xml
View File

@ -58,11 +58,6 @@
<artifactId>ruoyi-system</artifactId> <artifactId>ruoyi-system</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-file</artifactId>
</dependency>
<dependency> <dependency>
<groupId>org.dromara</groupId> <groupId>org.dromara</groupId>
<artifactId>ruoyi-job</artifactId> <artifactId>ruoyi-job</artifactId>

1
ruoyi-modules/pom.xml
View File

@ -13,7 +13,6 @@
<module>ruoyi-generator</module> <module>ruoyi-generator</module>
<module>ruoyi-job</module> <module>ruoyi-job</module>
<module>ruoyi-system</module> <module>ruoyi-system</module>
<module>ruoyi-file</module>
</modules> </modules>
<artifactId>ruoyi-modules</artifactId> <artifactId>ruoyi-modules</artifactId>

100
ruoyi-modules/ruoyi-file/pom.xml
View File

@ -1,100 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-modules</artifactId>
<version>${revision}</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>ruoyi-file</artifactId>
<description>
校本资源模块
</description>
<dependencies>
<!-- 通用工具-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-core</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-mybatis</artifactId>
</dependency>
<!-- OSS功能模块 -->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-oss</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-log</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-tenant</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-security</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-web</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-idempotent</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-sensitive</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-encrypt</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-translation</artifactId>
</dependency>
<!-- excel-->
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-common-excel</artifactId>
</dependency>
<dependency>
<groupId>org.dromara</groupId>
<artifactId>ruoyi-system</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-words</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-pdf</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-cells</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-slides</artifactId>
</dependency>
</dependencies>
</project>

17
ruoyi-modules/ruoyi-system/pom.xml
View File

@ -95,6 +95,23 @@
<artifactId>ruoyi-common-websocket</artifactId> <artifactId>ruoyi-common-websocket</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-words</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-pdf</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-cells</artifactId>
</dependency>
<dependency>
<groupId>com.luhuiguo</groupId>
<artifactId>aspose-slides</artifactId>
</dependency>
</dependencies> </dependencies>
</project> </project>

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/FileController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/FileController.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.file.service.IFileService; import org.dromara.system.service.IFileService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;

8
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogResourceController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogResourceController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysCatalogResourceBo; import org.dromara.system.domain.bo.SysCatalogResourceBo;
import org.dromara.file.domain.vo.SysCatalogResourceVo; import org.dromara.system.domain.vo.SysCatalogResourceVo;
import org.dromara.file.service.ISysCatalogResourceService; import org.dromara.system.service.ISysCatalogResourceService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysCatalogTextbookController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysCatalogTextbookController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysCatalogTextbookBo; import org.dromara.system.domain.bo.SysCatalogTextbookBo;
import org.dromara.file.domain.vo.SysCatalogTextbookVo; import org.dromara.system.domain.vo.SysCatalogTextbookVo;
import org.dromara.file.service.ISysCatalogTextbookService; import org.dromara.system.service.ISysCatalogTextbookService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeBannerController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeBannerController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysHomeBannerBo; import org.dromara.system.domain.bo.SysHomeBannerBo;
import org.dromara.file.domain.vo.SysHomeBannerVo; import org.dromara.system.domain.vo.SysHomeBannerVo;
import org.dromara.file.service.ISysHomeBannerService; import org.dromara.system.service.ISysHomeBannerService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeShowController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeShowController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysHomeShowBo; import org.dromara.system.domain.bo.SysHomeShowBo;
import org.dromara.file.domain.vo.SysHomeShowVo; import org.dromara.system.domain.vo.SysHomeShowVo;
import org.dromara.file.service.ISysHomeShowService; import org.dromara.system.service.ISysHomeShowService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysHomeTrendController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysHomeTrendController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysHomeTrendBo; import org.dromara.system.domain.bo.SysHomeTrendBo;
import org.dromara.file.domain.vo.SysHomeTrendVo; import org.dromara.system.domain.vo.SysHomeTrendVo;
import org.dromara.file.service.ISysHomeTrendService; import org.dromara.system.service.ISysHomeTrendService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssResourceController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssResourceController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysOssResourceBo; import org.dromara.system.domain.bo.SysOssResourceBo;
import org.dromara.file.domain.vo.SysOssResourceVo; import org.dromara.system.domain.vo.SysOssResourceVo;
import org.dromara.file.service.ISysOssResourceService; import org.dromara.system.service.ISysOssResourceService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

8
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysOssTextbookController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysOssTextbookController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.validation.constraints.NotEmpty; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysOssTextbookBo; import org.dromara.system.domain.bo.SysOssTextbookBo;
import org.dromara.file.domain.vo.SysOssTextbookVo; import org.dromara.system.domain.vo.SysOssTextbookVo;
import org.dromara.file.service.ISysOssTextbookService; import org.dromara.system.service.ISysOssTextbookService;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

12
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/controller/SysTeacherController.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/file/SysTeacherController.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.controller; package org.dromara.system.controller.file;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import jakarta.servlet.http.HttpServletResponse; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController; import org.dromara.common.web.core.BaseController;
import org.dromara.file.domain.bo.SysTeacherBo; import org.dromara.system.domain.bo.SysTeacherBo;
import org.dromara.file.domain.vo.SysTeacherImportVo; import org.dromara.system.domain.vo.SysTeacherImportVo;
import org.dromara.file.domain.vo.SysTeacherVo; import org.dromara.system.domain.vo.SysTeacherVo;
import org.dromara.file.listener.SysTeacherImportListener; import org.dromara.system.listener.SysTeacherImportListener;
import org.dromara.file.service.ISysTeacherService; import org.dromara.system.service.ISysTeacherService;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;

31
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysOssController.java
View File

@ -3,26 +3,24 @@ package org.dromara.system.controller.system;
import cn.dev33.satoken.annotation.SaCheckPermission; import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.hutool.core.util.ObjectUtil; 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.domain.R;
import org.dromara.common.core.validate.QueryGroup; 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.annotation.Log;
import org.dromara.common.log.enums.BusinessType; import org.dromara.common.log.enums.BusinessType;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; 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.bo.SysOssBo;
import org.dromara.system.domain.vo.SysOssUploadVo; import org.dromara.system.domain.vo.SysOssUploadVo;
import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService; 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.http.MediaType;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.IOException;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -76,7 +74,6 @@ public class SysOssController extends BaseController {
SysOssVo oss = ossService.upload(file); SysOssVo oss = ossService.upload(file);
SysOssUploadVo uploadVo = new SysOssUploadVo(); SysOssUploadVo uploadVo = new SysOssUploadVo();
uploadVo.setUrl(oss.getUrl()); uploadVo.setUrl(oss.getUrl());
uploadVo.setFileName(oss.getOriginalName());
uploadVo.setOssId(oss.getOssId().toString()); uploadVo.setOssId(oss.getOssId().toString());
return R.ok(uploadVo); return R.ok(uploadVo);
} }
@ -86,11 +83,11 @@ public class SysOssController extends BaseController {
* *
* @param ossId OSS对象ID * @param ossId OSS对象ID
*/ */
@SaCheckPermission("system:oss:download") // @SaCheckPermission("system:oss:download")
@GetMapping("/download/{ossId}") // @GetMapping("/download/{ossId}")
public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException { // public void download(@PathVariable Long ossId, HttpServletResponse response) throws IOException {
ossService.download(ossId, response); // ossService.download(ossId, response);
} // }
/** /**
* 删除OSS对象存储 * 删除OSS对象存储
@ -112,9 +109,15 @@ public class SysOssController extends BaseController {
*/ */
@SaCheckPermission("system:oss:identifier") @SaCheckPermission("system:oss:identifier")
@GetMapping("/identifier") @GetMapping("/identifier")
public R<Long> identifier(@NotEmpty(message = "MD5不能为空") String md5) { public R<SysOssUploadVo> identifier(@NotEmpty(message = "MD5不能为空") String md5) {
Long ossId = ossService.getIdByMd5(md5); SysOssVo oss = ossService.getByMd5(md5);
return R.ok(ossId); SysOssUploadVo uploadVo = new SysOssUploadVo();
if (ObjectUtil.isNotNull(oss)) {
uploadVo.setUrl(oss.getUrl());
uploadVo.setOssId(oss.getOssId().toString());
}
return R.ok(uploadVo);
} }
} }

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogResource.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogResource.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain; package org.dromara.system.domain;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysCatalogTextbook.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCatalogTextbook.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain; package org.dromara.system.domain;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeBanner.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeBanner.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain; package org.dromara.system.domain;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeShow.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeShow.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain; package org.dromara.system.domain;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysHomeTrend.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysHomeTrend.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain; package org.dromara.system.domain;
import org.dromara.common.tenant.core.TenantEntity; import org.dromara.common.tenant.core.TenantEntity;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.*;

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOss.java
View File

@ -32,11 +32,6 @@ public class SysOss extends BaseEntity {
*/ */
private String fileMd5; private String fileMd5;
/**
* 原名
*/
private String originalName;
/** /**
* 文件后缀名 * 文件后缀名
*/ */

18
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssResource.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssResource.java
View File

@ -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.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
/** /**
* 【请填写功能名称】对象 sys_oss_resource * 【请填写功能名称】对象 sys_oss_resource
@ -18,8 +17,8 @@ import java.io.Serial;
@TableName("sys_oss_resource") @TableName("sys_oss_resource")
public class SysOssResource extends BaseEntity { public class SysOssResource extends BaseEntity {
@Serial @TableId(value = "id")
private static final long serialVersionUID = 1L; private Long id;
/** /**
* *
@ -31,5 +30,10 @@ public class SysOssResource extends BaseEntity {
*/ */
private Long catalogId; private Long catalogId;
/**
* 文件名
*/
private String fileName;
} }

19
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysOssTextbook.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysOssTextbook.java
View File

@ -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.TableId;
import com.baomidou.mybatisplus.annotation.*; import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import org.dromara.common.mybatis.core.domain.BaseEntity;
import java.io.Serial;
/** /**
* 【请填写功能名称】对象 sys_oss_textbook * 【请填写功能名称】对象 sys_oss_textbook
@ -18,9 +17,8 @@ import java.io.Serial;
@TableName("sys_oss_textbook") @TableName("sys_oss_textbook")
public class SysOssTextbook extends BaseEntity { public class SysOssTextbook extends BaseEntity {
@Serial @TableId(value = "id")
private static final long serialVersionUID = 1L; private Long id;
/** /**
* *
*/ */
@ -36,5 +34,10 @@ public class SysOssTextbook extends BaseEntity {
*/ */
private Integer type; private Integer type;
/**
* 文件名
*/
private String fileName;
} }

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/SysTeacher.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysTeacher.java
View File

@ -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.IdType;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/OssFileBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/OssFileBo.java
View File

@ -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.AutoMapper;
import io.github.linpeilie.annotations.AutoMappers; import io.github.linpeilie.annotations.AutoMappers;
import org.dromara.file.domain.SysOssResource; import org.dromara.system.domain.SysOssResource;
import org.dromara.file.domain.SysOssTextbook; import org.dromara.system.domain.SysOssTextbook;
/** /**
* <p>TODO<p> * <p>TODO<p>

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogResourceBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogResourceBo.java
View File

@ -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.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysCatalogTextbookBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysCatalogTextbookBo.java
View File

@ -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.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeBannerBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeBannerBo.java
View File

@ -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.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeShowBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeShowBo.java
View File

@ -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.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysHomeTrendBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysHomeTrendBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain.bo; package org.dromara.system.domain.bo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import jakarta.validation.constraints.NotBlank; 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.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.file.domain.SysHomeTrend; import org.dromara.system.domain.SysHomeTrend;
/** /**
* 学校动态业务对象 sys_home_trend * 学校动态业务对象 sys_home_trend

23
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssResourceBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssResourceBo.java
View File

@ -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.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 org.dromara.common.core.validate.EditGroup;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
@ -20,17 +20,18 @@ import jakarta.validation.constraints.*;
@AutoMapper(target = SysOssResource.class, reverseConvertGenerate = false) @AutoMapper(target = SysOssResource.class, reverseConvertGenerate = false)
public class SysOssResourceBo extends BaseEntity { public class SysOssResourceBo extends BaseEntity {
/**
* @NotNull(message = "主键不能为空", groups = {EditGroup.class})
*/ private Long id;
@NotNull(message = "不能为空", groups = { EditGroup.class })
@NotNull(message = "资源id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long ossId; private Long ossId;
/** @NotNull(message = "目录id不能为空", groups = {AddGroup.class, EditGroup.class})
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long catalogId; private Long catalogId;
@NotNull(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class})
private String fileName;
} }

22
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysOssTextbookBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysOssTextbookBo.java
View File

@ -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.mybatis.core.domain.BaseEntity;
import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
@ -20,22 +20,22 @@ import jakarta.validation.constraints.*;
@AutoMapper(target = SysOssTextbook.class, reverseConvertGenerate = false) @AutoMapper(target = SysOssTextbook.class, reverseConvertGenerate = false)
public class SysOssTextbookBo extends BaseEntity { public class SysOssTextbookBo extends BaseEntity {
/** @NotNull(message = "主键不能为空", groups = {EditGroup.class})
* private Long id;
*/
@NotNull(message = "不能为空", groups = { EditGroup.class }) @NotNull(message = "资源id不能为空", groups = {AddGroup.class, EditGroup.class})
private Long ossId; private Long ossId;
/** @NotNull(message = "目录id不能为空", groups = {AddGroup.class, EditGroup.class})
*
*/
@NotNull(message = "不能为空", groups = { EditGroup.class })
private Long catalogId; private Long catalogId;
@NotNull(message = "文件名不能为空", groups = {AddGroup.class, EditGroup.class})
private String fileName;
/** /**
* 1课件，2课堂，3作业，4试卷 * 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; private Integer type;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/bo/SysTeacherBo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysTeacherBo.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain.bo; package org.dromara.system.domain.bo;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import io.github.linpeilie.annotations.AutoMapper; 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.AddGroup;
import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.mybatis.core.domain.BaseEntity; import org.dromara.common.mybatis.core.domain.BaseEntity;
import org.dromara.file.domain.SysTeacher; import org.dromara.system.domain.SysTeacher;
import java.util.Date; import java.util.Date;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogResourceVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogResourceVo.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.domain.vo; package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.file.domain.SysCatalogResource; import org.dromara.system.domain.SysCatalogResource;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysCatalogTextbookVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysCatalogTextbookVo.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.domain.vo; package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.file.domain.SysCatalogTextbook; import org.dromara.system.domain.SysCatalogTextbook;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeBannerVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeBannerVo.java
View File

@ -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.AutoMapper;
import io.github.linpeilie.annotations.AutoMapping; import io.github.linpeilie.annotations.AutoMapping;
import lombok.Data; import lombok.Data;
import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant; 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.Serial;
import java.io.Serializable; import java.io.Serializable;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeShowVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeShowVo.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.domain.vo; package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.file.domain.SysHomeShow; import org.dromara.system.domain.SysHomeShow;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysHomeTrendVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysHomeTrendVo.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.domain.vo; package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.file.domain.SysHomeTrend; import org.dromara.system.domain.SysHomeTrend;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssResourceVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssResourceVo.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.domain.vo; package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.file.domain.SysOssResource; import org.dromara.system.domain.SysOssResource;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysOssTextbookVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssTextbookVo.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.domain.vo; package org.dromara.system.domain.vo;
import io.github.linpeilie.annotations.AutoMapper; import io.github.linpeilie.annotations.AutoMapper;
import lombok.Data; import lombok.Data;
import org.dromara.file.domain.SysOssTextbook; import org.dromara.system.domain.SysOssTextbook;
import java.io.Serial; import java.io.Serial;
import java.io.Serializable; import java.io.Serializable;

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssUploadVo.java
View File

@ -15,11 +15,6 @@ public class SysOssUploadVo {
*/ */
private String url; private String url;
/**
* 文件名
*/
private String fileName;
/** /**
* 对象存储主键 * 对象存储主键
*/ */

5
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysOssVo.java
View File

@ -32,11 +32,6 @@ public class SysOssVo implements Serializable {
*/ */
private String fileName; private String fileName;
/**
* 原名
*/
private String originalName;
/** /**
* 文件后缀名 * 文件后缀名
*/ */

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherImportVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherImportVo.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.domain.vo; package org.dromara.system.domain.vo;
import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data; import lombok.Data;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/domain/vo/SysTeacherVo.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysTeacherVo.java
View File

@ -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.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty; 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.excel.convert.ExcelDictConvert;
import org.dromara.common.translation.annotation.Translation; import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant; 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.Serial;
import java.io.Serializable; import java.io.Serializable;

10
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/listener/SysTeacherImportListener.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/listener/SysTeacherImportListener.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.listener; package org.dromara.system.listener;
import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.ObjectUtil; 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.ExcelListener;
import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.core.ExcelResult;
import org.dromara.common.satoken.utils.LoginHelper; import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.file.domain.bo.SysTeacherBo; import org.dromara.system.domain.bo.SysTeacherBo;
import org.dromara.file.domain.vo.SysTeacherImportVo; import org.dromara.system.domain.vo.SysTeacherImportVo;
import org.dromara.file.domain.vo.SysTeacherVo; import org.dromara.system.domain.vo.SysTeacherVo;
import org.dromara.file.service.ISysTeacherService; import org.dromara.system.service.ISysTeacherService;
import java.util.List; import java.util.List;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogResourceMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogResourceMapper.java
View File

@ -1,12 +1,12 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.file.domain.SysCatalogResource; import org.dromara.system.domain.SysCatalogResource;
import org.dromara.file.domain.vo.SysCatalogResourceVo; import org.dromara.system.domain.vo.SysCatalogResourceVo;
/** /**
* 目录-专题资源Mapper接口 * 目录-专题资源Mapper接口

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysCatalogTextbookMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysCatalogTextbookMapper.java
View File

@ -1,12 +1,12 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.file.domain.SysCatalogTextbook; import org.dromara.system.domain.SysCatalogTextbook;
import org.dromara.file.domain.vo.SysCatalogTextbookVo; import org.dromara.system.domain.vo.SysCatalogTextbookVo;
/** /**
* 目录-同步教材Mapper接口 * 目录-同步教材Mapper接口

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeBannerMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeBannerMapper.java
View File

@ -1,9 +1,9 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.file.domain.SysHomeBanner; import org.dromara.system.domain.SysHomeBanner;
import org.dromara.file.domain.vo.SysHomeBannerVo; import org.dromara.system.domain.vo.SysHomeBannerVo;
/** /**
* 门户BannerMapper接口 * 门户BannerMapper接口

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeShowMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeShowMapper.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.file.domain.SysHomeShow; import org.dromara.system.domain.SysHomeShow;
import org.dromara.file.domain.vo.SysHomeShowVo; import org.dromara.system.domain.vo.SysHomeShowVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/** /**

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysHomeTrendMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysHomeTrendMapper.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.file.domain.SysHomeTrend; import org.dromara.system.domain.SysHomeTrend;
import org.dromara.file.domain.vo.SysHomeTrendVo; import org.dromara.system.domain.vo.SysHomeTrendVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/** /**

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssResourceMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssResourceMapper.java
View File

@ -1,10 +1,10 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.file.domain.SysOssResource; import org.dromara.system.domain.SysOssResource;
import org.dromara.file.domain.vo.SysOssResourceVo; import org.dromara.system.domain.vo.SysOssResourceVo;
/** /**
* 【请填写功能名称】Mapper接口 * 【请填写功能名称】Mapper接口

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysOssTextbookMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysOssTextbookMapper.java
View File

@ -1,10 +1,10 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
import org.dromara.file.domain.SysOssTextbook; import org.dromara.system.domain.SysOssTextbook;
import org.dromara.file.domain.vo.SysOssTextbookVo; import org.dromara.system.domain.vo.SysOssTextbookVo;
/** /**
* 【请填写功能名称】Mapper接口 * 【请填写功能名称】Mapper接口

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/mapper/SysTeacherMapper.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysTeacherMapper.java
View File

@ -1,8 +1,8 @@
package org.dromara.file.mapper; package org.dromara.system.mapper;
import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Mapper;
import org.dromara.file.domain.SysTeacher; import org.dromara.system.domain.SysTeacher;
import org.dromara.file.domain.vo.SysTeacherVo; import org.dromara.system.domain.vo.SysTeacherVo;
import org.dromara.common.mybatis.core.mapper.BaseMapperPlus; import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
/** /**

2
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/IFileService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/IFileService.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.service; package org.dromara.system.service;
import jakarta.servlet.http.HttpServletResponse; import jakarta.servlet.http.HttpServletResponse;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogResourceService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogResourceService.java
View File

@ -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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.file.domain.bo.SysCatalogResourceBo; import org.dromara.system.domain.bo.SysCatalogResourceBo;
import org.dromara.file.domain.vo.SysCatalogResourceVo; import org.dromara.system.domain.vo.SysCatalogResourceVo;
import java.util.List; import java.util.List;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysCatalogTextbookService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysCatalogTextbookService.java
View File

@ -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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.file.domain.bo.SysCatalogTextbookBo; import org.dromara.system.domain.bo.SysCatalogTextbookBo;
import org.dromara.file.domain.vo.SysCatalogTextbookVo; import org.dromara.system.domain.vo.SysCatalogTextbookVo;
import java.util.List; import java.util.List;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeBannerService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeBannerService.java
View File

@ -1,7 +1,7 @@
package org.dromara.file.service; package org.dromara.system.service;
import org.dromara.file.domain.vo.SysHomeBannerVo; import org.dromara.system.domain.vo.SysHomeBannerVo;
import org.dromara.file.domain.bo.SysHomeBannerBo; import org.dromara.system.domain.bo.SysHomeBannerBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeShowService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeShowService.java
View File

@ -1,7 +1,7 @@
package org.dromara.file.service; package org.dromara.system.service;
import org.dromara.file.domain.vo.SysHomeShowVo; import org.dromara.system.domain.vo.SysHomeShowVo;
import org.dromara.file.domain.bo.SysHomeShowBo; import org.dromara.system.domain.bo.SysHomeShowBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysHomeTrendService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysHomeTrendService.java
View File

@ -1,7 +1,7 @@
package org.dromara.file.service; package org.dromara.system.service;
import org.dromara.file.domain.vo.SysHomeTrendVo; import org.dromara.system.domain.vo.SysHomeTrendVo;
import org.dromara.file.domain.bo.SysHomeTrendBo; import org.dromara.system.domain.bo.SysHomeTrendBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssResourceService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssResourceService.java
View File

@ -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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.file.domain.bo.SysOssResourceBo; import org.dromara.system.domain.bo.SysOssResourceBo;
import org.dromara.file.domain.vo.SysOssResourceVo; import org.dromara.system.domain.vo.SysOssResourceVo;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

6
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssService.java
View File

@ -4,11 +4,9 @@ import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.system.domain.bo.SysOssBo; import org.dromara.system.domain.bo.SysOssBo;
import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.domain.vo.SysOssVo;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.File; import java.io.File;
import java.io.IOException;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;
@ -66,7 +64,7 @@ public interface ISysOssService {
* @param ossId OSS对象ID * @param ossId OSS对象ID
* @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容
*/ */
void download(Long ossId, HttpServletResponse response) throws IOException; // void download(Long ossId, HttpServletResponse response) throws IOException;
/** /**
* 删除OSS对象存储 * 删除OSS对象存储
@ -84,7 +82,7 @@ public interface ISysOssService {
* @param md5 文件在数据库中的唯一标识 * @param md5 文件在数据库中的唯一标识
* @return SysOssVo 对象，包含文件信息 * @return SysOssVo 对象，包含文件信息
*/ */
Long getIdByMd5(String md5); SysOssVo getByMd5(String md5);

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysOssTextbookService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysOssTextbookService.java
View File

@ -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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.file.domain.bo.SysOssTextbookBo; import org.dromara.system.domain.bo.SysOssTextbookBo;
import org.dromara.file.domain.vo.SysOssTextbookVo; import org.dromara.system.domain.vo.SysOssTextbookVo;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.List;

6
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/ISysTeacherService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/ISysTeacherService.java
View File

@ -1,7 +1,7 @@
package org.dromara.file.service; package org.dromara.system.service;
import org.dromara.file.domain.vo.SysTeacherVo; import org.dromara.system.domain.vo.SysTeacherVo;
import org.dromara.file.domain.bo.SysTeacherBo; import org.dromara.system.domain.bo.SysTeacherBo;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;

4
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/FileService.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/FileService.java
View File

@ -1,4 +1,4 @@
package org.dromara.file.service.impl; package org.dromara.system.service.impl;
import com.aspose.cells.Workbook; import com.aspose.cells.Workbook;
import com.aspose.slides.Presentation; import com.aspose.slides.Presentation;
@ -7,7 +7,7 @@ import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.common.oss.core.OssClient; import org.dromara.common.oss.core.OssClient;
import org.dromara.common.oss.factory.OssFactory; 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.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService; import org.dromara.system.service.ISysOssService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

16
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogResourceServiceImpl.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogResourceServiceImpl.java
View File

@ -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.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; 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.core.page.TableDataInfo;
import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.mybatis.helper.DataBaseHelper;
import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.redis.utils.CacheUtils;
import org.dromara.file.domain.SysCatalogResource; import org.dromara.system.domain.SysCatalogResource;
import org.dromara.file.domain.SysOssResource; import org.dromara.system.domain.SysOssResource;
import org.dromara.file.domain.bo.SysCatalogResourceBo; import org.dromara.system.domain.bo.SysCatalogResourceBo;
import org.dromara.file.domain.vo.SysCatalogResourceVo; import org.dromara.system.domain.vo.SysCatalogResourceVo;
import org.dromara.file.mapper.SysCatalogResourceMapper; import org.dromara.system.mapper.SysCatalogResourceMapper;
import org.dromara.file.mapper.SysOssResourceMapper; import org.dromara.system.mapper.SysOssResourceMapper;
import org.dromara.file.service.ISysCatalogResourceService; import org.dromara.system.service.ISysCatalogResourceService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;

16
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysCatalogTextbookServiceImpl.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysCatalogTextbookServiceImpl.java
View File

@ -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.collection.CollUtil;
import cn.hutool.core.util.ObjectUtil; 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.core.page.TableDataInfo;
import org.dromara.common.mybatis.helper.DataBaseHelper; import org.dromara.common.mybatis.helper.DataBaseHelper;
import org.dromara.common.redis.utils.CacheUtils; import org.dromara.common.redis.utils.CacheUtils;
import org.dromara.file.domain.SysCatalogTextbook; import org.dromara.system.domain.SysCatalogTextbook;
import org.dromara.file.domain.SysOssTextbook; import org.dromara.system.domain.SysOssTextbook;
import org.dromara.file.domain.bo.SysCatalogTextbookBo; import org.dromara.system.domain.bo.SysCatalogTextbookBo;
import org.dromara.file.domain.vo.SysCatalogTextbookVo; import org.dromara.system.domain.vo.SysCatalogTextbookVo;
import org.dromara.file.mapper.SysCatalogTextbookMapper; import org.dromara.system.mapper.SysCatalogTextbookMapper;
import org.dromara.file.mapper.SysOssTextbookMapper; import org.dromara.system.mapper.SysOssTextbookMapper;
import org.dromara.file.service.ISysCatalogTextbookService; import org.dromara.system.service.ISysCatalogTextbookService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;

12
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeBannerServiceImpl.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeBannerServiceImpl.java
View File

@ -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.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; 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 com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.file.domain.bo.SysHomeBannerBo; import org.dromara.system.domain.bo.SysHomeBannerBo;
import org.dromara.file.domain.vo.SysHomeBannerVo; import org.dromara.system.domain.vo.SysHomeBannerVo;
import org.dromara.file.domain.SysHomeBanner; import org.dromara.system.domain.SysHomeBanner;
import org.dromara.file.mapper.SysHomeBannerMapper; import org.dromara.system.mapper.SysHomeBannerMapper;
import org.dromara.file.service.ISysHomeBannerService; import org.dromara.system.service.ISysHomeBannerService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

12
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeShowServiceImpl.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeShowServiceImpl.java
View File

@ -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.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; 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 com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.file.domain.bo.SysHomeShowBo; import org.dromara.system.domain.bo.SysHomeShowBo;
import org.dromara.file.domain.vo.SysHomeShowVo; import org.dromara.system.domain.vo.SysHomeShowVo;
import org.dromara.file.domain.SysHomeShow; import org.dromara.system.domain.SysHomeShow;
import org.dromara.file.mapper.SysHomeShowMapper; import org.dromara.system.mapper.SysHomeShowMapper;
import org.dromara.file.service.ISysHomeShowService; import org.dromara.system.service.ISysHomeShowService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

12
ruoyi-modules/ruoyi-file/src/main/java/org/dromara/file/service/impl/SysHomeTrendServiceImpl.java → ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysHomeTrendServiceImpl.java
View File

@ -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.MapstructUtils;
import org.dromara.common.core.utils.StringUtils; 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.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.dromara.system.service.ISysHomeTrendService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.file.domain.bo.SysHomeTrendBo; import org.dromara.system.domain.bo.SysHomeTrendBo;
import org.dromara.file.domain.vo.SysHomeTrendVo; import org.dromara.system.domain.vo.SysHomeTrendVo;
import org.dromara.file.domain.SysHomeTrend; import org.dromara.system.domain.SysHomeTrend;
import org.dromara.file.mapper.SysHomeTrendMapper; import org.dromara.system.mapper.SysHomeTrendMapper;
import org.dromara.file.service.ISysHomeTrendService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

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

@ -1,4 +1,4 @@
package org.dromara.file.service.impl; package org.dromara.system.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.core.utils.MapstructUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.file.domain.SysOssResource; import org.dromara.system.domain.SysOssResource;
import org.dromara.file.domain.bo.SysOssResourceBo; import org.dromara.system.domain.bo.SysOssResourceBo;
import org.dromara.file.domain.vo.SysOssResourceVo; import org.dromara.system.domain.vo.SysOssResourceVo;
import org.dromara.file.mapper.SysOssResourceMapper; import org.dromara.system.mapper.SysOssResourceMapper;
import org.dromara.file.service.ISysOssResourceService; import org.dromara.system.service.ISysOssResourceService;
import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService; import org.dromara.system.service.ISysOssService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

57
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysOssServiceImpl.java
View File

@ -6,7 +6,6 @@ import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import jakarta.servlet.http.HttpServletResponse;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.apache.commons.codec.digest.DigestUtils; import org.apache.commons.codec.digest.DigestUtils;
import org.dromara.common.core.constant.CacheNames; 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.SpringUtils;
import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils; 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.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.oss.core.OssClient; 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.dromara.system.service.ISysOssService;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.springframework.cache.annotation.Cacheable; import org.springframework.cache.annotation.Cacheable;
import org.springframework.http.MediaType;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
@ -138,7 +135,6 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
Map<String, Object> params = bo.getParams(); Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery(); LambdaQueryWrapper<SysOss> lqw = Wrappers.lambdaQuery();
lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysOss::getFileName, bo.getFileName()); 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.getFileSuffix()), SysOss::getFileSuffix, bo.getFileSuffix());
lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl()); lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysOss::getUrl, bo.getUrl());
lqw.between(params.get("beginCreateTime") != null && params.get("endCreateTime") != null, 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 ossId OSS对象ID
* @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容 * @param response HttpServletResponse对象，用于设置响应头和向客户端发送文件内容
*/ */
@Override // @Override
public void download(Long ossId, HttpServletResponse response) throws IOException { // public void download(Long ossId, HttpServletResponse response) throws IOException {
SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId); // SysOssVo sysOss = SpringUtils.getAopProxy(this).getById(ossId);
if (ObjectUtil.isNull(sysOss)) { // if (ObjectUtil.isNull(sysOss)) {
throw new ServiceException("文件数据不存在!"); // throw new ServiceException("文件数据不存在!");
} // }
FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); // FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName());
response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); // response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8");
OssClient storage = OssFactory.instance(sysOss.getService()); // OssClient storage = OssFactory.instance(sysOss.getService());
long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream()); // long contentLength = storage.download(sysOss.getFileName(), response.getOutputStream());
response.setContentLengthLong(contentLength); // response.setContentLengthLong(contentLength);
} // }
/** /**
* 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库 * 上传 MultipartFile 到对象存储服务，并保存文件信息到数据库
@ -197,16 +193,16 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
String md5; String md5;
try { try {
md5 = DigestUtils.md5Hex(file.getInputStream()); md5 = DigestUtils.md5Hex(file.getInputStream());
Long ossId = this.getIdByMd5(md5); SysOssVo byMd5 = this.getByMd5(md5);
if (ObjectUtil.isNotNull(ossId)) { if (ObjectUtil.isNotNull(byMd5)) {
return SpringUtils.getAopProxy(this).getById(ossId); return byMd5;
} }
uploadResult = storage.uploadSuffix(file.getBytes(), suffix); uploadResult = storage.uploadSuffix(file.getBytes(), suffix);
} catch (IOException e) { } catch (IOException e) {
throw new ServiceException(e.getMessage()); 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; String md5;
try (FileInputStream fileInputStream = new FileInputStream(file)) { try (FileInputStream fileInputStream = new FileInputStream(file)) {
md5 = DigestUtils.md5Hex(fileInputStream); md5 = DigestUtils.md5Hex(fileInputStream);
Long ossId = this.getIdByMd5(md5); SysOssVo byMd5 = this.getByMd5(md5);
if (ObjectUtil.isNotNull(ossId)) { if (ObjectUtil.isNotNull(byMd5)) {
return SpringUtils.getAopProxy(this).getById(ossId); return byMd5;
} }
} catch (IOException e) { } catch (IOException e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
UploadResult uploadResult = storage.uploadSuffix(file, suffix); UploadResult uploadResult = storage.uploadSuffix(file, suffix);
// 保存文件信息 // 保存文件信息
return buildResultEntity(originalfileName, md5, suffix, storage.getConfigKey(), uploadResult); return buildResultEntity(md5, suffix, storage.getConfigKey(), uploadResult);
} }
@NotNull @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(); SysOss oss = new SysOss();
oss.setUrl(uploadResult.getUrl()); oss.setUrl(uploadResult.getUrl());
oss.setFileSuffix(suffix); oss.setFileSuffix(suffix);
oss.setFileName(uploadResult.getFilename()); oss.setFileName(uploadResult.getFilename());
oss.setOriginalName(originalfileName);
oss.setService(configKey); oss.setService(configKey);
oss.setFileMd5(md5); oss.setFileMd5(md5);
baseMapper.insert(oss); baseMapper.insert(oss);
@ -292,12 +287,8 @@ public class SysOssServiceImpl implements ISysOssService, OssService {
* @return SysOssVo 对象，包含文件信息 * @return SysOssVo 对象，包含文件信息
*/ */
@Override @Override
public Long getIdByMd5(String md5) { public SysOssVo getByMd5(String md5) {
SysOss sysOss = baseMapper.selectOne(new LambdaQueryWrapper<SysOss>().eq(SysOss::getFileMd5, md5)); return baseMapper.selectVoOne(new LambdaQueryWrapper<SysOss>().eq(SysOss::getFileMd5, md5));
if (ObjectUtil.isNotNull(sysOss)) {
return sysOss.getOssId();
} else {
return null;
}
} }
} }

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

@ -1,4 +1,4 @@
package org.dromara.file.service.impl; package org.dromara.system.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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.core.utils.MapstructUtils;
import org.dromara.common.mybatis.core.page.PageQuery; import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo; import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.file.domain.SysOssTextbook; import org.dromara.system.domain.SysOssTextbook;
import org.dromara.file.domain.bo.SysOssTextbookBo; import org.dromara.system.domain.bo.SysOssTextbookBo;
import org.dromara.file.domain.vo.SysOssTextbookVo; import org.dromara.system.domain.vo.SysOssTextbookVo;
import org.dromara.file.mapper.SysOssTextbookMapper; import org.dromara.system.mapper.SysOssTextbookMapper;
import org.dromara.file.service.ISysOssTextbookService; import org.dromara.system.service.ISysOssTextbookService;
import org.dromara.system.domain.vo.SysOssVo; import org.dromara.system.domain.vo.SysOssVo;
import org.dromara.system.service.ISysOssService; import org.dromara.system.service.ISysOssService;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;

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

@ -1,4 +1,4 @@
package org.dromara.file.service.impl; package org.dromara.system.service.impl;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import org.dromara.common.core.exception.ServiceException; 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 com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.dromara.file.domain.bo.SysTeacherBo; import org.dromara.system.domain.bo.SysTeacherBo;
import org.dromara.file.domain.vo.SysTeacherVo; import org.dromara.system.domain.vo.SysTeacherVo;
import org.dromara.file.domain.SysTeacher; import org.dromara.system.domain.SysTeacher;
import org.dromara.file.mapper.SysTeacherMapper; import org.dromara.system.mapper.SysTeacherMapper;
import org.dromara.file.service.ISysTeacherService; import org.dromara.system.service.ISysTeacherService;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;

4
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogResourceMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogResourceMapper.xml
View File

@ -2,9 +2,9 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysCatalogResourceMapper"> <mapper namespace="org.dromara.system.mapper.SysCatalogResourceMapper">
<select id="selectPageUserList" resultType="org.dromara.file.domain.vo.SysCatalogResourceVo"> <select id="selectPageUserList" resultType="org.dromara.system.domain.vo.SysCatalogResourceVo">
select cr.catalog_id,cr.parent_id, cr.catalog_name, cr.order_num, count(sor.oss_id) as `resourceNum` select cr.catalog_id,cr.parent_id, cr.catalog_name, cr.order_num, count(sor.oss_id) as `resourceNum`
from sys_catalog_resource cr from sys_catalog_resource cr
left join sys_oss_resource sor on sor.catalog_id = cr.catalog_id left join sys_oss_resource sor on sor.catalog_id = cr.catalog_id

4
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysCatalogTextbookMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysCatalogTextbookMapper.xml
View File

@ -2,8 +2,8 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysCatalogTextbookMapper"> <mapper namespace="org.dromara.system.mapper.SysCatalogTextbookMapper">
<select id="selectPageUserList" resultType="org.dromara.file.domain.vo.SysCatalogTextbookVo"> <select id="selectPageUserList" resultType="org.dromara.system.domain.vo.SysCatalogTextbookVo">
select ct.catalog_id,ct.parent_id, ct.catalog_name, ct.type, ct.order_num, count(ot.oss_id) as `resourceNum` 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 from sys_catalog_textbook ct
left join sys_oss_textbook ot on ot.catalog_id = ct.catalog_id left join sys_oss_textbook ot on ot.catalog_id = ct.catalog_id

2
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeTrendMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeBannerMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysHomeTrendMapper"> <mapper namespace="org.dromara.system.mapper.SysHomeBannerMapper">
</mapper> </mapper>

2
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeBannerMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeShowMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysHomeBannerMapper"> <mapper namespace="org.dromara.system.mapper.SysHomeShowMapper">
</mapper> </mapper>

2
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssTextbookMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysHomeTrendMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysOssTextbookMapper"> <mapper namespace="org.dromara.system.mapper.SysHomeTrendMapper">
</mapper> </mapper>

2
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysOssResourceMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssResourceMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysOssResourceMapper"> <mapper namespace="org.dromara.system.mapper.SysOssResourceMapper">
</mapper> </mapper>

2
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysHomeShowMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysOssTextbookMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysHomeShowMapper"> <mapper namespace="org.dromara.system.mapper.SysOssTextbookMapper">
</mapper> </mapper>

2
ruoyi-modules/ruoyi-file/src/main/resources/mapper/file/SysTeacherMapper.xml → ruoyi-modules/ruoyi-system/src/main/resources/mapper/system/SysTeacherMapper.xml
View File

@ -2,6 +2,6 @@
<!DOCTYPE mapper <!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.dromara.file.mapper.SysTeacherMapper"> <mapper namespace="org.dromara.system.mapper.SysTeacherMapper">
</mapper> </mapper>