ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

文件还原同名冲突问题修复

Browse Source
This commit is contained in:
马超 2021-03-13 12:29:11 +08:00
parent 07a34330d7
commit a4d7fec604
4 changed files with 26 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
file-common/pom.xml
View File

@ -43,6 +43,17 @@
<artifactId>jjwt</artifactId> <artifactId>jjwt</artifactId>
<version>0.9.1</version> <version>0.9.1</version>
</dependency> </dependency>
<!-- <dependency>-->
<!-- <groupId>org.csource</groupId>-->
<!-- <artifactId>fastdfs-client-java</artifactId>-->
<!-- <version>1.27-SNAPSHOT</version>-->
<!-- </dependency>-->
<!-- https://mvnrepository.com/artifact/net.oschina.zcx7878/fastdfs-client-java -->
<dependency>
<groupId>net.oschina.zcx7878</groupId>
<artifactId>fastdfs-client-java</artifactId>
<version>1.27.0.0</version>
</dependency>
</dependencies> </dependencies>

12
file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java
View File

@ -121,7 +121,8 @@ public class RecoveryFileController {
} }
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.select(UserFile::getFilePath, UserFile::getFileName)
lambdaQueryWrapper.select(UserFile::getFileName, UserFile::getFilePath)
.likeRight(UserFile::getFilePath, restoreFileDto.getFilePath()) .likeRight(UserFile::getFilePath, restoreFileDto.getFilePath())
.eq(UserFile::getIsDir, 1) .eq(UserFile::getIsDir, 1)
.eq(UserFile::getDeleteFlag, 0) .eq(UserFile::getDeleteFlag, 0)
@ -132,9 +133,14 @@ public class RecoveryFileController {
for (UserFile userFile : repeatList) { for (UserFile userFile : repeatList) {
LambdaQueryWrapper<UserFile> lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserFile> lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
lambdaQueryWrapper1.eq(UserFile::getFilePath, userFile.getFilePath()) lambdaQueryWrapper1.eq(UserFile::getFilePath, userFile.getFilePath())
.eq(UserFile::getFileName, userFile.getFileName()); .eq(UserFile::getFileName, userFile.getFileName())
.eq(UserFile::getDeleteFlag, "0");
List<UserFile> userFiles = userFileService.list(lambdaQueryWrapper1); List<UserFile> userFiles = userFileService.list(lambdaQueryWrapper1);
// for (int i = 0; i < userFile) log.info("重复的文件:" + JSON.toJSONString(userFiles));
for (int i = 0; i < userFiles.size() - 1; i ++) {
log.info("删除文件：" + JSON.toJSONString(userFiles.get(i)));
userFileService.removeById(userFiles.get(i).getUserFileId());
}
} }
log.info(JSON.toJSONString(repeatList)); log.info(JSON.toJSONString(repeatList));

5
file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java
View File

@ -39,7 +39,10 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
@Override @Override
public List<UserFile> selectUserFileByNameAndPath(String fileName, String filePath, Long userId) { public List<UserFile> selectUserFileByNameAndPath(String fileName, String filePath, Long userId) {
LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>(); LambdaQueryWrapper<UserFile> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(UserFile::getFileName, fileName).eq(UserFile::getFilePath, filePath).eq(UserFile::getUserId, userId); lambdaQueryWrapper.eq(UserFile::getFileName, fileName)
.eq(UserFile::getFilePath, filePath)
.eq(UserFile::getUserId, userId)
.eq(UserFile::getDeleteFlag, "0");
return userFileMapper.selectList(lambdaQueryWrapper); return userFileMapper.selectList(lambdaQueryWrapper);
} }

2
file-web/src/main/resources/config/application.properties
View File

@ -1,4 +1,6 @@
server.port=8080 server.port=8080
#环境切换dev/prod
spring.profiles.active=dev
eureka.client.register-with-eureka=false eureka.client.register-with-eureka=false
eureka.client.fetchRegistry=false eureka.client.fetchRegistry=false