Browse Source

feat(resource): 新增文件分类与文件信息管理功能

- 添加文件分类实体类FileCategory及对应VO、BO类
- 实现文件分类的增删改查及树形结构查询接口
- 添加文件信息实体类FileInfo及对应VO、BO类
- 实现文件信息的增删改查、导出及下载功能
- 集成OSS服务支持文件存储与下载
- 提供按分类、类型等条件查询文件列表功能
HuRongxin 2 weeks ago
parent
commit
66990963f4
14 changed files with 1609 additions and 0 deletions
  1. 133 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/FileCategoryController.java
  2. 172 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/FileInfoController.java
  3. 82 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/FileCategory.java
  4. 149 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/FileInfo.java
  5. 72 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/FileCategoryBo.java
  6. 141 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/FileInfoBo.java
  7. 93 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/FileCategoryVo.java
  8. 177 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/FileInfoVo.java
  9. 15 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/FileCategoryMapper.java
  10. 15 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/FileInfoMapper.java
  11. 58 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/IFileCategoryService.java
  12. 76 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/IFileInfoService.java
  13. 145 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/FileCategoryServiceImpl.java
  14. 281 0
      ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/FileInfoServiceImpl.java

+ 133 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/FileCategoryController.java

@@ -0,0 +1,133 @@
+package org.dromara.resource.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.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.resource.domain.bo.FileCategoryBo;
+import org.dromara.resource.domain.vo.FileCategoryVo;
+import org.dromara.resource.service.IFileCategoryService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * 文件分类
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/file/category")
+public class FileCategoryController extends BaseController {
+
+    private final IFileCategoryService fileCategoryService;
+
+    /**
+     * 查询文件分类列表
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/list")
+    public TableDataInfo<FileCategoryVo> list(FileCategoryBo bo, PageQuery pageQuery) {
+        return fileCategoryService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询文件分类列表
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/listAll")
+    public R<List<FileCategoryVo>> listAll(FileCategoryBo bo) {
+        List<FileCategoryVo> list = fileCategoryService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 查询文件分类树结构
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/tree")
+    public R<List<FileCategoryVo>> tree() {
+        List<FileCategoryVo> tree = fileCategoryService.queryCategoryTree();
+        return R.ok(tree);
+    }
+
+    /**
+     * 根据类型查询分类列表
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/type/{type}")
+    public R<List<FileCategoryVo>> listByType(@PathVariable Integer type) {
+        List<FileCategoryVo> list = fileCategoryService.queryByType(type);
+        return R.ok(list);
+    }
+
+    /**
+     * 导出文件分类列表
+     */
+    @SaCheckPermission("file:info:export")
+    @Log(title = "文件分类", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(FileCategoryBo bo, HttpServletResponse response) {
+        List<FileCategoryVo> list = fileCategoryService.queryList(bo);
+        ExcelUtil.exportExcel(list, "文件分类", FileCategoryVo.class, response);
+    }
+
+    /**
+     * 获取文件分类详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("file:info:query")
+    @GetMapping("/{id}")
+    public R<FileCategoryVo> getInfo(@NotNull(message = "主键不能为空")
+                                     @PathVariable Long id) {
+        return R.ok(fileCategoryService.queryById(id));
+    }
+
+    /**
+     * 新增文件分类
+     */
+    @SaCheckPermission("file:info:add")
+    @Log(title = "文件分类", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody FileCategoryBo bo) {
+        return toAjax(fileCategoryService.insertByBo(bo));
+    }
+
+    /**
+     * 修改文件分类
+     */
+    @SaCheckPermission("file:info:edit")
+    @Log(title = "文件分类", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FileCategoryBo bo) {
+        return toAjax(fileCategoryService.updateByBo(bo));
+    }
+
+    /**
+     * 删除文件分类
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("file:info:remove")
+    @Log(title = "文件分类", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(fileCategoryService.deleteWithValidByIds(List.of(ids), true));
+    }
+}

+ 172 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/FileInfoController.java

@@ -0,0 +1,172 @@
+package org.dromara.resource.controller;
+
+import cn.dev33.satoken.annotation.SaCheckPermission;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotEmpty;
+import jakarta.validation.constraints.NotNull;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.domain.R;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.excel.utils.ExcelUtil;
+import org.dromara.common.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.resource.domain.bo.FileInfoBo;
+import org.dromara.resource.domain.vo.FileInfoVo;
+import org.dromara.resource.service.IFileInfoService;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 文件信息
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Validated
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/file/info")
+public class FileInfoController extends BaseController {
+
+    private final IFileInfoService fileInfoService;
+
+    /**
+     * 查询文件信息列表
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/list")
+    public TableDataInfo<FileInfoVo> list(FileInfoBo bo, PageQuery pageQuery) {
+        // 添加调试日志
+        System.out.println("FileInfoController.list - bo.getCategoryType(): " + bo.getCategoryType());
+        System.out.println("FileInfoController.list - bo.getCategoryId(): " + bo.getCategoryId());
+        return fileInfoService.queryPageList(bo, pageQuery);
+    }
+
+    /**
+     * 查询文件信息列表
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/listAll")
+    public R<List<FileInfoVo>> listAll(FileInfoBo bo) {
+        List<FileInfoVo> list = fileInfoService.queryList(bo);
+        return R.ok(list);
+    }
+
+    /**
+     * 根据分类ID查询文件列表
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/category/{categoryId}")
+    public R<List<FileInfoVo>> listByCategoryId(@PathVariable Long categoryId) {
+        List<FileInfoVo> list = fileInfoService.queryByCategoryId(categoryId);
+        return R.ok(list);
+    }
+
+    /**
+     * 根据文件类型查询文件列表
+     */
+    @SaCheckPermission("file:info:list")
+    @GetMapping("/type/{type}")
+    public R<List<FileInfoVo>> listByType(@PathVariable String type) {
+        List<FileInfoVo> list = fileInfoService.queryByType(type);
+        return R.ok(list);
+    }
+
+    /**
+     * 导出文件信息列表
+     */
+    @SaCheckPermission("file:info:export")
+    @Log(title = "文件信息", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(FileInfoBo bo, HttpServletResponse response) {
+        List<FileInfoVo> list = fileInfoService.queryList(bo);
+        ExcelUtil.exportExcel(list, "文件信息", FileInfoVo.class, response);
+    }
+
+    /**
+     * 获取文件信息详细信息
+     *
+     * @param id 主键
+     */
+    @SaCheckPermission("file:info:query")
+    @GetMapping("/{id}")
+    public R<FileInfoVo> getInfo(@NotNull(message = "主键不能为空")
+                                 @PathVariable Long id) {
+        return R.ok(fileInfoService.queryById(id));
+    }
+
+    /**
+     * 新增文件信息
+     */
+    @SaCheckPermission("file:info:add")
+    @Log(title = "文件信息", businessType = BusinessType.INSERT)
+    @PostMapping()
+    public R<Void> add(@Validated(AddGroup.class) @RequestBody FileInfoBo bo) {
+        return toAjax(fileInfoService.insertByBo(bo));
+    }
+
+    /**
+     * 修改文件信息
+     */
+    @SaCheckPermission("file:info:edit")
+    @Log(title = "文件信息", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public R<Void> edit(@Validated(EditGroup.class) @RequestBody FileInfoBo bo) {
+        return toAjax(fileInfoService.updateByBo(bo));
+    }
+
+    /**
+     * 删除文件信息
+     *
+     * @param ids 主键串
+     */
+    @SaCheckPermission("file:info:remove")
+    @Log(title = "文件信息", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{ids}")
+    public R<Void> remove(@NotEmpty(message = "主键不能为空")
+                          @PathVariable Long[] ids) {
+        return toAjax(fileInfoService.deleteWithValidByIds(List.of(ids), true));
+    }
+
+    /**
+     * 更新文件下载次数
+     */
+    @SaCheckPermission("file:info:update")
+    @Log(title = "文件信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/download/{id}")
+    public R<Void> updateDownloadCount(@NotNull(message = "主键不能为空")
+                                       @PathVariable Long id) {
+        return toAjax(fileInfoService.updateDownloadCount(id));
+    }
+
+    /**
+     * 更新文件查看次数
+     */
+    @SaCheckPermission("file:info:update")
+    @Log(title = "文件信息", businessType = BusinessType.UPDATE)
+    @PutMapping("/view/{id}")
+    public R<Void> updateViewCount(@NotNull(message = "主键不能为空")
+                                   @PathVariable Long id) {
+        return toAjax(fileInfoService.updateViewCount(id));
+    }
+
+    /**
+     * 下载文件
+     *
+     * @param id 文件ID
+     */
+    @SaCheckPermission("file:info:download")
+    @GetMapping("/download/{id}")
+    public void downloadFile(@NotNull(message = "文件ID不能为空")
+                             @PathVariable Long id,
+                             HttpServletResponse response) throws IOException {
+        fileInfoService.downloadFile(id, response);
+    }
+}

+ 82 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/FileCategory.java

@@ -0,0 +1,82 @@
+package org.dromara.resource.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+import org.dromara.resource.domain.vo.FileCategoryVo;
+
+import java.io.Serial;
+
+/**
+ * 文件分类对象 file_category
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_file_category")
+@AutoMapper(target = FileCategoryVo.class)
+public class FileCategory extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    private String name;
+
+    /**
+     * 分类编码
+     */
+    private String code;
+
+    /**
+     * 父分类ID(0表示顶级分类)
+     */
+    private Long parentId;
+
+    /**
+     * 分类类型(1图片 2视频 3音频 4文档 5其他)
+     */
+    private Integer type;
+
+    /**
+     * 排序号
+     */
+    private Integer sort;
+
+    /**
+     * 分类图标
+     */
+    private String icon;
+
+    /**
+     * 分类描述
+     */
+    private String description;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    private Integer status;
+
+    /**
+     * 删除标志(0代表存在 2代表删除)
+     */
+    @TableLogic
+    private Long delFlag;
+
+}

+ 149 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/FileInfo.java

@@ -0,0 +1,149 @@
+package org.dromara.resource.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.dromara.common.tenant.core.TenantEntity;
+
+import java.io.Serial;
+
+/**
+ * 文件信息对象 file_info
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("sys_file_info")
+public class FileInfo extends TenantEntity {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 文件名称
+     */
+    private String name;
+
+    /**
+     * 原始文件名
+     */
+    private String originalName;
+
+    /**
+     * 文件路径(OSS路径)
+     */
+    private String path;
+
+    /**
+     * 文件访问URL
+     */
+    private String url;
+
+    /**
+     * 文件大小(字节)
+     */
+    private Long size;
+
+    /**
+     * 文件类型(MIME类型)
+     */
+    private String type;
+
+    /**
+     * 文件扩展名
+     */
+    private String extension;
+
+    /**
+     * 文件分类ID
+     */
+    private Long categoryId;
+
+    /**
+     * 文件主分类
+     */
+    private Long categoryType;
+
+    /**
+     * 文件分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 文件哈希值(MD5)
+     */
+    private String hash;
+
+    /**
+     * 图片/视频宽度
+     */
+    private Integer width;
+
+    /**
+     * 图片/视频高度
+     */
+    private Integer height;
+
+    /**
+     * 视频/音频时长(秒)
+     */
+    private Integer duration;
+
+    /**
+     * OSS存储桶名称
+     */
+    private String ossBucket;
+
+    /**
+     * OSS对象键
+     */
+    private String ossKey;
+
+    /**
+     * OSS文件唯一标识符
+     */
+    private String ossId;
+
+    /**
+     * 上传状态(0上传中 1上传完成 2上传失败)
+     */
+    private Integer uploadStatus;
+
+    /**
+     * 下载次数
+     */
+    private Integer downloadCount;
+
+    /**
+     * 查看次数
+     */
+    private Integer viewCount;
+
+    /**
+     * 是否公开(0私有 1公开)
+     */
+    private Integer isPublic;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    private Integer status;
+
+    /**
+     * 删除标志(0代表存在 2代表删除)
+     */
+    @TableLogic
+    private Long delFlag;
+
+}

+ 72 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/FileCategoryBo.java

@@ -0,0 +1,72 @@
+package org.dromara.resource.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
+import lombok.Data;
+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.resource.domain.FileCategory;
+
+/**
+ * 文件分类业务对象 file_category
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FileCategory.class, reverseConvertGenerate = false)
+public class FileCategoryBo extends BaseEntity {
+
+    /**
+     * 分类ID
+     */
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    @NotBlank(message = "分类名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 分类编码
+     */
+    @NotBlank(message = "分类编码不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String code;
+
+    /**
+     * 父分类ID(0表示顶级分类)
+     */
+    private Long parentId;
+
+    /**
+     * 分类类型(1图片 2视频 3音频 4文档 5其他)
+     */
+    @NotNull(message = "分类类型不能为空", groups = { AddGroup.class, EditGroup.class })
+    private Integer type;
+
+    /**
+     * 排序号
+     */
+    private Integer sort;
+
+    /**
+     * 分类图标
+     */
+    private String icon;
+
+    /**
+     * 分类描述
+     */
+    private String description;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    private Integer status;
+
+}

+ 141 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/bo/FileInfoBo.java

@@ -0,0 +1,141 @@
+package org.dromara.resource.domain.bo;
+
+import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import lombok.Data;
+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.resource.domain.FileInfo;
+
+/**
+ * 文件信息业务对象 file_info
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@AutoMapper(target = FileInfo.class)
+public class FileInfoBo extends BaseEntity {
+
+    /**
+     * 文件ID
+     */
+    private Long id;
+
+    /**
+     * 文件名称
+     */
+    @NotBlank(message = "文件名称不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String name;
+
+    /**
+     * 原始文件名
+     */
+    @NotBlank(message = "原始文件名不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String originalName;
+
+    /**
+     * 文件路径(OSS路径)
+     */
+    @NotBlank(message = "文件路径不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String path;
+
+    /**
+     * 文件访问URL
+     */
+    private String url;
+
+    /**
+     * 文件大小(字节)
+     */
+    private Long size;
+
+    /**
+     * 文件类型(MIME类型)
+     */
+    private String type;
+
+    /**
+     * 文件扩展名
+     */
+    private String extension;
+
+    /**
+     * 文件分类ID
+     */
+    private Long categoryId;
+
+    /**
+     * 文件主分类
+     */
+    private Long categoryType;
+
+    /**
+     * 文件分类名称
+     */
+    private String categoryName;
+
+    /**
+     * 文件哈希值(MD5)
+     */
+    private String hash;
+
+    /**
+     * 图片/视频宽度
+     */
+    private Integer width;
+
+    /**
+     * 图片/视频高度
+     */
+    private Integer height;
+
+    /**
+     * 视频/音频时长(秒)
+     */
+    private Integer duration;
+
+    /**
+     * OSS存储桶名称
+     */
+    private String ossBucket;
+
+    /**
+     * OSS对象键
+     */
+    private String ossKey;
+
+    /**
+     * OSS文件唯一标识符
+     */
+    private String ossId;
+
+    /**
+     * 上传状态(0上传中 1上传完成 2上传失败)
+     */
+    private Integer uploadStatus;
+
+    /**
+     * 下载次数
+     */
+    private Integer downloadCount;
+
+    /**
+     * 查看次数
+     */
+    private Integer viewCount;
+
+    /**
+     * 是否公开(0私有 1公开)
+     */
+    private Integer isPublic;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    private Integer status;
+
+}

+ 93 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/FileCategoryVo.java

@@ -0,0 +1,93 @@
+package org.dromara.resource.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.resource.domain.FileCategory;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * 文件分类视图对象 file_category
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = FileCategory.class)
+public class FileCategoryVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 分类ID
+     */
+    @ExcelProperty(value = "分类ID")
+    private Long id;
+
+    /**
+     * 分类名称
+     */
+    @ExcelProperty(value = "分类名称")
+    private String name;
+
+    /**
+     * 分类编码
+     */
+    @ExcelProperty(value = "分类编码")
+    private String code;
+
+    /**
+     * 父分类ID(0表示顶级分类)
+     */
+    @ExcelProperty(value = "父分类ID")
+    private Long parentId;
+
+    /**
+     * 分类类型(1图片 2视频 3音频 4文档 5其他)
+     */
+    @ExcelProperty(value = "分类类型")
+    private Integer type;
+
+    /**
+     * 排序号
+     */
+    @ExcelProperty(value = "排序号")
+    private Integer sort;
+
+    /**
+     * 分类图标
+     */
+    @ExcelProperty(value = "分类图标")
+    private String icon;
+
+    /**
+     * 分类描述
+     */
+    @ExcelProperty(value = "分类描述")
+    private String description;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+    /**
+     * 子分类列表
+     */
+    private List<FileCategoryVo> children;
+
+}

+ 177 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/domain/vo/FileInfoVo.java

@@ -0,0 +1,177 @@
+package org.dromara.resource.domain.vo;
+
+import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
+import cn.idev.excel.annotation.ExcelProperty;
+import io.github.linpeilie.annotations.AutoMapper;
+import lombok.Data;
+import org.dromara.resource.domain.FileInfo;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 文件信息视图对象 file_info
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@Data
+@ExcelIgnoreUnannotated
+@AutoMapper(target = FileInfo.class)
+public class FileInfoVo implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文件ID
+     */
+    @ExcelProperty(value = "文件ID")
+    private Long id;
+
+    /**
+     * 文件名称
+     */
+    @ExcelProperty(value = "文件名称")
+    private String name;
+
+    /**
+     * 原始文件名
+     */
+    @ExcelProperty(value = "原始文件名")
+    private String originalName;
+
+    /**
+     * 文件路径(OSS路径)
+     */
+    @ExcelProperty(value = "文件路径")
+    private String path;
+
+    /**
+     * 文件访问URL
+     */
+    @ExcelProperty(value = "文件访问URL")
+    private String url;
+
+    /**
+     * 文件大小(字节)
+     */
+    @ExcelProperty(value = "文件大小")
+    private Long size;
+
+    /**
+     * 文件类型(MIME类型)
+     */
+    @ExcelProperty(value = "文件类型")
+    private String type;
+
+    /**
+     * 文件扩展名
+     */
+    @ExcelProperty(value = "文件扩展名")
+    private String extension;
+
+    /**
+     * 文件分类ID
+     */
+    @ExcelProperty(value = "文件分类ID")
+    private Long categoryId;
+
+    /**
+     * 文件主分类
+     */
+    @ExcelProperty(value = "文件主分类")
+    private Long categoryType;
+
+    /**
+     * 文件分类名称
+     */
+    @ExcelProperty(value = "文件主分类名称")
+    private Long categoryTypeName;
+
+    /**
+     * 文件分类名称
+     */
+    @ExcelProperty(value = "文件分类名称")
+    private String categoryName;
+
+    /**
+     * 文件哈希值(MD5)
+     */
+    @ExcelProperty(value = "文件哈希值")
+    private String hash;
+
+    /**
+     * 图片/视频宽度
+     */
+    @ExcelProperty(value = "宽度")
+    private Integer width;
+
+    /**
+     * 图片/视频高度
+     */
+    @ExcelProperty(value = "高度")
+    private Integer height;
+
+    /**
+     * 视频/音频时长(秒)
+     */
+    @ExcelProperty(value = "时长")
+    private Integer duration;
+
+    /**
+     * OSS存储桶名称
+     */
+    @ExcelProperty(value = "OSS存储桶")
+    private String ossBucket;
+
+    /**
+     * OSS对象键
+     */
+    @ExcelProperty(value = "OSS对象键")
+    private String ossKey;
+
+    /**
+     * OSS文件唯一标识符
+     */
+    @ExcelProperty(value = "OSS文件ID")
+    private String ossId;
+
+    /**
+     * 上传状态(0上传中 1上传完成 2上传失败)
+     */
+    @ExcelProperty(value = "上传状态")
+    private Integer uploadStatus;
+
+    /**
+     * 下载次数
+     */
+    @ExcelProperty(value = "下载次数")
+    private Integer downloadCount;
+
+    /**
+     * 查看次数
+     */
+    @ExcelProperty(value = "查看次数")
+    private Integer viewCount;
+
+    /**
+     * 是否公开(0私有 1公开)
+     */
+    @ExcelProperty(value = "是否公开")
+    private Integer isPublic;
+
+    /**
+     * 状态(0正常 1停用)
+     */
+    @ExcelProperty(value = "状态")
+    private Integer status;
+
+    /**
+     * 创建时间
+     */
+    @ExcelProperty(value = "创建时间")
+    private Date createTime;
+
+}

+ 15 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/FileCategoryMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.resource.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.resource.domain.FileCategory;
+import org.dromara.resource.domain.vo.FileCategoryVo;
+
+/**
+ * 文件分类Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+public interface FileCategoryMapper extends BaseMapperPlus<FileCategory, FileCategoryVo> {
+
+}

+ 15 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/mapper/FileInfoMapper.java

@@ -0,0 +1,15 @@
+package org.dromara.resource.mapper;
+
+import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
+import org.dromara.resource.domain.FileInfo;
+import org.dromara.resource.domain.vo.FileInfoVo;
+
+/**
+ * 文件信息Mapper接口
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+public interface FileInfoMapper extends BaseMapperPlus<FileInfo, FileInfoVo> {
+
+}

+ 58 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/IFileCategoryService.java

@@ -0,0 +1,58 @@
+package org.dromara.resource.service;
+
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.resource.domain.bo.FileCategoryBo;
+import org.dromara.resource.domain.vo.FileCategoryVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 文件分类Service接口
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+public interface IFileCategoryService {
+
+    /**
+     * 查询文件分类
+     */
+    FileCategoryVo queryById(Long id);
+
+    /**
+     * 查询文件分类列表
+     */
+    TableDataInfo<FileCategoryVo> queryPageList(FileCategoryBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询文件分类列表
+     */
+    List<FileCategoryVo> queryList(FileCategoryBo bo);
+
+    /**
+     * 新增文件分类
+     */
+    Boolean insertByBo(FileCategoryBo bo);
+
+    /**
+     * 修改文件分类
+     */
+    Boolean updateByBo(FileCategoryBo bo);
+
+    /**
+     * 校验并批量删除文件分类信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 查询分类树结构
+     */
+    List<FileCategoryVo> queryCategoryTree();
+
+    /**
+     * 根据类型查询分类列表
+     */
+    List<FileCategoryVo> queryByType(Integer type);
+}

+ 76 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/IFileInfoService.java

@@ -0,0 +1,76 @@
+package org.dromara.resource.service;
+
+import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.resource.domain.bo.FileInfoBo;
+import org.dromara.resource.domain.vo.FileInfoVo;
+
+import java.util.Collection;
+import java.util.List;
+
+/**
+ * 文件信息Service接口
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+public interface IFileInfoService {
+
+    /**
+     * 查询文件信息
+     */
+    FileInfoVo queryById(Long id);
+
+    List<FileInfoVo> queryByIds(Collection<Long> ids);
+
+    /**
+     * 查询文件信息列表
+     */
+    TableDataInfo<FileInfoVo> queryPageList(FileInfoBo bo, PageQuery pageQuery);
+
+    /**
+     * 查询文件信息列表
+     */
+    List<FileInfoVo> queryList(FileInfoBo bo);
+
+    /**
+     * 新增文件信息
+     */
+    Boolean insertByBo(FileInfoBo bo);
+
+    /**
+     * 修改文件信息
+     */
+    Boolean updateByBo(FileInfoBo bo);
+
+    /**
+     * 校验并批量删除文件信息信息
+     */
+    Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid);
+
+    /**
+     * 根据分类ID查询文件列表
+     */
+    List<FileInfoVo> queryByCategoryId(Long categoryId);
+
+    /**
+     * 根据文件类型查询文件列表
+     */
+    List<FileInfoVo> queryByType(String type);
+
+    /**
+     * 更新文件下载次数
+     */
+    Boolean updateDownloadCount(Long id);
+
+    /**
+     * 更新文件查看次数
+     */
+    Boolean updateViewCount(Long id);
+
+    /**
+     * 下载文件
+     */
+    void downloadFile(Long id, HttpServletResponse response) throws java.io.IOException;
+}

+ 145 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/FileCategoryServiceImpl.java

@@ -0,0 +1,145 @@
+package org.dromara.resource.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import lombok.RequiredArgsConstructor;
+import org.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.resource.domain.FileCategory;
+import org.dromara.resource.domain.bo.FileCategoryBo;
+import org.dromara.resource.domain.vo.FileCategoryVo;
+import org.dromara.resource.mapper.FileCategoryMapper;
+import org.dromara.resource.service.IFileCategoryService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件分类Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@RequiredArgsConstructor
+@Service
+public class FileCategoryServiceImpl implements IFileCategoryService {
+
+    private final FileCategoryMapper baseMapper;
+
+    /**
+     * 查询文件分类
+     */
+    @Override
+    public FileCategoryVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    /**
+     * 查询文件分类列表
+     */
+    @Override
+    public TableDataInfo<FileCategoryVo> queryPageList(FileCategoryBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<FileCategory> lqw = buildQueryWrapper(bo);
+        Page<FileCategoryVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询文件分类列表
+     */
+    @Override
+    public List<FileCategoryVo> queryList(FileCategoryBo bo) {
+        LambdaQueryWrapper<FileCategory> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<FileCategory> buildQueryWrapper(FileCategoryBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<FileCategory> lqw = Wrappers.lambdaQuery();
+        lqw.like(StringUtils.isNotBlank(bo.getName()), FileCategory::getName, bo.getName());
+        lqw.eq(StringUtils.isNotBlank(bo.getCode()), FileCategory::getCode, bo.getCode());
+        lqw.eq(bo.getParentId() != null, FileCategory::getParentId, bo.getParentId());
+        lqw.eq(bo.getType() != null, FileCategory::getType, bo.getType());
+        lqw.eq(bo.getStatus() != null, FileCategory::getStatus, bo.getStatus());
+        lqw.orderByAsc(FileCategory::getSort);
+        return lqw;
+    }
+
+    /**
+     * 新增文件分类
+     */
+    @Override
+    public Boolean insertByBo(FileCategoryBo bo) {
+        FileCategory add = MapstructUtils.convert(bo, FileCategory.class);
+        validEntityBeforeSave(add);
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改文件分类
+     */
+    @Override
+    public Boolean updateByBo(FileCategoryBo bo) {
+        FileCategory update = MapstructUtils.convert(bo, FileCategory.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(FileCategory entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除文件分类
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 查询分类树结构
+     */
+    @Override
+    public List<FileCategoryVo> queryCategoryTree() {
+        LambdaQueryWrapper<FileCategory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(FileCategory::getStatus, 0);
+        lqw.orderByAsc(FileCategory::getSort);
+        List<FileCategoryVo> list = baseMapper.selectVoList(lqw);
+        return buildTree(list, 0L);
+    }
+
+    /**
+     * 根据类型查询分类列表
+     */
+    @Override
+    public List<FileCategoryVo> queryByType(Integer type) {
+        LambdaQueryWrapper<FileCategory> lqw = Wrappers.lambdaQuery();
+        lqw.eq(FileCategory::getType, type);
+        lqw.eq(FileCategory::getStatus, 0);
+        lqw.orderByAsc(FileCategory::getSort);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 构建树形结构
+     */
+    private List<FileCategoryVo> buildTree(List<FileCategoryVo> list, Long parentId) {
+        return list.stream().filter(item -> parentId.equals(item.getParentId())).peek(item -> item.setChildren(buildTree(list, item.getId()))).toList();
+    }
+}

+ 281 - 0
ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/service/impl/FileInfoServiceImpl.java

@@ -0,0 +1,281 @@
+package org.dromara.resource.service.impl;
+
+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.dromara.common.core.utils.MapstructUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
+import org.dromara.common.mybatis.core.page.TableDataInfo;
+import org.dromara.resource.domain.FileInfo;
+import org.dromara.resource.domain.bo.FileInfoBo;
+import org.dromara.resource.domain.vo.FileInfoVo;
+import org.dromara.resource.mapper.FileInfoMapper;
+import org.dromara.resource.service.IFileInfoService;
+import org.dromara.resource.service.ISysOssService;
+import org.springframework.stereotype.Service;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 文件信息Service业务层处理
+ *
+ * @author Lion Li
+ * @date 2024-01-01
+ */
+@RequiredArgsConstructor
+@Service
+public class FileInfoServiceImpl implements IFileInfoService {
+
+    private final FileInfoMapper baseMapper;
+
+    private final ISysOssService  sysOssService;
+
+    /**
+     * 查询文件信息
+     */
+    @Override
+    public FileInfoVo queryById(Long id) {
+        return baseMapper.selectVoById(id);
+    }
+
+    @Override
+    public List<FileInfoVo> queryByIds(Collection<Long> ids) {
+        return baseMapper.selectVoByIds(ids);
+    }
+
+    /**
+     * 查询文件信息列表
+     */
+    @Override
+    public TableDataInfo<FileInfoVo> queryPageList(FileInfoBo bo, PageQuery pageQuery) {
+        LambdaQueryWrapper<FileInfo> lqw = buildQueryWrapper(bo);
+        // 指定租户ID为000000,以便查询所有数据
+//        lqw.apply("tenant_id = '000000'");
+        Page<FileInfoVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
+        return TableDataInfo.build(result);
+    }
+
+    /**
+     * 查询文件信息列表
+     */
+    @Override
+    public List<FileInfoVo> queryList(FileInfoBo bo) {
+        LambdaQueryWrapper<FileInfo> lqw = buildQueryWrapper(bo);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    private LambdaQueryWrapper<FileInfo> buildQueryWrapper(FileInfoBo bo) {
+        Map<String, Object> params = bo.getParams();
+        LambdaQueryWrapper<FileInfo> lqw = Wrappers.lambdaQuery();
+
+        // 添加调试日志
+        System.out.println("buildQueryWrapper - bo.getCategoryType(): " + bo.getCategoryType());
+        System.out.println("buildQueryWrapper - bo.getCategoryId(): " + bo.getCategoryId());
+
+        lqw.like(StringUtils.isNotBlank(bo.getName()), FileInfo::getName, bo.getName());
+        lqw.like(StringUtils.isNotBlank(bo.getOriginalName()), FileInfo::getOriginalName, bo.getOriginalName());
+        lqw.like(StringUtils.isNotBlank(bo.getPath()), FileInfo::getPath, bo.getPath());
+        lqw.eq(bo.getCategoryId() != null, FileInfo::getCategoryId, bo.getCategoryId());
+        lqw.eq(bo.getCategoryType() != null, FileInfo::getCategoryType, bo.getCategoryType());
+        // 支持类型前缀匹配
+        if (StringUtils.isNotBlank(bo.getType())) {
+            if (bo.getType().endsWith("/")) {
+                // 如果是前缀匹配(如 "image/" 或 "video/")
+                lqw.like(FileInfo::getType, bo.getType());
+            } else {
+                // 如果是精确匹配
+                lqw.eq(FileInfo::getType, bo.getType());
+            }
+        }
+        lqw.eq(bo.getUploadStatus() != null, FileInfo::getUploadStatus, bo.getUploadStatus());
+        lqw.eq(bo.getIsPublic() != null, FileInfo::getIsPublic, bo.getIsPublic());
+        lqw.eq(bo.getStatus() != null, FileInfo::getStatus, bo.getStatus());
+        // 确保只查询未删除的记录
+        lqw.eq(FileInfo::getDelFlag, 0);
+        lqw.orderByDesc(FileInfo::getId);
+        return lqw;
+    }
+
+    /**
+     * 新增文件信息
+     */
+    @Override
+    public Boolean insertByBo(FileInfoBo bo) {
+        FileInfo add = MapstructUtils.convert(bo, FileInfo.class);
+        validEntityBeforeSave(add);
+
+        // 设置租户ID - 使用字段直接赋值
+        try {
+            java.lang.reflect.Field tenantIdField = add.getClass().getSuperclass().getDeclaredField("tenantId");
+            tenantIdField.setAccessible(true);
+//            tenantIdField.set(add, "000000");
+        } catch (Exception e) {
+            // 忽略设置租户ID的错误
+        }
+
+        // 设置默认值
+        if (add.getDownloadCount() == null) {
+            add.setDownloadCount(0);
+        }
+        if (add.getViewCount() == null) {
+            add.setViewCount(0);
+        }
+        if (add.getUploadStatus() == null) {
+            add.setUploadStatus(1);
+        }
+        if (add.getIsPublic() == null) {
+            add.setIsPublic(1);
+        }
+        if (add.getStatus() == null) {
+            add.setStatus(0);
+        }
+        if (add.getDelFlag() == null) {
+            add.setDelFlag(0L);
+        }
+
+        boolean flag = baseMapper.insert(add) > 0;
+        if (flag) {
+            bo.setId(add.getId());
+        }
+        return flag;
+    }
+
+    /**
+     * 修改文件信息
+     */
+    @Override
+    public Boolean updateByBo(FileInfoBo bo) {
+        FileInfo update = MapstructUtils.convert(bo, FileInfo.class);
+        validEntityBeforeSave(update);
+        return baseMapper.updateById(update) > 0;
+    }
+
+    /**
+     * 保存前的数据校验
+     */
+    private void validEntityBeforeSave(FileInfo entity) {
+        // TODO 做一些数据校验,如唯一约束
+    }
+
+    /**
+     * 批量删除文件信息
+     */
+    @Override
+    public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
+        if (isValid) {
+            // TODO 做一些业务上的校验,判断是否需要校验
+        }
+        return baseMapper.deleteBatchIds(ids) > 0;
+    }
+
+    /**
+     * 根据分类ID查询文件列表
+     */
+    @Override
+    public List<FileInfoVo> queryByCategoryId(Long categoryId) {
+        LambdaQueryWrapper<FileInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(FileInfo::getCategoryId, categoryId);
+        lqw.eq(FileInfo::getStatus, 0);
+        lqw.orderByDesc(FileInfo::getId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 根据文件类型查询文件列表
+     */
+    @Override
+    public List<FileInfoVo> queryByType(String type) {
+        LambdaQueryWrapper<FileInfo> lqw = Wrappers.lambdaQuery();
+        lqw.eq(FileInfo::getType, type);
+        lqw.eq(FileInfo::getStatus, 0);
+        lqw.orderByDesc(FileInfo::getId);
+        return baseMapper.selectVoList(lqw);
+    }
+
+    /**
+     * 更新文件下载次数
+     */
+    @Override
+    public Boolean updateDownloadCount(Long id) {
+        FileInfo fileInfo = baseMapper.selectById(id);
+        if (fileInfo != null) {
+            fileInfo.setDownloadCount(fileInfo.getDownloadCount() + 1);
+            return baseMapper.updateById(fileInfo) > 0;
+        }
+        return false;
+    }
+
+    /**
+     * 更新文件查看次数
+     */
+    @Override
+    public Boolean updateViewCount(Long id) {
+        FileInfo fileInfo = baseMapper.selectById(id);
+        if (fileInfo != null) {
+            fileInfo.setViewCount(fileInfo.getViewCount() + 1);
+            return baseMapper.updateById(fileInfo) > 0;
+        }
+        return false;
+    }
+
+    /**
+     * 下载文件
+     */
+    @Override
+    public void downloadFile(Long id, HttpServletResponse response) throws java.io.IOException {
+        try {
+            FileInfo fileInfo = baseMapper.selectById(id);
+            if (fileInfo == null&& fileInfo.getOssId() == null) {
+                throw new RuntimeException("文件不存在,ID: " + id);
+            }
+            sysOssService.download(Long.valueOf(fileInfo.getOssId()), response);
+//
+//            System.out.println("开始下载文件,ID: " + id + ", 名称: " + fileInfo.getName() + ", URL: " + fileInfo.getUrl());
+//
+//            // 如果文件有URL,直接返回文件内容
+//            if (fileInfo.getUrl() != null && !fileInfo.getUrl().isEmpty()) {
+//                System.out.println("文件有URL,准备下载: " + fileInfo.getUrl());
+//
+//                // 设置下载响应头
+//                response.setHeader("Content-Disposition", "attachment; filename=\"" + fileInfo.getName() + "\"");
+//                response.setContentType(fileInfo.getType() + "; charset=UTF-8");
+//                response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
+//                response.setHeader("Pragma", "no-cache");
+//                response.setHeader("Expires", "0");
+//
+//                // 简化方案:直接重定向到OSS文件
+//                System.out.println("准备重定向到OSS文件: " + fileInfo.getUrl());
+//                response.sendRedirect(fileInfo.getUrl());
+//                System.out.println("重定向成功");
+//                return;
+//            }
+//
+//            // 如果没有URL,尝试从OSS下载
+//            if (fileInfo.getOssId() != null && !fileInfo.getOssId().isEmpty()) {
+//                System.out.println("文件没有URL,但有ossId: " + fileInfo.getOssId());
+//                try {
+//                    // 调用系统OSS服务下载
+//                    org.dromara.common.core.service.OssService ossService =
+//                        org.dromara.common.core.utils.SpringUtils.getBean(org.dromara.common.core.service.OssService.class);
+//                    if (ossService != null) {
+//                        // 这里需要根据实际情况调整,可能需要先查询sys_oss表获取文件信息
+//                        throw new RuntimeException("暂不支持通过ossId下载,请使用文件URL");
+//                    }
+//                } catch (Exception e) {
+//                    throw new RuntimeException("OSS服务不可用: " + e.getMessage());
+//                }
+//            }
+//
+//            throw new RuntimeException("无法下载文件,文件URL和OSS信息都不存在");
+        } catch (Exception e) {
+            System.err.println("下载文件时发生错误: " + e.getMessage());
+            e.printStackTrace();
+            throw e;
+        }
+    }
+}