From 31c69e84a8f8a30349ac69e0a6f5b63e8d400574 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=A9=AC=E8=B6=85?= <1162714483@qq.com> Date: Sat, 12 Dec 2020 11:38:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=85=B3=E8=81=94=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qiwenshare/file/api/IUserFileService.java | 7 +++ .../file/controller/FileController.java | 13 ++++- .../com/qiwenshare/file/domain/FileBean.java | 47 ------------------- .../com/qiwenshare/file/domain/UserBean.java | 21 ++------- .../com/qiwenshare/file/domain/UserFile.java | 30 ++++++++++++ .../file/mapper/UserFileMapper.java | 9 ++++ .../qiwenshare/file/service/FileService.java | 3 +- .../file/service/UserFileService.java | 9 ++++ .../mybatis/mapper/UserFileMapper.xml | 13 +++++ 9 files changed, 85 insertions(+), 67 deletions(-) create mode 100644 file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java create mode 100644 file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java create mode 100644 file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml diff --git a/file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java b/file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java new file mode 100644 index 0000000..68cf5df --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/api/IUserFileService.java @@ -0,0 +1,7 @@ +package com.qiwenshare.file.api; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.qiwenshare.file.domain.UserFile; + +public interface IUserFileService extends IService { +} diff --git a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java index 747af80..e43cea6 100644 --- a/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java +++ b/file-web/src/main/java/com/qiwenshare/file/controller/FileController.java @@ -15,10 +15,12 @@ import com.qiwenshare.file.config.QiwenFileConfig; import com.qiwenshare.file.domain.FileBean; import com.qiwenshare.file.domain.TreeNode; import com.qiwenshare.file.domain.UserBean; +import com.qiwenshare.file.domain.UserFile; import com.qiwenshare.file.dto.BatchDeleteFileDto; import com.qiwenshare.file.dto.BatchMoveFileDto; import com.qiwenshare.file.dto.MoveFileDto; import com.qiwenshare.file.dto.RenameFileDto; +import com.qiwenshare.file.service.UserFileService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.ArrayUtils; import org.springframework.web.bind.annotation.*; @@ -39,6 +41,8 @@ public class FileController { IFileService fileService; @Resource IUserService userService; + @Resource + UserFileService userFileService; @Resource QiwenFileConfig qiwenFileConfig; @@ -65,11 +69,18 @@ public class FileController { } UserBean sessionUserBean = userService.getUserBeanByToken(token); - fileBean.setUserId(sessionUserBean.getUserId()); +// fileBean.setUserId(sessionUserBean.getUserId()); fileBean.setUploadTime(DateUtil.getCurrentTime()); fileService.save(fileBean); + + UserFile userFile = new UserFile(); + userFile.setFileId(fileBean.getFileId()); + userFile.setUserId(sessionUserBean.getUserId()); + userFile.setDeleteFlag(0); + userFileService.save(userFile); + restResult.setSuccess(true); return restResult; } diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/FileBean.java b/file-web/src/main/java/com/qiwenshare/file/domain/FileBean.java index d7f24ce..dad930f 100644 --- a/file-web/src/main/java/com/qiwenshare/file/domain/FileBean.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/FileBean.java @@ -1,7 +1,6 @@ package com.qiwenshare.file.domain; import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -26,9 +25,6 @@ public class FileBean { @Column(columnDefinition="bigint(20) comment '文件id'") private Long fileId; - @Column(columnDefinition="bigint(20) comment '用户id'") - private Long userId; - @Column(columnDefinition="varchar(500) comment '文件url'") private String fileUrl; @@ -59,50 +55,7 @@ public class FileBean { @Column(columnDefinition="int(11) comment '文件引用数量'") private Integer pointCount; - @Column(columnDefinition="int(11) comment '文件删除标志 0/null-正常, 1-删除'") - private Integer deleteFlag; - - @Column(columnDefinition="varchar(25) comment '删除时间'") - private String deleteTime; - @Column(columnDefinition="varchar(32) comment 'md5标识'") private String identifier; -// @Transient -// @TableField(exist = false) -// private String oldFilePath; -// -// @Transient -// @TableField(exist = false) -// private String oldFileName; - -// @Transient -// @TableField(exist = false) -// private String files; - -// @Transient -// @TableField(exist = false) -// private Integer fileType; - - //切片上传相关参数 -// @Transient -// @TableField(exist = false) -// private String taskId; -// @Transient -// @TableField(exist = false) -// private int chunkNumber; -// @Transient -// @TableField(exist = false) -// private long chunkSize; -// @Transient -// @TableField(exist = false) -// private int totalChunks; -// @Transient -// @TableField(exist = false) -// private long totalSize; -// @Transient -// @TableField(exist = false) -// private long currentChunkSize; - - } diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java b/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java index 05c0cd0..778957d 100644 --- a/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java +++ b/file-web/src/main/java/com/qiwenshare/file/domain/UserBean.java @@ -47,9 +47,9 @@ public class UserBean { /** * 重复密码 */ - @Transient - @TableField(exist = false) - private String passwordAgain; +// @Transient +// @TableField(exist = false) +// private String passwordAgain; @Column(columnDefinition = "varchar(15) comment '手机号码'") private String telephone; @@ -92,21 +92,6 @@ public class UserBean { @Column(columnDefinition = "varchar(30) comment '注册时间'") private String registerTime; - - /** - * 与某个客户端的连接会话，需要通过它来给客户端发送数据 - */ - @Transient - @TableField(exist = false) - private Session session; - - /** - * 消息未读数 - */ - @Transient - @TableField(exist = false) - private Integer notReadCount; - /** * 验证码 */ diff --git a/file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java b/file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java new file mode 100644 index 0000000..294c284 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/domain/UserFile.java @@ -0,0 +1,30 @@ +package com.qiwenshare.file.domain; + +import com.baomidou.mybatisplus.annotation.TableName; +import lombok.Data; + +import javax.persistence.*; + +@Data +@Table(name = "userfile") +@Entity +@TableName("userfile") +public class UserFile { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(columnDefinition = "bigint(20) comment '用户文件id'") + private Long userFileId; + + @Column(columnDefinition = "bigint(20) comment '用户id'") + private Long userId; + + @Column(columnDefinition="bigint(20) comment '文件id'") + private Long fileId; + + @Column(columnDefinition="int(11) comment '文件删除标志 0/null-正常, 1-删除'") + private Integer deleteFlag; + + @Column(columnDefinition="varchar(25) comment '删除时间'") + private String deleteTime; + +} diff --git a/file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java b/file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java new file mode 100644 index 0000000..68c1237 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/mapper/UserFileMapper.java @@ -0,0 +1,9 @@ +package com.qiwenshare.file.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.qiwenshare.file.domain.UserBean; +import com.qiwenshare.file.domain.UserFile; + +public interface UserFileMapper extends BaseMapper { + +} diff --git a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java index 427efee..1e5d1e8 100644 --- a/file-web/src/main/java/com/qiwenshare/file/service/FileService.java +++ b/file-web/src/main/java/com/qiwenshare/file/service/FileService.java @@ -78,7 +78,8 @@ public class FileService extends ServiceImpl implements IF public List selectFileListByPath(FileBean fileBean) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(FileBean::getFilePath, fileBean.getFilePath()) - .eq(FileBean::getUserId, fileBean.getUserId()).orderByDesc(FileBean::getIsDir); + .eq(FileBean::getUserId, fileBean.getUserId()) + .orderByDesc(FileBean::getIsDir); return fileMapper.selectList(lambdaQueryWrapper); } 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 new file mode 100644 index 0000000..78e6740 --- /dev/null +++ b/file-web/src/main/java/com/qiwenshare/file/service/UserFileService.java @@ -0,0 +1,9 @@ +package com.qiwenshare.file.service; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.qiwenshare.file.api.IUserFileService; +import com.qiwenshare.file.domain.UserFile; +import com.qiwenshare.file.mapper.UserFileMapper; + +public class UserFileService extends ServiceImpl implements IUserFileService { +} diff --git a/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml b/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml new file mode 100644 index 0000000..3110d43 --- /dev/null +++ b/file-web/src/main/resources/mybatis/mapper/UserFileMapper.xml @@ -0,0 +1,13 @@ + + + + + + + + + \ No newline at end of file