业务接口和业务接口实现类存储包路径优化

hb-admin/src/main/java/com/ruoyi/web/controller/system/SysRoleController.java

@@ -6,8 +6,8 @@ import javax.servlet.http.HttpServletResponse;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.ruoyi.common.utils.lang.LangUnit;
-import com.ruoyi.file.api.ISysRoleUserFileService;
+import com.ruoyi.file.service.ISysRoleUserFileService;
-import com.ruoyi.file.api.IUserFileService;
+import com.ruoyi.file.service.IUserFileService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

hb-file/src/main/java/com/ruoyi/file/component/AsyncTaskComp.java

@@ -2,8 +2,8 @@ package com.ruoyi.file.component;
 
 import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.ruoyi.file.api.IFiletransferService;
+import com.ruoyi.file.service.IFiletransferService;
-import com.ruoyi.file.api.IRecoveryFileService;
+import com.ruoyi.file.service.IRecoveryFileService;
 import com.ruoyi.file.domain.FileBean;
 import com.ruoyi.file.domain.UserFile;
 import com.ruoyi.file.io.QiwenFile;

hb-file/src/main/java/com/ruoyi/file/component/FileDealComp.java

@@ -17,8 +17,8 @@ import com.qiwenshare.ufop.operation.write.domain.WriteFile;
 import com.qiwenshare.ufop.util.UFOPUtils;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IShareFileService;
+import com.ruoyi.file.service.IShareFileService;
-import com.ruoyi.file.api.IShareService;
+import com.ruoyi.file.service.IShareService;
 import com.ruoyi.file.config.es.FileSearch;
 import com.ruoyi.file.domain.*;
 import com.ruoyi.file.io.QiwenFile;

hb-file/src/main/java/com/ruoyi/file/controller/CommonFileController.java

@@ -7,9 +7,9 @@ import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.ICommonFileService;
+import com.ruoyi.file.service.ICommonFileService;
-import com.ruoyi.file.api.IFilePermissionService;
+import com.ruoyi.file.service.IFilePermissionService;
-import com.ruoyi.file.api.IUserFileService;
+import com.ruoyi.file.service.IUserFileService;
 import com.ruoyi.file.domain.CommonFile;
 import com.ruoyi.file.domain.FilePermission;
 import com.ruoyi.file.domain.UserFile;

hb-file/src/main/java/com/ruoyi/file/controller/FileController.java

@@ -20,8 +20,8 @@ import com.qiwenshare.ufop.operation.copy.Copier;
 import com.qiwenshare.ufop.operation.copy.domain.CopyFile;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IFileService;
+import com.ruoyi.file.service.IFileService;
-import com.ruoyi.file.api.IUserFileService;
+import com.ruoyi.file.service.IUserFileService;
 import com.ruoyi.file.component.AsyncTaskComp;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.config.es.FileSearch;

hb-file/src/main/java/com/ruoyi/file/controller/FiletransferController.java

@@ -8,11 +8,10 @@ import com.qiwenshare.ufop.operation.download.Downloader;
 import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
 import com.qiwenshare.ufop.operation.download.domain.Range;
 import com.qiwenshare.ufop.util.UFOPUtils;
+import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IFileService;
+import com.ruoyi.file.service.*;
-import com.ruoyi.file.api.IFiletransferService;
-import com.ruoyi.file.api.IUserFileService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.FileBean;
 import com.ruoyi.file.domain.StorageBean;
@@ -22,13 +21,15 @@ import com.ruoyi.file.dto.file.DownloadFileDTO;
 import com.ruoyi.file.dto.file.PreviewDTO;
 import com.ruoyi.file.dto.file.UploadFileDTO;
 import com.ruoyi.file.io.QiwenFile;
-import com.ruoyi.file.service.StorageService;
 import com.ruoyi.file.vo.file.UploadFileVo;
+import com.ruoyi.framework.manager.AsyncManager;
+import com.ruoyi.framework.manager.factory.AsyncFactory;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
@@ -40,6 +41,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -60,10 +62,12 @@ public class FiletransferController {
     @Resource
     FileDealComp fileDealComp;
     @Resource
-    StorageService storageService;
+    IStorageService storageService;
     @Resource
     UFOPFactory ufopFactory;
 
+    @Autowired
+    private IDownloadRecordService downloadRecordService;
 
     public static final String CURRENT_MODULE = "文件传输接口";
 
@@ -113,6 +117,9 @@ public class FiletransferController {
                 }
             }
         }
+        if (StringUtils.isEmpty(token)) {
+            token = httpServletRequest.getHeader("token");
+        }
         boolean authResult = fileDealComp.checkAuthDownloadAndPreview(downloadFileDTO.getShareBatchNum(),
                 downloadFileDTO.getExtractionCode(),
                 token,
@@ -139,6 +146,8 @@ public class FiletransferController {
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName);// 设置文件名
 
         filetransferService.downloadFile(httpServletResponse, downloadFileDTO);
+        // 保存下载记录
+        downloadRecordService.saveDownloadRecord(Arrays.asList(downloadFileDTO.getUserFileId()));
     }
 
     @Operation(summary = "批量下载文件", description = "批量下载文件", tags = {"filetransfer"})
@@ -155,6 +164,9 @@ public class FiletransferController {
                 }
             }
         }
+        if (StringUtils.isEmpty(token)) {
+            token = httpServletRequest.getHeader("token");
+        }
         boolean authResult = fileDealComp.checkAuthDownloadAndPreview(batchDownloadFileDTO.getShareBatchNum(),
                 batchDownloadFileDTO.getExtractionCode(),
                 token,
@@ -186,6 +198,7 @@ public class FiletransferController {
         String fileName = String.valueOf(date.getTime());
         httpServletResponse.addHeader("Content-Disposition", "attachment;fileName=" + fileName + ".zip");// 设置文件名
         filetransferService.downloadUserFileList(httpServletResponse, userFile.getFilePath(), fileName, userFileIds);
+        downloadRecordService.saveDownloadRecord(userFileIds);
     }
 
     @Operation(summary="预览文件", description="用于文件预览", tags = {"filetransfer"})

hb-file/src/main/java/com/ruoyi/file/controller/NoticeController.java

@@ -2,7 +2,7 @@ package com.ruoyi.file.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.qiwenshare.common.result.RestResult;
-import com.ruoyi.file.api.INoticeService;
+import com.ruoyi.file.service.INoticeService;
 import com.ruoyi.file.domain.Notice;
 import com.ruoyi.file.dto.notice.NoticeListDTO;
 import io.swagger.v3.oas.annotations.Operation;

hb-file/src/main/java/com/ruoyi/file/controller/OfficeController.java

@@ -9,8 +9,8 @@ import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IFileService;
+import com.ruoyi.file.service.IFileService;
-import com.ruoyi.file.api.IUserFileService;
+import com.ruoyi.file.service.IUserFileService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.FileBean;
 import com.ruoyi.file.domain.UserFile;

hb-file/src/main/java/com/ruoyi/file/controller/RecoveryFileController.java

@@ -4,10 +4,10 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IFileService;
+import com.ruoyi.file.service.IFileService;
-import com.ruoyi.file.api.IFiletransferService;
+import com.ruoyi.file.service.IFiletransferService;
-import com.ruoyi.file.api.IRecoveryFileService;
+import com.ruoyi.file.service.IRecoveryFileService;
-import com.ruoyi.file.api.IUserFileService;
+import com.ruoyi.file.service.IUserFileService;
 import com.ruoyi.file.component.AsyncTaskComp;
 import com.ruoyi.file.domain.RecoveryFile;
 import com.ruoyi.file.dto.file.DeleteRecoveryFileDTO;

hb-file/src/main/java/com/ruoyi/file/controller/ShareController.java

@@ -11,9 +11,9 @@ import com.qiwenshare.common.result.RestResult;
 import com.qiwenshare.common.util.DateUtil;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IShareFileService;
+import com.ruoyi.file.service.IShareFileService;
-import com.ruoyi.file.api.IShareService;
+import com.ruoyi.file.service.IShareService;
-import com.ruoyi.file.api.IUserFileService;
+import com.ruoyi.file.service.IUserFileService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.Share;
 import com.ruoyi.file.domain.ShareFile;

hb-file/src/main/java/com/ruoyi/file/controller/SysParamController.java

@@ -3,7 +3,7 @@ package com.ruoyi.file.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.qiwenshare.common.result.RestResult;
-import com.ruoyi.file.api.ISysParamService;
+import com.ruoyi.file.service.ISysParamService;
 import com.ruoyi.file.domain.SysParam;
 import com.ruoyi.file.dto.param.QueryGroupParamDTO;
 import io.swagger.v3.oas.annotations.Operation;

hb-file/src/main/java/com/ruoyi/file/controller/TaskController.java

@@ -2,12 +2,12 @@ package com.ruoyi.file.controller;
 
 import co.elastic.clients.elasticsearch.ElasticsearchClient;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.ruoyi.file.api.IShareFileService;
+import com.ruoyi.file.service.IShareFileService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.ShareFile;
 import com.ruoyi.file.domain.UserFile;
 import com.ruoyi.file.io.QiwenFile;
-import com.ruoyi.file.service.UserFileService;
+import com.ruoyi.file.service.IUserFileService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -21,7 +21,7 @@ import java.util.List;
 public class TaskController {
 
     @Resource
-    UserFileService userFileService;
+    IUserFileService userFileService;
     @Resource
     FileDealComp fileDealComp;
     @Resource

hb-file/src/main/java/com/ruoyi/file/controller/UserController.java

@@ -1,29 +1,24 @@
 package com.ruoyi.file.controller;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
 import com.qiwenshare.common.anno.MyLog;
 import com.qiwenshare.common.result.RestResult;
-import com.qiwenshare.common.util.DateUtil;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.core.redis.RedisCache;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IUserLoginInfoService;
+import com.ruoyi.file.service.IUserLoginInfoService;
 import com.ruoyi.file.component.JwtComp;
-import com.ruoyi.file.domain.UserLoginInfo;
 import com.ruoyi.file.vo.user.UserLoginVo;
 import com.ruoyi.framework.web.service.SysLoginService;
 import com.ruoyi.framework.web.service.TokenService;
 import com.ruoyi.system.service.ISysUserService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

hb-file/src/main/java/com/ruoyi/file/service/ICommonFileService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.CommonFile;

hb-file/src/main/java/com/ruoyi/file/service/IFilePermissionService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.FilePermission;

hb-file/src/main/java/com/ruoyi/file/service/IFileService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.FileBean;

hb-file/src/main/java/com/ruoyi/file/service/IFiletransferService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.ruoyi.file.domain.FileBean;
 import com.ruoyi.file.dto.file.DownloadFileDTO;

hb-file/src/main/java/com/ruoyi/file/service/INoticeService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

hb-file/src/main/java/com/ruoyi/file/service/IOperationLogService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 
 import com.baomidou.mybatisplus.core.metadata.IPage;

hb-file/src/main/java/com/ruoyi/file/service/IRecoveryFileService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.RecoveryFile;

hb-file/src/main/java/com/ruoyi/file/service/IShareFileService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.ShareFile;

hb-file/src/main/java/com/ruoyi/file/service/IShareService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.Share;

hb-file/src/main/java/com/ruoyi/file/service/IStorageService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.StorageBean;

hb-file/src/main/java/com/ruoyi/file/service/ISysParamService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.SysParam;

hb-file/src/main/java/com/ruoyi/file/service/ISysRoleUserFileService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.ruoyi.common.core.domain.entity.SysRole;
 

hb-file/src/main/java/com/ruoyi/file/service/IUploadTaskDetailService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.UploadTaskDetail;

hb-file/src/main/java/com/ruoyi/file/service/IUploadTaskService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.UploadTask;

hb-file/src/main/java/com/ruoyi/file/service/IUserFileService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;

hb-file/src/main/java/com/ruoyi/file/service/IUserLoginInfoService.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.api;
+package com.ruoyi.file.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.file.domain.UserLoginInfo;

hb-file/src/main/java/com/ruoyi/file/service/impl/CommonFileServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.ICommonFileService;
 import com.ruoyi.file.domain.CommonFile;
 import com.ruoyi.file.mapper.CommonFileMapper;
+import com.ruoyi.file.service.ICommonFileService;
 import com.ruoyi.file.vo.commonfile.CommonFileListVo;
 import com.ruoyi.file.vo.commonfile.CommonFileUser;
 import lombok.extern.slf4j.Slf4j;
@@ -16,7 +16,7 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class CommonFileService extends ServiceImpl<CommonFileMapper, CommonFile> implements ICommonFileService {
+public class CommonFileServiceImpl extends ServiceImpl<CommonFileMapper, CommonFile> implements ICommonFileService {
 
     @Resource
     CommonFileMapper commonFileMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/FilePermissionServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IFilePermissionService;
 import com.ruoyi.file.domain.FilePermission;
 import com.ruoyi.file.mapper.FilePermissionMapper;
+import com.ruoyi.file.service.IFilePermissionService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -11,6 +11,6 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class FilePermissionService extends ServiceImpl<FilePermissionMapper, FilePermission> implements IFilePermissionService {
+public class FilePermissionServiceImpl extends ServiceImpl<FilePermissionMapper, FilePermission> implements IFilePermissionService {
 
 }

hb-file/src/main/java/com/ruoyi/file/service/impl/FileServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -12,7 +12,6 @@ import com.qiwenshare.ufop.operation.download.Downloader;
 import com.qiwenshare.ufop.operation.download.domain.DownloadFile;
 import com.qiwenshare.ufop.util.UFOPUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IFileService;
 import com.ruoyi.file.component.AsyncTaskComp;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.FileBean;
@@ -23,6 +22,7 @@ import com.ruoyi.file.mapper.FileMapper;
 import com.ruoyi.file.mapper.ImageMapper;
 import com.ruoyi.file.mapper.MusicMapper;
 import com.ruoyi.file.mapper.UserFileMapper;
+import com.ruoyi.file.service.IFileService;
 import com.ruoyi.file.util.QiwenFileUtil;
 import com.ruoyi.file.vo.file.FileDetailVO;
 import lombok.extern.slf4j.Slf4j;
@@ -43,7 +43,7 @@ import java.util.concurrent.Executors;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class FileService extends ServiceImpl<FileMapper, FileBean> implements IFileService {
+public class FileServiceImpl extends ServiceImpl<FileMapper, FileBean> implements IFileService {
     public static Executor executor = Executors.newFixedThreadPool(20);
     @Resource
     FileMapper fileMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/FiletransferServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson2.JSON;
@@ -23,7 +23,6 @@ import com.qiwenshare.ufop.operation.upload.domain.UploadFile;
 import com.qiwenshare.ufop.operation.upload.domain.UploadFileResult;
 import com.qiwenshare.ufop.util.UFOPUtils;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IFiletransferService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.*;
 import com.ruoyi.file.dto.file.DownloadFileDTO;
@@ -31,6 +30,7 @@ import com.ruoyi.file.dto.file.PreviewDTO;
 import com.ruoyi.file.dto.file.UploadFileDTO;
 import com.ruoyi.file.io.QiwenFile;
 import com.ruoyi.file.mapper.*;
+import com.ruoyi.file.service.IFiletransferService;
 import com.ruoyi.file.vo.file.UploadFileVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.io.IOUtils;
@@ -60,7 +60,7 @@ import java.util.zip.ZipOutputStream;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class FiletransferService implements IFiletransferService {
+public class FiletransferServiceImpl implements IFiletransferService {
 
     @Resource
     FileMapper fileMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/NoticeServiceImpl.java

@@ -1,19 +1,19 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.INoticeService;
 import com.ruoyi.file.domain.Notice;
 import com.ruoyi.file.dto.notice.NoticeListDTO;
 import com.ruoyi.file.mapper.NoticeMapper;
+import com.ruoyi.file.service.INoticeService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 
 
 @Service
-public class NoticeService extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {
+public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> implements INoticeService {
     @Resource
     NoticeMapper noticeMapper;
 

hb-file/src/main/java/com/ruoyi/file/service/impl/OperationLogServiceImpl.java

@@ -1,11 +1,11 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IOperationLogService;
 import com.ruoyi.file.domain.OperationLogBean;
 import com.ruoyi.file.mapper.OperationLogMapper;
+import com.ruoyi.file.service.IOperationLogService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -15,7 +15,7 @@ import java.util.List;
 
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class OperationLogService  extends ServiceImpl<OperationLogMapper, OperationLogBean> implements IOperationLogService {
+public class OperationLogServiceImpl extends ServiceImpl<OperationLogMapper, OperationLogBean> implements IOperationLogService {
 
     @Resource
     OperationLogMapper operationLogMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/RecoveryFileServiceImpl.java

@@ -1,15 +1,15 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IRecoveryFileService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.RecoveryFile;
 import com.ruoyi.file.domain.UserFile;
 import com.ruoyi.file.io.QiwenFile;
 import com.ruoyi.file.mapper.RecoveryFileMapper;
 import com.ruoyi.file.mapper.UserFileMapper;
+import com.ruoyi.file.service.IRecoveryFileService;
 import com.ruoyi.file.vo.file.RecoveryFileListVo;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -22,7 +22,7 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class RecoveryFileService  extends ServiceImpl<RecoveryFileMapper, RecoveryFile> implements IRecoveryFileService {
+public class RecoveryFileServiceImpl extends ServiceImpl<RecoveryFileMapper, RecoveryFile> implements IRecoveryFileService {
     @Resource
     UserFileMapper userFileMapper;
     @Resource

hb-file/src/main/java/com/ruoyi/file/service/impl/ShareFileServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IShareFileService;
 import com.ruoyi.file.domain.ShareFile;
 import com.ruoyi.file.mapper.ShareFileMapper;
+import com.ruoyi.file.service.IShareFileService;
 import com.ruoyi.file.vo.share.ShareFileListVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class ShareFileService extends ServiceImpl<ShareFileMapper, ShareFile> implements IShareFileService {
+public class ShareFileServiceImpl extends ServiceImpl<ShareFileMapper, ShareFile> implements IShareFileService {
     @Resource
     ShareFileMapper shareFileMapper;
 

hb-file/src/main/java/com/ruoyi/file/service/impl/ShareServiceImpl.java

@@ -1,10 +1,10 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IShareService;
 import com.ruoyi.file.domain.Share;
 import com.ruoyi.file.dto.sharefile.ShareListDTO;
 import com.ruoyi.file.mapper.ShareMapper;
+import com.ruoyi.file.service.IShareService;
 import com.ruoyi.file.vo.share.ShareListVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -15,7 +15,7 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class ShareService extends ServiceImpl<ShareMapper, Share> implements IShareService {
+public class ShareServiceImpl extends ServiceImpl<ShareMapper, Share> implements IShareService {
 
     @Resource
     ShareMapper shareMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/StorageServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IStorageService;
 import com.ruoyi.file.domain.StorageBean;
 import com.ruoyi.file.domain.SysParam;
 import com.ruoyi.file.mapper.StorageMapper;
 import com.ruoyi.file.mapper.SysParamMapper;
 import com.ruoyi.file.mapper.UserFileMapper;
+import com.ruoyi.file.service.IStorageService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -17,7 +17,7 @@ import javax.annotation.Resource;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class StorageService extends ServiceImpl<StorageMapper, StorageBean> implements IStorageService {
+public class StorageServiceImpl extends ServiceImpl<StorageMapper, StorageBean> implements IStorageService {
     @Resource
     StorageMapper storageMapper;
     @Resource

hb-file/src/main/java/com/ruoyi/file/service/impl/SysParamServiceImpl.java

@@ -1,10 +1,10 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.ISysParamService;
 import com.ruoyi.file.domain.SysParam;
 import com.ruoyi.file.mapper.SysParamMapper;
+import com.ruoyi.file.service.ISysParamService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
@@ -19,7 +19,7 @@ import java.util.List;
  */
 @Slf4j
 @Service
-public class SysParamService extends ServiceImpl<SysParamMapper, SysParam> implements ISysParamService {
+public class SysParamServiceImpl extends ServiceImpl<SysParamMapper, SysParam> implements ISysParamService {
 
     @Resource
     SysParamMapper sysParamMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/SysRoleUserFileServiceImpl.java

@@ -1,10 +1,9 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.ruoyi.common.core.domain.entity.SysRole;
-import com.ruoyi.file.api.ISysRoleUserFileService;
 import com.ruoyi.file.domain.SysRoleUserFile;
 import com.ruoyi.file.mapper.SysRoleUserFileMapper;
-import com.ruoyi.system.domain.SysRoleDept;
+import com.ruoyi.file.service.ISysRoleUserFileService;
 import com.ruoyi.system.mapper.SysRoleMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,7 @@ import java.util.List;
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class SysRoleUserFileService implements ISysRoleUserFileService {
+public class SysRoleUserFileServiceImpl implements ISysRoleUserFileService {
 
     @Autowired
     SysRoleUserFileMapper roleUserFileMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/UploadTaskDetailServiceImpl.java

@@ -1,16 +1,16 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IUploadTaskDetailService;
 import com.ruoyi.file.domain.UploadTaskDetail;
 import com.ruoyi.file.mapper.UploadTaskDetailMapper;
+import com.ruoyi.file.service.IUploadTaskDetailService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
 
 @Service
-public class UploadTaskDetailService extends ServiceImpl<UploadTaskDetailMapper, UploadTaskDetail> implements IUploadTaskDetailService {
+public class UploadTaskDetailServiceImpl extends ServiceImpl<UploadTaskDetailMapper, UploadTaskDetail> implements IUploadTaskDetailService {
 
     @Resource
     UploadTaskDetailMapper uploadTaskDetailMapper;

hb-file/src/main/java/com/ruoyi/file/service/impl/UploadTaskServiceImpl.java

@@ -1,13 +1,13 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IUploadTaskService;
 import com.ruoyi.file.domain.UploadTask;
 import com.ruoyi.file.mapper.UploadTaskMapper;
+import com.ruoyi.file.service.IUploadTaskService;
 import org.springframework.stereotype.Service;
 
 @Service
-public class UploadTaskService extends ServiceImpl<UploadTaskMapper, UploadTask> implements IUploadTaskService {
+public class UploadTaskServiceImpl extends ServiceImpl<UploadTaskMapper, UploadTask> implements IUploadTaskService {
 
 
 }

hb-file/src/main/java/com/ruoyi/file/service/impl/UserFileServiceImpl.java

@@ -1,4 +1,4 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import cn.hutool.core.net.URLDecoder;
 import cn.hutool.core.util.IdUtil;
@@ -13,7 +13,6 @@ import com.qiwenshare.common.util.DateUtil;
 import com.ruoyi.file.dto.file.UserFileDTO;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.file.api.IUserFileService;
 import com.ruoyi.file.component.FileDealComp;
 import com.ruoyi.file.domain.RecoveryFile;
 import com.ruoyi.file.domain.UserFile;
@@ -21,6 +20,7 @@ import com.ruoyi.file.io.QiwenFile;
 import com.ruoyi.file.mapper.RecoveryFileMapper;
 import com.ruoyi.file.mapper.SysRoleUserFileMapper;
 import com.ruoyi.file.mapper.UserFileMapper;
+import com.ruoyi.file.service.IUserFileService;
 import com.ruoyi.file.util.FileTreeSelect;
 import com.ruoyi.file.vo.file.FileListVO;
 import lombok.extern.slf4j.Slf4j;
@@ -38,7 +38,7 @@ import java.util.stream.Collectors;
 @Slf4j
 @Service
 @Transactional(rollbackFor = Exception.class)
-public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> implements IUserFileService {
+public class UserFileServiceImpl extends ServiceImpl<UserFileMapper, UserFile> implements IUserFileService {
     @Resource
     UserFileMapper userFileMapper;
     @Resource

hb-file/src/main/java/com/ruoyi/file/service/impl/UserLoginInfoServiceImpl.java

@@ -1,9 +1,9 @@
-package com.ruoyi.file.service;
+package com.ruoyi.file.service.impl;
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.ruoyi.file.api.IUserLoginInfoService;
 import com.ruoyi.file.domain.UserLoginInfo;
 import com.ruoyi.file.mapper.UserLoginInfoMapper;
+import com.ruoyi.file.service.IUserLoginInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -12,7 +12,7 @@ import org.springframework.transaction.annotation.Transactional;
 @Slf4j
 @Service
 @Transactional(rollbackFor=Exception.class)
-public class UserLoginInfoService extends ServiceImpl<UserLoginInfoMapper, UserLoginInfo> implements IUserLoginInfoService {
+public class UserLoginInfoServiceImpl extends ServiceImpl<UserLoginInfoMapper, UserLoginInfo> implements IUserLoginInfoService {
 
 
 }