diff --git a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java index c23ad22d..b860aa9f 100644 --- a/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java +++ b/framework/src/main/java/cn/lili/modules/file/serviceimpl/FileServiceImpl.java @@ -4,8 +4,6 @@ import cn.hutool.core.text.CharSequenceUtil; import cn.lili.common.enums.ResultCode; import cn.lili.common.exception.ServiceException; import cn.lili.common.security.AuthUser; -import cn.lili.common.vo.PageVO; -import cn.lili.common.vo.SearchVO; import cn.lili.modules.file.entity.File; import cn.lili.modules.file.entity.dto.FileOwnerDTO; import cn.lili.modules.file.mapper.FileMapper; @@ -15,11 +13,10 @@ import cn.lili.mybatis.util.PageUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import java.util.ArrayList; import java.util.List; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; /** * 文件管理业务层实现 @@ -42,7 +39,7 @@ public class FileServiceImpl extends ServiceImpl implements Fi List files = this.list(queryWrapper); List keys = new ArrayList<>(); files.forEach(item -> keys.add(item.getFileKey())); - if(!keys.isEmpty()) { + if (!keys.isEmpty()) { filePluginFactory.filePlugin().deleteFile(keys); } this.remove(queryWrapper); @@ -56,7 +53,9 @@ public class FileServiceImpl extends ServiceImpl implements Fi List files = this.list(queryWrapper); List keys = new ArrayList<>(); files.forEach(item -> keys.add(item.getFileKey())); - filePluginFactory.filePlugin().deleteFile(keys); + if (!keys.isEmpty()) { + filePluginFactory.filePlugin().deleteFile(keys); + } this.remove(queryWrapper); } @@ -90,26 +89,33 @@ public class FileServiceImpl extends ServiceImpl implements Fi public IPage customerPage(FileOwnerDTO fileOwnerDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getName()), File::getName, fileOwnerDTO.getName()) - .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getOwnerName()), File::getOwnerName, fileOwnerDTO.getOwnerName()) - .eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileDirectoryId()),File::getFileDirectoryId, fileOwnerDTO.getFileDirectoryId()) - .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey()) - .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, fileOwnerDTO.getFileType()) - .between(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getStartDate()) && CharSequenceUtil.isNotEmpty(fileOwnerDTO.getEndDate()), - File::getCreateTime, fileOwnerDTO.getStartDate(), fileOwnerDTO.getEndDate()); + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getOwnerName()), File::getOwnerName, + fileOwnerDTO.getOwnerName()) + .eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileDirectoryId()), File::getFileDirectoryId, + fileOwnerDTO.getFileDirectoryId()) + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey()) + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, + fileOwnerDTO.getFileType()).between( + CharSequenceUtil.isNotEmpty(fileOwnerDTO.getStartDate()) && CharSequenceUtil.isNotEmpty( + fileOwnerDTO.getEndDate()), File::getCreateTime, fileOwnerDTO.getStartDate(), + fileOwnerDTO.getEndDate()); return this.page(PageUtil.initPage(fileOwnerDTO), queryWrapper); } @Override public IPage customerPageOwner(FileOwnerDTO fileOwnerDTO) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getOwnerId()), File::getOwnerId, fileOwnerDTO.getOwnerId()) - .eq(File::getUserEnums, fileOwnerDTO.getUserEnums()) - .eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileDirectoryId()),File::getFileDirectoryId, fileOwnerDTO.getFileDirectoryId()) - .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getName()), File::getName, fileOwnerDTO.getName()) - .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey()) - .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, fileOwnerDTO.getFileType()) - .between(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getStartDate()) && CharSequenceUtil.isNotEmpty(fileOwnerDTO.getEndDate()), - File::getCreateTime, fileOwnerDTO.getStartDate(), fileOwnerDTO.getEndDate()); + queryWrapper.eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getOwnerId()), File::getOwnerId, + fileOwnerDTO.getOwnerId()).eq(File::getUserEnums, fileOwnerDTO.getUserEnums()) + .eq(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileDirectoryId()), File::getFileDirectoryId, + fileOwnerDTO.getFileDirectoryId()) + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getName()), File::getName, fileOwnerDTO.getName()) + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileKey()), File::getFileKey, fileOwnerDTO.getFileKey()) + .like(CharSequenceUtil.isNotEmpty(fileOwnerDTO.getFileType()), File::getFileType, + fileOwnerDTO.getFileType()).between( + CharSequenceUtil.isNotEmpty(fileOwnerDTO.getStartDate()) && CharSequenceUtil.isNotEmpty( + fileOwnerDTO.getEndDate()), File::getCreateTime, fileOwnerDTO.getStartDate(), + fileOwnerDTO.getEndDate()); return this.page(PageUtil.initPage(fileOwnerDTO), queryWrapper); } } \ No newline at end of file diff --git a/pom.xml b/pom.xml index 578abc28..5f1716ee 100644 --- a/pom.xml +++ b/pom.xml @@ -80,6 +80,17 @@ + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven-compiler-plugin.version} + + ${java.version} + ${java.version} + + + org.apache.maven.plugins maven-resources-plugin