From 70dbd8a7b55dc17c53a98cb7634beeca2234ff7a Mon Sep 17 00:00:00 2001 From: MAC <1162714483@qq.com> Date: Thu, 2 Dec 2021 23:08:06 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=96=87=E4=BB=B6=E5=A4=8D=E5=88=B6):=20?= =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=96=87=E4=BB=B6=E5=A4=8D=E5=88=B6=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../file/controller/FileController.java | 4 +-- .../com/qiwenshare/file/domain/FileBean.java | 12 +++++++ .../qiwenshare/file/mapper/FileMapper.java | 8 +++-- .../file/service/FiletransferService.java | 2 ++ .../file/service/UserFileService.java | 4 +-- .../resources/config/application.properties | 2 +- src/main/resources/mapper/FileMapper.xml | 36 +++++++++++++++++++ 7 files changed, 61 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/qiwenshare/file/controller/FileController.java b/src/main/java/com/qiwenshare/file/controller/FileController.java index 1dbecd0..35a90da 100644 --- a/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -305,11 +305,11 @@ public class FileController { if (userFile.getIsDir() == 1) { String testFilePath = oldfilePath + fileName + "/"; if (newfilePath.startsWith(testFilePath)) { - return RestResult.fail().message("原路径与目标路径冲突，不能移动"); + return RestResult.fail().message("原路径与目标路径冲突，不能复制"); } } - userFileService.updateFilepathByFilepath(oldfilePath, newfilePath, fileName, extendName, sessionUserBean.getUserId()); + userFileService.userFileCopy(oldfilePath, newfilePath, fileName, extendName, sessionUserBean.getUserId()); return RestResult.success(); } diff --git a/src/main/java/com/qiwenshare/file/domain/FileBean.java b/src/main/java/com/qiwenshare/file/domain/FileBean.java index fa788f0..66e1558 100644 --- a/src/main/java/com/qiwenshare/file/domain/FileBean.java +++ b/src/main/java/com/qiwenshare/file/domain/FileBean.java @@ -39,4 +39,16 @@ public class FileBean { @Column(columnDefinition="varchar(32)") private String identifier; + @Column(columnDefinition="varchar(25)") + private String createTime; + + @Column(columnDefinition="bigint(20)") + private Long createUserId; + + @Column(columnDefinition="varchar(25)") + private String modifyTime; + + @Column(columnDefinition="bigint(20)") + private Long modifyUserId; + } diff --git a/src/main/java/com/qiwenshare/file/mapper/FileMapper.java b/src/main/java/com/qiwenshare/file/mapper/FileMapper.java index 02bdfdb..862d871 100644 --- a/src/main/java/com/qiwenshare/file/mapper/FileMapper.java +++ b/src/main/java/com/qiwenshare/file/mapper/FileMapper.java @@ -11,10 +11,14 @@ public interface FileMapper extends BaseMapper { void batchInsertFile(List fileBeanList); -// void updateFile(FileBean fileBean); - + void incPointCountByPathAndName(@Param("oldFilePath") String oldFilePath, + @Param("fileName") String fileName, + @Param("extendName") String extendName, + @Param("userId") long userId); + void incPointCountByByFilepath(@Param("oldFilePath") String oldFilePath, + @Param("userId") long userId); diff --git a/src/main/java/com/qiwenshare/file/service/FiletransferService.java b/src/main/java/com/qiwenshare/file/service/FiletransferService.java index 6a1c21b..f6a2b65 100644 --- a/src/main/java/com/qiwenshare/file/service/FiletransferService.java +++ b/src/main/java/com/qiwenshare/file/service/FiletransferService.java @@ -92,6 +92,8 @@ public class FiletransferService implements IFiletransferService { fileBean.setFileSize(uploadFileResult.getFileSize()); fileBean.setStorageType(uploadFileResult.getStorageType().getCode()); fileBean.setPointCount(1); + fileBean.setCreateTime(DateUtil.getCurrentTime()); + fileBean.setCreateUserId(userId); fileMapper.insert(fileBean); UserFile userFile = new UserFile(); diff --git a/src/main/java/com/qiwenshare/file/service/UserFileService.java b/src/main/java/com/qiwenshare/file/service/UserFileService.java index 119579b..359a6d2 100644 --- a/src/main/java/com/qiwenshare/file/service/UserFileService.java +++ b/src/main/java/com/qiwenshare/file/service/UserFileService.java @@ -116,8 +116,7 @@ public class UserFileService extends ServiceImpl impl } userFileMapper.batchInsertByPathAndName(oldfilePath, newfilePath, fileName, extendName, userId); - //移动根目录 -// userFileMapper.updateFilepathByPathAndName(oldfilePath, newfilePath, fileName, extendName, userId); + fileMapper.incPointCountByPathAndName(newfilePath, fileName, extendName, userId); //移动子目录 oldfilePath = oldfilePath + fileName + "/"; @@ -130,6 +129,7 @@ public class UserFileService extends ServiceImpl impl if (extendName == null) { //为null说明是目录，则需要移动子目录 userFileMapper.batchInsertByFilepath(oldfilePath, newfilePath, userId); + fileMapper.incPointCountByByFilepath(oldfilePath, userId); } } diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties index b4dc6a7..40653ab 100644 --- a/src/main/resources/config/application.properties +++ b/src/main/resources/config/application.properties @@ -43,7 +43,7 @@ spring.servlet.multipart.enabled=true spring.main.allow-bean-definition-overriding=true -mybatis-plus.type-aliases-package=com.qiwenshare.web.domain +mybatis-plus.type-aliases-package=com.qiwenshare.file.domain mybatis-plus.mapper-locations=classpath:mapper/*.xml mybatis-plus.configuration.map-underscore-to-camel-case=false mybatis-plus.global-config.banner=false diff --git a/src/main/resources/mapper/FileMapper.xml b/src/main/resources/mapper/FileMapper.xml index 37edae5..1707664 100644 --- a/src/main/resources/mapper/FileMapper.xml +++ b/src/main/resources/mapper/FileMapper.xml @@ -16,5 +16,41 @@ #{file.fileSize}, #{file.isDir}) + + + update file + set pointCount = pointCount + 1 + where fileId in ( + select fileId from userfile + + + and userId = #{userId} + + + and fileName = #{fileName} + + + and filePath = #{oldFilePath} + + + and extendName = #{extendName} + + and isDir = 0 + + ) + + + + update file + set pointCount = pointCount + 1 + where fileId in ( + select fileId from userfile + where + filePath like N'${oldFilePath}%' + and userId = #{userId} + and isDir = 0 + + ) + \ No newline at end of file