فهرست منبع

格式化代码,删除无用的引用包

wukai 1 سال پیش
والد
کامیت
c3c55e9aeb

+ 1 - 1
doc-admin/src/main/resources/application.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 ruoyi:
   # 名称
-  name: RuoYi
+  name: jjt
   # 版本
   version: 3.8.6
   # 版权年份

+ 30 - 16
doc-biz/src/main/java/com/doc/biz/controller/DocInfoController.java

@@ -1,27 +1,27 @@
 package com.doc.biz.controller;
 
-import java.util.List;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
-
-import com.doc.biz.domain.DocumentFile;
+import com.doc.biz.domain.DocInfo;
+import com.doc.biz.service.IDocInfoService;
 import com.doc.biz.service.IMongoService;
 import com.doc.biz.vo.DocumentVO;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.web.bind.annotation.*;
 import com.doc.common.annotation.Log;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
+import com.doc.common.core.page.TableDataInfo;
 import com.doc.common.enums.BusinessType;
-import com.doc.biz.domain.DocInfo;
-import com.doc.biz.service.IDocInfoService;
+import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.poi.ExcelUtil;
-import com.doc.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
 /**
  * 文件基本信息表Controller
  *
@@ -46,11 +46,20 @@ public class DocInfoController extends BaseController {
      */
     @ApiOperation("上传文件")
     @PostMapping("/upload")
-    public AjaxResult uploadFile(@RequestParam(value = "file") MultipartFile file) {
+    public AjaxResult uploadFile(@ApiParam(value = "文件", required = true) @RequestPart(value = "file") MultipartFile file,
+                                 @ApiParam(value = "空间ID", required = true) @RequestParam Long spaceId,
+                                 @ApiParam(value = "目录ID", required = true) @RequestParam Long dirId) {
         try {
             DocumentVO vo = mongoService.uploadFile(file);
-            vo.getFileId();
-            return success();
+            DocInfo docInfo = new DocInfo();
+            docInfo.setSpaceId(spaceId);
+            docInfo.setDirId(dirId);
+            docInfo.setFileId(vo.getFileId());
+            docInfo.setFileName(vo.getFileName());
+            docInfo.setFileSize(vo.getFileSize());
+            docInfo.setFileType(vo.getSuffix());
+            docInfo.setCreateBy(SecurityUtils.getUsername());
+            return toAjax(docInfoService.insertDocInfo(docInfo));
         } catch (Exception e) {
             log.error("文件上传失败:", e);
             return error(e.getMessage());
@@ -126,6 +135,7 @@ public class DocInfoController extends BaseController {
     @Log(title = "文件基本信息表", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@RequestBody DocInfo docInfo) {
+        docInfo.setUpdateBy(SecurityUtils.getUsername());
         return toAjax(docInfoService.updateDocInfo(docInfo));
     }
 
@@ -137,6 +147,10 @@ public class DocInfoController extends BaseController {
     @Log(title = "文件基本信息表", businessType = BusinessType.DELETE)
     @DeleteMapping("/{docIds}")
     public AjaxResult remove(@PathVariable Long[] docIds) {
+        for (Long docId : docIds) {
+            DocInfo info = docInfoService.selectDocInfoByDocId(docId);
+            mongoService.removeFile(info.getFileId());
+        }
         return toAjax(docInfoService.deleteDocInfoByDocIds(docIds));
     }
 }

+ 44 - 39
doc-biz/src/main/java/com/doc/biz/domain/DocActor.java

@@ -1,86 +1,91 @@
 package com.doc.biz.domain;
 
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文档协作对象 doc_actor
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocActor", description = "文档协作")
-public class DocActor extends BaseEntity
-{
+public class DocActor extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 自增ID */
+    /**
+     * 自增ID
+     */
+    @ApiModelProperty("自增ID")
     private Long autoId;
 
-    /** 文件ID */
+    /**
+     * 文件ID
+     */
+    @ApiModelProperty("文件ID")
     private Long docId;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
     private Long userId;
 
-    /** 是否完成;Y.完成 N.未完成 */
-    @Excel(name = "是否完成;Y.完成 N.未完成")
-    @ApiModelProperty("是否完成;Y.完成 N.未完成")
+    /**
+     * 是否完成
+     */
+    @ApiModelProperty("是否完成")
+    @Excel(name = "是否完成")
     private String isCompleted;
 
-    public void setAutoId(Long autoId) 
-    {
+    public void setAutoId(Long autoId) {
         this.autoId = autoId;
     }
 
-    public Long getAutoId() 
-    {
+    public Long getAutoId() {
         return autoId;
     }
-    public void setDocId(Long docId) 
-    {
+
+    public void setDocId(Long docId) {
         this.docId = docId;
     }
 
-    public Long getDocId() 
-    {
+    public Long getDocId() {
         return docId;
     }
-    public void setUserId(Long userId) 
-    {
+
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId() 
-    {
+    public Long getUserId() {
         return userId;
     }
-    public void setIsCompleted(String isCompleted) 
-    {
+
+    public void setIsCompleted(String isCompleted) {
         this.isCompleted = isCompleted;
     }
 
-    public String getIsCompleted() 
-    {
+    public String getIsCompleted() {
         return isCompleted;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("autoId", getAutoId())
-            .append("docId", getDocId())
-            .append("userId", getUserId())
-            .append("isCompleted", getIsCompleted())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("autoId", getAutoId())
+                .append("docId", getDocId())
+                .append("userId", getUserId())
+                .append("isCompleted", getIsCompleted())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 60 - 53
doc-biz/src/main/java/com/doc/biz/domain/DocDir.java

@@ -1,117 +1,124 @@
 package com.doc.biz.domain;
 
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.TreeEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.TreeEntity;
 
 /**
  * 文档目录管理对象 doc_dir
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocDir", description = "文档目录管理")
-public class DocDir extends TreeEntity
-{
+public class DocDir extends TreeEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 目录ID */
+    /**
+     * 目录ID
+     */
+    @ApiModelProperty("目录ID")
     private Long dirId;
 
-    /** 空间ID */
+    /**
+     * 空间ID
+     */
+    @ApiModelProperty("空间ID")
     private Long spaceId;
 
-    /** 目录类型 */
-    @Excel(name = "目录类型")
+    /**
+     * 目录类型
+     */
     @ApiModelProperty("目录类型")
+    @Excel(name = "目录类型")
     private String dirType;
 
-    /** 目录权限 */
-    @Excel(name = "目录权限")
+    /**
+     * 目录权限
+     */
     @ApiModelProperty("目录权限")
+    @Excel(name = "目录权限")
     private String dirRole;
 
-    /** 目录名称 */
-    @Excel(name = "目录名称")
+    /**
+     * 目录名称
+     */
     @ApiModelProperty("目录名称")
+    @Excel(name = "目录名称")
     private String dirName;
 
-    /** 目录路径 */
+    /**
+     * 目录路径
+     */
+    @ApiModelProperty("目录路径")
     private String dirPath;
 
-    public void setDirId(Long dirId) 
-    {
+    public void setDirId(Long dirId) {
         this.dirId = dirId;
     }
 
-    public Long getDirId() 
-    {
+    public Long getDirId() {
         return dirId;
     }
-    public void setSpaceId(Long spaceId) 
-    {
+
+    public void setSpaceId(Long spaceId) {
         this.spaceId = spaceId;
     }
 
-    public Long getSpaceId() 
-    {
+    public Long getSpaceId() {
         return spaceId;
     }
-    public void setDirType(String dirType) 
-    {
+
+    public void setDirType(String dirType) {
         this.dirType = dirType;
     }
 
-    public String getDirType() 
-    {
+    public String getDirType() {
         return dirType;
     }
-    public void setDirRole(String dirRole) 
-    {
+
+    public void setDirRole(String dirRole) {
         this.dirRole = dirRole;
     }
 
-    public String getDirRole() 
-    {
+    public String getDirRole() {
         return dirRole;
     }
-    public void setDirName(String dirName) 
-    {
+
+    public void setDirName(String dirName) {
         this.dirName = dirName;
     }
 
-    public String getDirName() 
-    {
+    public String getDirName() {
         return dirName;
     }
-    public void setDirPath(String dirPath) 
-    {
+
+    public void setDirPath(String dirPath) {
         this.dirPath = dirPath;
     }
 
-    public String getDirPath() 
-    {
+    public String getDirPath() {
         return dirPath;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("dirId", getDirId())
-            .append("spaceId", getSpaceId())
-            .append("dirType", getDirType())
-            .append("dirRole", getDirRole())
-            .append("dirName", getDirName())
-            .append("parentId", getParentId())
-            .append("dirPath", getDirPath())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("dirId", getDirId())
+                .append("spaceId", getSpaceId())
+                .append("dirType", getDirType())
+                .append("dirRole", getDirRole())
+                .append("dirName", getDirName())
+                .append("parentId", getParentId())
+                .append("dirPath", getDirPath())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 43 - 38
doc-biz/src/main/java/com/doc/biz/domain/DocDirUser.java

@@ -1,86 +1,91 @@
 package com.doc.biz.domain;
 
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 组织目录成员对象 doc_dir_user
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocDirUser", description = "组织目录成员")
-public class DocDirUser extends BaseEntity
-{
+public class DocDirUser extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 自增ID */
+    /**
+     * 自增ID
+     */
+    @ApiModelProperty("自增ID")
     private Long autoId;
 
-    /** 目录ID */
+    /**
+     * 目录ID
+     */
+    @ApiModelProperty("目录ID")
     private Long dirId;
 
-    /** 用户ID */
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
     private Long userId;
 
-    /** 是否管理员 */
-    @Excel(name = "是否管理员")
+    /**
+     * 是否管理员
+     */
     @ApiModelProperty("是否管理员")
+    @Excel(name = "是否管理员")
     private String isManager;
 
-    public void setAutoId(Long autoId) 
-    {
+    public void setAutoId(Long autoId) {
         this.autoId = autoId;
     }
 
-    public Long getAutoId() 
-    {
+    public Long getAutoId() {
         return autoId;
     }
-    public void setDirId(Long dirId) 
-    {
+
+    public void setDirId(Long dirId) {
         this.dirId = dirId;
     }
 
-    public Long getDirId() 
-    {
+    public Long getDirId() {
         return dirId;
     }
-    public void setUserId(Long userId) 
-    {
+
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId() 
-    {
+    public Long getUserId() {
         return userId;
     }
-    public void setIsManager(String isManager) 
-    {
+
+    public void setIsManager(String isManager) {
         this.isManager = isManager;
     }
 
-    public String getIsManager() 
-    {
+    public String getIsManager() {
         return isManager;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("autoId", getAutoId())
-            .append("dirId", getDirId())
-            .append("userId", getUserId())
-            .append("isManager", getIsManager())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("autoId", getAutoId())
+                .append("dirId", getDirId())
+                .append("userId", getUserId())
+                .append("isManager", getIsManager())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 51 - 44
doc-biz/src/main/java/com/doc/biz/domain/DocFavorite.java

@@ -1,99 +1,106 @@
 package com.doc.biz.domain;
 
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文件收藏对象 doc_favorite
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocFavorite", description = "文件收藏")
-public class DocFavorite extends BaseEntity
-{
+public class DocFavorite extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 收藏ID */
+    /**
+     * 收藏ID
+     */
+    @ApiModelProperty("收藏ID")
     private Long favoriteId;
 
-    /** 标签ID */
+    /**
+     * 标签ID
+     */
+    @ApiModelProperty("标签ID")
     private Long labelId;
 
-    /** 是否文件夹 */
-    @Excel(name = "是否文件夹")
+    /**
+     * 是否文件夹
+     */
     @ApiModelProperty("是否文件夹")
+    @Excel(name = "是否文件夹")
     private String isFolder;
 
-    /** 文件夹/文档ID */
+    /**
+     * 文件夹/文档ID
+     */
+    @ApiModelProperty("文件夹/文档ID")
     private Long relaId;
 
-    /** 所有人 */
+    /**
+     * 所有人
+     */
+    @ApiModelProperty("所有人")
     private Long owner;
 
-    public void setFavoriteId(Long favoriteId) 
-    {
+    public void setFavoriteId(Long favoriteId) {
         this.favoriteId = favoriteId;
     }
 
-    public Long getFavoriteId() 
-    {
+    public Long getFavoriteId() {
         return favoriteId;
     }
-    public void setLabelId(Long labelId) 
-    {
+
+    public void setLabelId(Long labelId) {
         this.labelId = labelId;
     }
 
-    public Long getLabelId() 
-    {
+    public Long getLabelId() {
         return labelId;
     }
-    public void setIsFolder(String isFolder) 
-    {
+
+    public void setIsFolder(String isFolder) {
         this.isFolder = isFolder;
     }
 
-    public String getIsFolder() 
-    {
+    public String getIsFolder() {
         return isFolder;
     }
-    public void setRelaId(Long relaId) 
-    {
+
+    public void setRelaId(Long relaId) {
         this.relaId = relaId;
     }
 
-    public Long getRelaId() 
-    {
+    public Long getRelaId() {
         return relaId;
     }
-    public void setOwner(Long owner) 
-    {
+
+    public void setOwner(Long owner) {
         this.owner = owner;
     }
 
-    public Long getOwner() 
-    {
+    public Long getOwner() {
         return owner;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("favoriteId", getFavoriteId())
-            .append("labelId", getLabelId())
-            .append("isFolder", getIsFolder())
-            .append("relaId", getRelaId())
-            .append("owner", getOwner())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("favoriteId", getFavoriteId())
+                .append("labelId", getLabelId())
+                .append("isFolder", getIsFolder())
+                .append("relaId", getRelaId())
+                .append("owner", getOwner())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 34 - 31
doc-biz/src/main/java/com/doc/biz/domain/DocFavoriteLabel.java

@@ -1,71 +1,74 @@
 package com.doc.biz.domain;
 
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文件收藏标签对象 doc_favorite_label
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocFavoriteLabel", description = "文件收藏标签")
-public class DocFavoriteLabel extends BaseEntity
-{
+public class DocFavoriteLabel extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 收藏标签ID */
+    /**
+     * 收藏标签ID
+     */
+    @ApiModelProperty("收藏标签ID")
     private Long labelId;
 
-    /** 标签名 */
+    /**
+     * 标签名
+     */
+    @ApiModelProperty("标签名")
     private String labelName;
 
-    /** 所有人 */
+    /**
+     * 所有人
+     */
+    @ApiModelProperty("所有人")
     private Long owner;
 
-    public void setLabelId(Long labelId) 
-    {
+    public void setLabelId(Long labelId) {
         this.labelId = labelId;
     }
 
-    public Long getLabelId() 
-    {
+    public Long getLabelId() {
         return labelId;
     }
-    public void setLabelName(String labelName) 
-    {
+
+    public void setLabelName(String labelName) {
         this.labelName = labelName;
     }
 
-    public String getLabelName() 
-    {
+    public String getLabelName() {
         return labelName;
     }
-    public void setOwner(Long owner) 
-    {
+
+    public void setOwner(Long owner) {
         this.owner = owner;
     }
 
-    public Long getOwner() 
-    {
+    public Long getOwner() {
         return owner;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("labelId", getLabelId())
-            .append("labelName", getLabelName())
-            .append("owner", getOwner())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("labelId", getLabelId())
+                .append("labelName", getLabelName())
+                .append("owner", getOwner())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 66 - 55
doc-biz/src/main/java/com/doc/biz/domain/DocInfo.java

@@ -1,123 +1,134 @@
 package com.doc.biz.domain;
 
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文件基本信息表对象 doc_info
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocInfo", description = "文件基本信息表")
-public class DocInfo extends BaseEntity
-{
+public class DocInfo extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 文件ID */
+    /**
+     * 文件ID
+     */
+    @ApiModelProperty("文件ID")
     private Long docId;
 
-    /** 空间ID */
+    /**
+     * 空间ID
+     */
+    @ApiModelProperty("空间ID")
     private Long spaceId;
 
-    /** 目录ID */
+    /**
+     * 目录ID
+     */
+    @ApiModelProperty("目录ID")
     private Long dirId;
 
-    /** 文件名称 */
+    /**
+     * 文件名称
+     */
+    @ApiModelProperty("文件名称")
     private String fileName;
 
-    /** 文件ID */
+    /**
+     * 文件ID
+     */
+    @ApiModelProperty("文件ID")
     private String fileId;
 
-    /** 文件大小 */
+    /**
+     * 文件大小
+     */
+    @ApiModelProperty("文件大小")
     private Long fileSize;
 
-    /** 文件类型 */
+    /**
+     * 文件类型
+     */
+    @ApiModelProperty("文件类型")
     private String fileType;
 
-    public void setDocId(Long docId) 
-    {
+    public void setDocId(Long docId) {
         this.docId = docId;
     }
 
-    public Long getDocId() 
-    {
+    public Long getDocId() {
         return docId;
     }
-    public void setSpaceId(Long spaceId) 
-    {
+
+    public void setSpaceId(Long spaceId) {
         this.spaceId = spaceId;
     }
 
-    public Long getSpaceId() 
-    {
+    public Long getSpaceId() {
         return spaceId;
     }
-    public void setDirId(Long dirId) 
-    {
+
+    public void setDirId(Long dirId) {
         this.dirId = dirId;
     }
 
-    public Long getDirId() 
-    {
+    public Long getDirId() {
         return dirId;
     }
-    public void setFileName(String fileName) 
-    {
+
+    public void setFileName(String fileName) {
         this.fileName = fileName;
     }
 
-    public String getFileName() 
-    {
+    public String getFileName() {
         return fileName;
     }
-    public void setFileId(String fileId) 
-    {
+
+    public void setFileId(String fileId) {
         this.fileId = fileId;
     }
 
-    public String getFileId() 
-    {
+    public String getFileId() {
         return fileId;
     }
-    public void setFileSize(Long fileSize) 
-    {
+
+    public void setFileSize(Long fileSize) {
         this.fileSize = fileSize;
     }
 
-    public Long getFileSize() 
-    {
+    public Long getFileSize() {
         return fileSize;
     }
-    public void setFileType(String fileType) 
-    {
+
+    public void setFileType(String fileType) {
         this.fileType = fileType;
     }
 
-    public String getFileType() 
-    {
+    public String getFileType() {
         return fileType;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("docId", getDocId())
-            .append("spaceId", getSpaceId())
-            .append("dirId", getDirId())
-            .append("fileName", getFileName())
-            .append("fileId", getFileId())
-            .append("fileSize", getFileSize())
-            .append("fileType", getFileType())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("docId", getDocId())
+                .append("spaceId", getSpaceId())
+                .append("dirId", getDirId())
+                .append("fileName", getFileName())
+                .append("fileId", getFileId())
+                .append("fileSize", getFileSize())
+                .append("fileType", getFileType())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 50 - 43
doc-biz/src/main/java/com/doc/biz/domain/DocMsg.java

@@ -1,97 +1,104 @@
 package com.doc.biz.domain;
 
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 消息管理对象 doc_msg
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocMsg", description = "消息管理")
-public class DocMsg extends BaseEntity
-{
+public class DocMsg extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 消息ID */
+    /**
+     * 消息ID
+     */
+    @ApiModelProperty("消息ID")
     private Long msgId;
 
-    /** 发送方用户ID */
+    /**
+     * 发送方用户ID
+     */
+    @ApiModelProperty("发送方用户ID")
     private String senderId;
 
-    /** 接受方用户ID */
+    /**
+     * 接受方用户ID
+     */
+    @ApiModelProperty("接受方用户ID")
     private String receiverId;
 
-    /** 消息内容 */
+    /**
+     * 消息内容
+     */
+    @ApiModelProperty("消息内容")
     private String msgContent;
 
-    /** 文件列表 */
+    /**
+     * 文件列表
+     */
+    @ApiModelProperty("文件列表")
     private String msgFiles;
 
-    public void setMsgId(Long msgId) 
-    {
+    public void setMsgId(Long msgId) {
         this.msgId = msgId;
     }
 
-    public Long getMsgId() 
-    {
+    public Long getMsgId() {
         return msgId;
     }
-    public void setSenderId(String senderId) 
-    {
+
+    public void setSenderId(String senderId) {
         this.senderId = senderId;
     }
 
-    public String getSenderId() 
-    {
+    public String getSenderId() {
         return senderId;
     }
-    public void setReceiverId(String receiverId) 
-    {
+
+    public void setReceiverId(String receiverId) {
         this.receiverId = receiverId;
     }
 
-    public String getReceiverId() 
-    {
+    public String getReceiverId() {
         return receiverId;
     }
-    public void setMsgContent(String msgContent) 
-    {
+
+    public void setMsgContent(String msgContent) {
         this.msgContent = msgContent;
     }
 
-    public String getMsgContent() 
-    {
+    public String getMsgContent() {
         return msgContent;
     }
-    public void setMsgFiles(String msgFiles) 
-    {
+
+    public void setMsgFiles(String msgFiles) {
         this.msgFiles = msgFiles;
     }
 
-    public String getMsgFiles() 
-    {
+    public String getMsgFiles() {
         return msgFiles;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("msgId", getMsgId())
-            .append("senderId", getSenderId())
-            .append("receiverId", getReceiverId())
-            .append("msgContent", getMsgContent())
-            .append("msgFiles", getMsgFiles())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("msgId", getMsgId())
+                .append("senderId", getSenderId())
+                .append("receiverId", getReceiverId())
+                .append("msgContent", getMsgContent())
+                .append("msgFiles", getMsgFiles())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 42 - 37
doc-biz/src/main/java/com/doc/biz/domain/DocRecent.java

@@ -1,84 +1,89 @@
 package com.doc.biz.domain;
 
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 最近文件对象 doc_recent
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocRecent", description = "最近文件")
-public class DocRecent extends BaseEntity
-{
+public class DocRecent extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 自增ID */
+    /**
+     * 自增ID
+     */
+    @ApiModelProperty("自增ID")
     private Long recentId;
 
-    /** 是否文件夹 */
+    /**
+     * 是否文件夹
+     */
+    @ApiModelProperty("是否文件夹")
     private String isFolder;
 
-    /** 文件夹/文档ID */
+    /**
+     * 文件夹/文档ID
+     */
+    @ApiModelProperty("文件夹/文档ID")
     private Long relaId;
 
-    /** 所有人 */
+    /**
+     * 所有人
+     */
+    @ApiModelProperty("所有人")
     private Long owner;
 
-    public void setRecentId(Long recentId) 
-    {
+    public void setRecentId(Long recentId) {
         this.recentId = recentId;
     }
 
-    public Long getRecentId() 
-    {
+    public Long getRecentId() {
         return recentId;
     }
-    public void setIsFolder(String isFolder) 
-    {
+
+    public void setIsFolder(String isFolder) {
         this.isFolder = isFolder;
     }
 
-    public String getIsFolder() 
-    {
+    public String getIsFolder() {
         return isFolder;
     }
-    public void setRelaId(Long relaId) 
-    {
+
+    public void setRelaId(Long relaId) {
         this.relaId = relaId;
     }
 
-    public Long getRelaId() 
-    {
+    public Long getRelaId() {
         return relaId;
     }
-    public void setOwner(Long owner) 
-    {
+
+    public void setOwner(Long owner) {
         this.owner = owner;
     }
 
-    public Long getOwner() 
-    {
+    public Long getOwner() {
         return owner;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("recentId", getRecentId())
-            .append("isFolder", getIsFolder())
-            .append("relaId", getRelaId())
-            .append("owner", getOwner())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("recentId", getRecentId())
+                .append("isFolder", getIsFolder())
+                .append("relaId", getRelaId())
+                .append("owner", getOwner())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 43 - 38
doc-biz/src/main/java/com/doc/biz/domain/DocShare.java

@@ -1,86 +1,91 @@
 package com.doc.biz.domain;
 
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文档分享对象 doc_share
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocShare", description = "文档分享")
-public class DocShare extends BaseEntity
-{
+public class DocShare extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 分享ID */
+    /**
+     * 分享ID
+     */
+    @ApiModelProperty("分享ID")
     private Long shareId;
 
-    /** 文件ID */
+    /**
+     * 文件ID
+     */
+    @ApiModelProperty("文件ID")
     private Long docId;
 
-    /** 分享人员 */
+    /**
+     * 分享人员
+     */
+    @ApiModelProperty("分享人员")
     private Long userId;
 
-    /** 人员名称 */
-    @Excel(name = "人员名称")
+    /**
+     * 人员名称
+     */
     @ApiModelProperty("人员名称")
+    @Excel(name = "人员名称")
     private String userName;
 
-    public void setShareId(Long shareId) 
-    {
+    public void setShareId(Long shareId) {
         this.shareId = shareId;
     }
 
-    public Long getShareId() 
-    {
+    public Long getShareId() {
         return shareId;
     }
-    public void setDocId(Long docId) 
-    {
+
+    public void setDocId(Long docId) {
         this.docId = docId;
     }
 
-    public Long getDocId() 
-    {
+    public Long getDocId() {
         return docId;
     }
-    public void setUserId(Long userId) 
-    {
+
+    public void setUserId(Long userId) {
         this.userId = userId;
     }
 
-    public Long getUserId() 
-    {
+    public Long getUserId() {
         return userId;
     }
-    public void setUserName(String userName) 
-    {
+
+    public void setUserName(String userName) {
         this.userName = userName;
     }
 
-    public String getUserName() 
-    {
+    public String getUserName() {
         return userName;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("shareId", getShareId())
-            .append("docId", getDocId())
-            .append("userId", getUserId())
-            .append("userName", getUserName())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("shareId", getShareId())
+                .append("docId", getDocId())
+                .append("userId", getUserId())
+                .append("userName", getUserName())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 73 - 58
doc-biz/src/main/java/com/doc/biz/domain/DocSpace.java

@@ -1,128 +1,143 @@
 package com.doc.biz.domain;
 
-import java.math.BigDecimal;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 文档空间管理对象 doc_space
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocSpace", description = "文档空间管理")
-public class DocSpace extends BaseEntity
-{
+public class DocSpace extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 空间ID */
+    /**
+     * 空间ID
+     */
+    @ApiModelProperty("空间ID")
     private Long spaceId;
 
-    /** 空间类型 */
-    @Excel(name = "空间类型")
+    /**
+     * 空间类型
+     */
     @ApiModelProperty("空间类型")
+    @Excel(name = "空间类型")
     private String spaceType;
 
-    /** 空间名称 */
-    @Excel(name = "空间名称")
+    /**
+     * 空间名称
+     */
     @ApiModelProperty("空间名称")
+    @Excel(name = "空间名称")
     private String spaceName;
 
-    /** 空间容量 */
+    /**
+     * 空间容量
+     */
+    @ApiModelProperty("空间容量")
+    @Excel(name = "空间容量")
     private BigDecimal spaceCap;
 
-    /** 已使用空间容量 */
+    /**
+     * 已使用空间容量
+     */
+    @ApiModelProperty("已使用空间容量")
+    @Excel(name = "已使用空间容量")
     private BigDecimal usedCap;
 
-    /** 剩余空间容量 */
+    /**
+     * 剩余空间容量
+     */
+    @ApiModelProperty("剩余空间容量")
+    @Excel(name = "剩余空间容量")
     private BigDecimal freeCap;
 
-    /** 空间归属 */
+    /**
+     * 空间归属
+     */
+    @ApiModelProperty("空间归属")
+    @Excel(name = "空间归属")
     private Long owner;
 
-    public void setSpaceId(Long spaceId) 
-    {
+    public void setSpaceId(Long spaceId) {
         this.spaceId = spaceId;
     }
 
-    public Long getSpaceId() 
-    {
+    public Long getSpaceId() {
         return spaceId;
     }
-    public void setSpaceType(String spaceType) 
-    {
+
+    public void setSpaceType(String spaceType) {
         this.spaceType = spaceType;
     }
 
-    public String getSpaceType() 
-    {
+    public String getSpaceType() {
         return spaceType;
     }
-    public void setSpaceName(String spaceName) 
-    {
+
+    public void setSpaceName(String spaceName) {
         this.spaceName = spaceName;
     }
 
-    public String getSpaceName() 
-    {
+    public String getSpaceName() {
         return spaceName;
     }
-    public void setSpaceCap(BigDecimal spaceCap) 
-    {
+
+    public void setSpaceCap(BigDecimal spaceCap) {
         this.spaceCap = spaceCap;
     }
 
-    public BigDecimal getSpaceCap() 
-    {
+    public BigDecimal getSpaceCap() {
         return spaceCap;
     }
-    public void setUsedCap(BigDecimal usedCap) 
-    {
+
+    public void setUsedCap(BigDecimal usedCap) {
         this.usedCap = usedCap;
     }
 
-    public BigDecimal getUsedCap() 
-    {
+    public BigDecimal getUsedCap() {
         return usedCap;
     }
-    public void setFreeCap(BigDecimal freeCap) 
-    {
+
+    public void setFreeCap(BigDecimal freeCap) {
         this.freeCap = freeCap;
     }
 
-    public BigDecimal getFreeCap() 
-    {
+    public BigDecimal getFreeCap() {
         return freeCap;
     }
-    public void setOwner(Long owner) 
-    {
+
+    public void setOwner(Long owner) {
         this.owner = owner;
     }
 
-    public Long getOwner() 
-    {
+    public Long getOwner() {
         return owner;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("spaceId", getSpaceId())
-            .append("spaceType", getSpaceType())
-            .append("spaceName", getSpaceName())
-            .append("spaceCap", getSpaceCap())
-            .append("usedCap", getUsedCap())
-            .append("freeCap", getFreeCap())
-            .append("owner", getOwner())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("spaceId", getSpaceId())
+                .append("spaceType", getSpaceType())
+                .append("spaceName", getSpaceName())
+                .append("spaceCap", getSpaceCap())
+                .append("usedCap", getUsedCap())
+                .append("freeCap", getFreeCap())
+                .append("owner", getOwner())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 61 - 54
doc-biz/src/main/java/com/doc/biz/domain/DocSpaceExpansion.java

@@ -1,119 +1,126 @@
 package com.doc.biz.domain;
 
-import java.math.BigDecimal;
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
+
+import java.math.BigDecimal;
 
 /**
  * 空间扩容管理对象 doc_space_expansion
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocSpaceExpansion", description = "空间扩容管理")
-public class DocSpaceExpansion extends BaseEntity
-{
+public class DocSpaceExpansion extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 自增ID */
+    /**
+     * 自增ID
+     */
+    @ApiModelProperty("自增ID")
     private Long autoId;
 
-    /** 空间ID */
+    /**
+     * 空间ID
+     */
+    @ApiModelProperty("空间ID")
     private Long spaceId;
 
-    /** 空间名称 */
-    @Excel(name = "空间名称")
+    /**
+     * 空间名称
+     */
     @ApiModelProperty("空间名称")
+    @Excel(name = "空间名称")
     private String spaceName;
 
-    /** 当前容量 */
-    @Excel(name = "当前容量")
+    /**
+     * 当前容量
+     */
     @ApiModelProperty("当前容量")
+    @Excel(name = "当前容量")
     private BigDecimal currentCap;
 
-    /** 申请扩充容量 */
-    @Excel(name = "申请扩充容量")
+    /**
+     * 申请扩充容量
+     */
     @ApiModelProperty("申请扩充容量")
+    @Excel(name = "申请扩充容量")
     private Long expandCap;
 
-    /** 扩容原因 */
-    @Excel(name = "扩容原因")
+    /**
+     * 扩容原因
+     */
     @ApiModelProperty("扩容原因")
+    @Excel(name = "扩容原因")
     private String expandReson;
 
-    public void setAutoId(Long autoId) 
-    {
+    public void setAutoId(Long autoId) {
         this.autoId = autoId;
     }
 
-    public Long getAutoId() 
-    {
+    public Long getAutoId() {
         return autoId;
     }
-    public void setSpaceId(Long spaceId) 
-    {
+
+    public void setSpaceId(Long spaceId) {
         this.spaceId = spaceId;
     }
 
-    public Long getSpaceId() 
-    {
+    public Long getSpaceId() {
         return spaceId;
     }
-    public void setSpaceName(String spaceName) 
-    {
+
+    public void setSpaceName(String spaceName) {
         this.spaceName = spaceName;
     }
 
-    public String getSpaceName() 
-    {
+    public String getSpaceName() {
         return spaceName;
     }
-    public void setCurrentCap(BigDecimal currentCap) 
-    {
+
+    public void setCurrentCap(BigDecimal currentCap) {
         this.currentCap = currentCap;
     }
 
-    public BigDecimal getCurrentCap() 
-    {
+    public BigDecimal getCurrentCap() {
         return currentCap;
     }
-    public void setExpandCap(Long expandCap) 
-    {
+
+    public void setExpandCap(Long expandCap) {
         this.expandCap = expandCap;
     }
 
-    public Long getExpandCap() 
-    {
+    public Long getExpandCap() {
         return expandCap;
     }
-    public void setExpandReson(String expandReson) 
-    {
+
+    public void setExpandReson(String expandReson) {
         this.expandReson = expandReson;
     }
 
-    public String getExpandReson() 
-    {
+    public String getExpandReson() {
         return expandReson;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("autoId", getAutoId())
-            .append("spaceId", getSpaceId())
-            .append("spaceName", getSpaceName())
-            .append("currentCap", getCurrentCap())
-            .append("expandCap", getExpandCap())
-            .append("expandReson", getExpandReson())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("autoId", getAutoId())
+                .append("spaceId", getSpaceId())
+                .append("spaceName", getSpaceName())
+                .append("currentCap", getCurrentCap())
+                .append("expandCap", getExpandCap())
+                .append("expandReson", getExpandReson())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 25 - 26
doc-biz/src/main/java/com/doc/biz/domain/DocTransfer.java

@@ -1,60 +1,59 @@
 package com.doc.biz.domain;
 
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文件传输对象 doc_transfer
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocTransfer", description = "文件传输")
-public class DocTransfer extends BaseEntity
-{
+public class DocTransfer extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 传输ID */
+    /**
+     * 传输ID
+     */
+    @ApiModelProperty("传输ID")
     private Long tranId;
 
-    /** 文件ID */
-    @Excel(name = "文件ID")
+    /**
+     * 文件ID
+     */
     @ApiModelProperty("文件ID")
     private Long docId;
 
-    public void setTranId(Long tranId) 
-    {
+    public void setTranId(Long tranId) {
         this.tranId = tranId;
     }
 
-    public Long getTranId() 
-    {
+    public Long getTranId() {
         return tranId;
     }
-    public void setDocId(Long docId) 
-    {
+
+    public void setDocId(Long docId) {
         this.docId = docId;
     }
 
-    public Long getDocId() 
-    {
+    public Long getDocId() {
         return docId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("tranId", getTranId())
-            .append("docId", getDocId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("tranId", getTranId())
+                .append("docId", getDocId())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 35 - 32
doc-biz/src/main/java/com/doc/biz/domain/DocVersion.java

@@ -1,73 +1,76 @@
 package com.doc.biz.domain;
 
+import com.doc.common.annotation.Excel;
+import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
-import com.doc.common.annotation.Excel;
-import com.doc.common.core.domain.BaseEntity;
 
 /**
  * 文档版本信息对象 doc_version
- * 
+ *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-08-18
  */
 @ApiModel(value = "DocVersion", description = "文档版本信息")
-public class DocVersion extends BaseEntity
-{
+public class DocVersion extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
-    /** 自增ID */
+    /**
+     * 自增ID
+     */
+    @ApiModelProperty("自增ID")
     private Long versionId;
 
-    /** 文档ID */
+    /**
+     * 文档ID
+     */
+    @ApiModelProperty("文档ID")
     private Long docId;
 
-    /** 文件存储ID */
-    @Excel(name = "文件存储ID")
+    /**
+     * 文件存储ID
+     */
     @ApiModelProperty("文件存储ID")
+    @Excel(name = "文件存储ID")
     private String fileId;
 
-    public void setVersionId(Long versionId) 
-    {
+    public void setVersionId(Long versionId) {
         this.versionId = versionId;
     }
 
-    public Long getVersionId() 
-    {
+    public Long getVersionId() {
         return versionId;
     }
-    public void setDocId(Long docId) 
-    {
+
+    public void setDocId(Long docId) {
         this.docId = docId;
     }
 
-    public Long getDocId() 
-    {
+    public Long getDocId() {
         return docId;
     }
-    public void setFileId(String fileId) 
-    {
+
+    public void setFileId(String fileId) {
         this.fileId = fileId;
     }
 
-    public String getFileId() 
-    {
+    public String getFileId() {
         return fileId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("versionId", getVersionId())
-            .append("docId", getDocId())
-            .append("fileId", getFileId())
-            .append("createBy", getCreateBy())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateTime", getUpdateTime())
-            .append("remark", getRemark())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("versionId", getVersionId())
+                .append("docId", getDocId())
+                .append("fileId", getFileId())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
+                .toString();
     }
 }

+ 8 - 7
doc-biz/src/main/java/com/doc/biz/service/impl/DocInfoServiceImpl.java

@@ -1,12 +1,13 @@
 package com.doc.biz.service.impl;
 
-import java.util.List;
-        import com.doc.common.utils.DateUtils;
-import org.springframework.stereotype.Service;
-import com.doc.biz.mapper.DocInfoMapper;
 import com.doc.biz.domain.DocInfo;
+import com.doc.biz.mapper.DocInfoMapper;
 import com.doc.biz.service.IDocInfoService;
+import com.doc.common.utils.DateUtils;
+import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+import java.util.List;
 
 /**
  * 文件基本信息表Service业务层处理
@@ -49,8 +50,8 @@ public class DocInfoServiceImpl implements IDocInfoService {
      */
     @Override
     public int insertDocInfo(DocInfo docInfo) {
-                docInfo.setCreateTime(DateUtils.getNowDate());
-            return docInfoMapper.insertDocInfo(docInfo);
+        docInfo.setCreateTime(DateUtils.getNowDate());
+        return docInfoMapper.insertDocInfo(docInfo);
     }
 
     /**
@@ -61,7 +62,7 @@ public class DocInfoServiceImpl implements IDocInfoService {
      */
     @Override
     public int updateDocInfo(DocInfo docInfo) {
-                docInfo.setUpdateTime(DateUtils.getNowDate());
+        docInfo.setUpdateTime(DateUtils.getNowDate());
         return docInfoMapper.updateDocInfo(docInfo);
     }