From a4d7fec604ee626938f8d0785858af50d33c0eb1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com>
Date: Sat, 13 Mar 2021 12:29:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BF=98=E5=8E=9F=E5=90=8C?=
=?UTF-8?q?=E5=90=8D=E5=86=B2=E7=AA=81=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
file-common/pom.xml | 11 +++++++++++
.../file/controller/RecoveryFileController.java | 12 +++++++++---
.../com/qiwenshare/file/service/UserFileService.java | 5 ++++-
.../src/main/resources/config/application.properties | 2 ++
4 files changed, 26 insertions(+), 4 deletions(-)
diff --git a/file-common/pom.xml b/file-common/pom.xml
index 4287ebb..e1de449 100644
--- a/file-common/pom.xml
+++ b/file-common/pom.xml
@@ -43,6 +43,17 @@
jjwt
0.9.1
+
+
+
+
+
+
+
+ net.oschina.zcx7878
+ fastdfs-client-java
+ 1.27.0.0
+
diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java
index 191fde1..2b8d31e 100644
--- a/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java
+++ b/file-web/src/main/java/com/qiwenshare/file/controller/RecoveryFileController.java
@@ -121,7 +121,8 @@ public class RecoveryFileController {
}
LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>();
- lambdaQueryWrapper.select(UserFile::getFilePath, UserFile::getFileName)
+
+ lambdaQueryWrapper.select(UserFile::getFileName, UserFile::getFilePath)
.likeRight(UserFile::getFilePath, restoreFileDto.getFilePath())
.eq(UserFile::getIsDir, 1)
.eq(UserFile::getDeleteFlag, 0)
@@ -132,9 +133,14 @@ public class RecoveryFileController {
for (UserFile userFile : repeatList) {
LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>();
lambdaQueryWrapper1.eq(UserFile::getFilePath, userFile.getFilePath())
- .eq(UserFile::getFileName, userFile.getFileName());
+ .eq(UserFile::getFileName, userFile.getFileName())
+ .eq(UserFile::getDeleteFlag, "0");
List 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));
diff --git a/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java b/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java
index d7a0cc5..6611dc1 100644
--- a/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java
+++ b/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java
@@ -39,7 +39,10 @@ public class UserFileService extends ServiceImpl impl
@Override
public List selectUserFileByNameAndPath(String fileName, String filePath, Long userId) {
LambdaQueryWrapper 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);
}
diff --git a/file-web/src/main/resources/config/application.properties b/file-web/src/main/resources/config/application.properties
index f7aa2fc..8ad56c1 100644
--- a/file-web/src/main/resources/config/application.properties
+++ b/file-web/src/main/resources/config/application.properties
@@ -1,4 +1,6 @@
server.port=8080
+#环境切换dev/prod
+spring.profiles.active=dev
eureka.client.register-with-eureka=false
eureka.client.fetchRegistry=false