diff --git a/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java b/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java index f962ab19..0ae14d9e 100644 --- a/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java +++ b/module-file/src/main/java/ink/wgink/module/file/dao/IFileDao.java @@ -82,15 +82,6 @@ public interface IFileDao extends IInitBaseTable { */ List listInfo(Map params) throws SearchException; - /** - * 获取文件列表(带路径) - * - * @param params - * @return - * @throws SearchException - */ - List listWithPath(Map params) throws SearchException; - /** * 文件列表 * diff --git a/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java b/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java index bb3aa50a..e2238aa9 100644 --- a/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java +++ b/module-file/src/main/java/ink/wgink/module/file/service/IFileService.java @@ -7,7 +7,6 @@ import ink.wgink.module.file.pojo.dtos.FileInfoDTO; import ink.wgink.module.file.pojo.vos.FileVO; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.pos.FilePO; -import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; import org.springframework.web.multipart.MultipartFile; @@ -98,15 +97,31 @@ public interface IFileService { * * @param ids */ + @Deprecated void remove(String ids); + /** + * 删除记录 + * + * @param ids + */ + void remove(List ids); + /** * 删除记录和文件 * * @param ids */ + @Deprecated void delete(String ids); + /** + * 删除记录和文件 + * + * @param ids + */ + void delete(List ids); + /** * 文件上传 * diff --git a/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java b/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java index 897e8eca..646ca8c7 100644 --- a/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java +++ b/module-file/src/main/java/ink/wgink/module/file/service/impl/FileServiceImpl.java @@ -10,7 +10,6 @@ import ink.wgink.exceptions.ParamsException; import ink.wgink.exceptions.SaveException; import ink.wgink.exceptions.SearchException; import ink.wgink.exceptions.base.SystemException; -import ink.wgink.properties.FileProperties; import ink.wgink.module.file.dao.IFileDao; import ink.wgink.module.file.enums.UploadTypeEnum; import ink.wgink.module.file.pojo.dtos.FileDTO; @@ -20,8 +19,8 @@ import ink.wgink.module.file.service.IFileService; import ink.wgink.pojo.ListPage; import ink.wgink.pojo.pos.FilePO; import ink.wgink.pojo.result.ErrorResult; -import ink.wgink.pojo.result.SuccessResultData; import ink.wgink.pojo.result.SuccessResultList; +import ink.wgink.properties.FileProperties; import ink.wgink.util.ResourceUtil; import ink.wgink.util.UUIDUtil; import ink.wgink.util.date.DateUtil; @@ -97,18 +96,29 @@ public class FileServiceImpl extends DefaultBaseService implements IFileService @Override public void remove(String ids) { + remove(Arrays.asList(ids.split("_"))); + } + + @Override + public void remove(List ids) { Map params = getHashMap(2); - params.put("fileIds", Arrays.asList(ids.split("_"))); + params.put("fileIds", ids); setUpdateInfo(params); fileDao.remove(params); } @Override public void delete(String ids) { + delete(Arrays.asList(ids.split("_"))); + } + + @Override + public void delete(List ids) { Map params = getHashMap(2); - params.put("fileIds", Arrays.asList(ids.split("_"))); + params.put("fileIds", ids); Map fileParams = getHashMap(4); - List fileInfoWithPathDTOs = fileDao.listWithPath(params); + List fileInfoWithPathDTOs = fileDao.listInfo(params); + // 删除文件 for (FileInfoDTO fileInfoDTO : fileInfoWithPathDTOs) { // 如果文件描述为空,可以直接删除源文件