处理文件分享和协作编辑相关，

doc-admin/src/test/java/com/test/DocTest.java

@@ -1,15 +1,19 @@
 package com.test;
 
 import com.doc.RuoYiApplication;
-import com.doc.biz.domain.DocDir;
 import com.doc.biz.service.IDocDirService;
+import com.doc.common.utils.file.FileUtils;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.List;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
 
 /**
  * Test$
@@ -24,8 +28,18 @@ public class DocTest {
     IDocDirService dirService;
 
     @Test
-    public void test() {
+    public void test() throws FileNotFoundException {
+
+        File f = ResourceUtils.getFile("classpath:file/new.docx");
+        FileInputStream is = new FileInputStream(f);
+        MultipartFile ff = FileUtils.getMultipartFile(is, "wddd");
+        FileUtils.getMultipartFile(is, "xxx");
 //        List<DocDir> list = dirService.selectDirByUser(1L);
 //        list.forEach(System.out::println);
     }
+
+    public static void main(String[] args) throws FileNotFoundException {
+        File f = new File("D:\\SYSTEM\\Desktop\\temp\\doc\\word.docx");
+        FileInputStream is = new FileInputStream(f);
+    }
 }

doc-biz/src/main/java/com/doc/biz/controller/DocActorController.java

@@ -1,7 +1,9 @@
 package com.doc.biz.controller;
 
 import com.doc.biz.domain.DocActor;
+import com.doc.biz.domain.DocActorUser;
 import com.doc.biz.service.IDocActorService;
+import com.doc.biz.service.IDocActorUserService;
 import com.doc.common.annotation.Log;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
@@ -10,17 +12,20 @@ import com.doc.common.enums.BusinessType;
 import com.doc.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+import java.util.Date;
 import java.util.List;
 
 /**
  * 文档协作Controller
  *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-18
  */
 @Api(tags = "文档协作")
 @RestController
@@ -28,72 +33,113 @@ import java.util.List;
 public class DocActorController extends BaseController {
     @Resource
     private IDocActorService docActorService;
+    @Resource
+    private IDocActorUserService actorUserService;
 
-    /**
-     * 查询文档协作列表
-     */
-    @ApiOperation("查询文档协作列表")
-    //@PreAuthorize("@ss.hasPermi('biz:actor:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocActor docActor) {
-        startPage();
-        List<DocActor> list = docActorService.selectDocActorList(docActor);
-        return getDataTable(list);
+    @ApiOperation("归档")
+    @PutMapping("/{docId}")
+    public AjaxResult put(@ApiParam(value = "文件ID", required = true) @PathVariable(name = "docId") Long docId) {
+        DocActor docActor = new DocActor();
+        docActor.setDocId(docId);
+        docActor.setIsFiled("Y");
+        docActor.setFiledTime(new Date());
+        return AjaxResult.success(docActorService.updateDocActor(docActor));
     }
 
-    /**
-     * 导出文档协作列表
-     */
-    @ApiOperation("导出文档协作列表")
-    //@PreAuthorize("@ss.hasPermi('biz:actor:export')")
-    @Log(title = "文档协作", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DocActor docActor) {
-        List<DocActor> list = docActorService.selectDocActorList(docActor);
-        ExcelUtil<DocActor> util = new ExcelUtil<DocActor>(DocActor.class);
-        util.exportExcel(response, list, "文档协作数据");
+    @ApiOperation("获取已选择人员")
+    @GetMapping("/{docId}")
+    public List<DocActorUser> get(@ApiParam(value = "文件ID", required = true) @PathVariable(name = "docId") Long docId) {
+        DocActorUser actorUser = new DocActorUser();
+        actorUser.setDocId(docId);
+        return actorUserService.selectDocActorUserList(actorUser);
     }
 
-    /**
-     * 获取文档协作详细信息
-     */
-    @ApiOperation("获取文档协作详细信息")
-    //@PreAuthorize("@ss.hasPermi('biz:actor:query')")
-    @GetMapping(value = "/{autoId}")
-    public AjaxResult getInfo(@PathVariable("autoId") Long autoId) {
-        return success(docActorService.selectDocActorByAutoId(autoId));
-    }
+    @ApiOperation("添加协作人员")
+    @PostMapping("/{docId}")
+    public AjaxResult add(@ApiParam(value = "文件ID", required = true) @PathVariable(name = "docId") Long docId, @ApiParam(value = "协作人员", required = true) @RequestBody List<Long> users) {
+        DocActor actor = docActorService.selectDocActorByDocId(docId);
+        if (actor == null) {
+            actor = new DocActor();
+            actor.setDocId(docId);
+            docActorService.insertDocActor(actor);
+        }
+        actorUserService.deleteDocActorUserByDocId(docId);
+        users.forEach(u -> {
+            DocActorUser actorUser = new DocActorUser();
+            actorUser.setUserId(u);
+            actorUser.setDocId(docId);
+            actorUserService.insertDocActorUser(actorUser);
+        });
 
-    /**
-     * 新增文档协作
-     */
-    @ApiOperation("新增文档协作")
-    //@PreAuthorize("@ss.hasPermi('biz:actor:add')")
-    @Log(title = "文档协作", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocActor docActor) {
-        return toAjax(docActorService.insertDocActor(docActor));
+        return success();
     }
 
-    /**
-     * 修改文档协作
-     */
-    @ApiOperation("修改文档协作")
-    //@PreAuthorize("@ss.hasPermi('biz:actor:edit')")
-    @Log(title = "文档协作", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocActor docActor) {
-        return toAjax(docActorService.updateDocActor(docActor));
-    }
-
-    /**
-     * 删除文档协作
-     */
-    @ApiOperation("删除文档协作")
-    //@PreAuthorize("@ss.hasPermi('biz:actor:remove')")
-    @Log(title = "文档协作", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{autoIds}")
-    public AjaxResult remove(@PathVariable Long[] autoIds) {
-        return toAjax(docActorService.deleteDocActorByAutoIds(autoIds));
-    }
+//
+//    /**
+//     * 查询文档协作列表
+//     */
+//    //@ApiOperation("查询文档协作列表")
+//    @PreAuthorize("@ss.hasPermi('biz:actor:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(DocActor docActor) {
+//        startPage();
+//        List<DocActor> list = docActorService.selectDocActorList(docActor);
+//        return getDataTable(list);
+//    }
+//
+//    /**
+//     * 导出文档协作列表
+//     */
+//    //@ApiOperation("导出文档协作列表")
+//    @PreAuthorize("@ss.hasPermi('biz:actor:export')")
+//    @Log(title = "文档协作", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, DocActor docActor) {
+//        List<DocActor> list = docActorService.selectDocActorList(docActor);
+//        ExcelUtil<DocActor> util = new ExcelUtil<DocActor>(DocActor.class);
+//        util.exportExcel(response, list, "文档协作数据");
+//    }
+//
+//    /**
+//     * 获取文档协作详细信息
+//     */
+//    //@ApiOperation("获取文档协作详细信息")
+//    @PreAuthorize("@ss.hasPermi('biz:actor:query')")
+//    @GetMapping(value = "/{docId}")
+//    public AjaxResult getInfo(@PathVariable("docId") Long docId) {
+//        return success(docActorService.selectDocActorByDocId(docId));
+//    }
+//
+//    /**
+//     * 新增文档协作
+//     */
+//    //@ApiOperation("新增文档协作")
+//    @PreAuthorize("@ss.hasPermi('biz:actor:add')")
+//    @Log(title = "文档协作", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody DocActor docActor) {
+//        return toAjax(docActorService.insertDocActor(docActor));
+//    }
+//
+//    /**
+//     * 修改文档协作
+//     */
+//    //@ApiOperation("修改文档协作")
+//    @PreAuthorize("@ss.hasPermi('biz:actor:edit')")
+//    @Log(title = "文档协作", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody DocActor docActor) {
+//        return toAjax(docActorService.updateDocActor(docActor));
+//    }
+//
+//    /**
+//     * 删除文档协作
+//     */
+//    // @ApiOperation("删除文档协作")
+//    @PreAuthorize("@ss.hasPermi('biz:actor:remove')")
+//    @Log(title = "文档协作", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{docIds}")
+//    public AjaxResult remove(@PathVariable Long[] docIds) {
+//        return toAjax(docActorService.deleteDocActorByDocIds(docIds));
+//    }
 }

doc-biz/src/main/java/com/doc/biz/controller/DocActorUserController.java

@@ -0,0 +1,100 @@
+package com.doc.biz.controller;
+
+import com.doc.biz.domain.DocActorUser;
+import com.doc.biz.service.IDocActorUserService;
+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.common.utils.poi.ExcelUtil;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
+/**
+ * 文档协作成员Controller
+ *
+ * @author wukai
+ * @date 2023-09-18
+ */
+//@Api(tags = "文档协作成员")
+@RestController
+@RequestMapping("/biz/actorUser")
+public class DocActorUserController extends BaseController {
+    @Resource
+    private IDocActorUserService docActorUserService;
+
+    /**
+     * 查询文档协作成员列表
+     */
+    //@ApiOperation("查询文档协作成员列表")
+    @PreAuthorize("@ss.hasPermi('biz:actorUser:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DocActorUser docActorUser) {
+        startPage();
+        List<DocActorUser> list = docActorUserService.selectDocActorUserList(docActorUser);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出文档协作成员列表
+     */
+    //@ApiOperation("导出文档协作成员列表")
+    @PreAuthorize("@ss.hasPermi('biz:actorUser:export')")
+    @Log(title = "文档协作成员", businessType = BusinessType.EXPORT)
+    @PostMapping("/export")
+    public void export(HttpServletResponse response, DocActorUser docActorUser) {
+        List<DocActorUser> list = docActorUserService.selectDocActorUserList(docActorUser);
+        ExcelUtil<DocActorUser> util = new ExcelUtil<DocActorUser>(DocActorUser.class);
+        util.exportExcel(response, list, "文档协作成员数据");
+    }
+
+    /**
+     * 获取文档协作成员详细信息
+     */
+    //@ApiOperation("获取文档协作成员详细信息")
+    @PreAuthorize("@ss.hasPermi('biz:actorUser:query')")
+    @GetMapping(value = "/{docId}")
+    public AjaxResult getInfo(@PathVariable("docId") Long docId) {
+        return success(docActorUserService.selectDocActorUserByDocId(docId));
+    }
+
+    /**
+     * 新增文档协作成员
+     */
+    //@ApiOperation("新增文档协作成员")
+    @PreAuthorize("@ss.hasPermi('biz:actorUser:add')")
+    @Log(title = "文档协作成员", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody DocActorUser docActorUser) {
+        return toAjax(docActorUserService.insertDocActorUser(docActorUser));
+    }
+
+    /**
+     * 修改文档协作成员
+     */
+    //@ApiOperation("修改文档协作成员")
+    @PreAuthorize("@ss.hasPermi('biz:actorUser:edit')")
+    @Log(title = "文档协作成员", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody DocActorUser docActorUser) {
+        return toAjax(docActorUserService.updateDocActorUser(docActorUser));
+    }
+
+    /**
+     * 删除文档协作成员
+     */
+    //@ApiOperation("删除文档协作成员")
+    @PreAuthorize("@ss.hasPermi('biz:actorUser:remove')")
+    @Log(title = "文档协作成员", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{docIds}")
+    public AjaxResult remove(@PathVariable Long[] docIds) {
+        return toAjax(docActorUserService.deleteDocActorUserByDocIds(docIds));
+    }
+}

doc-biz/src/main/java/com/doc/biz/controller/DocInfoController.java

@@ -1,11 +1,15 @@
 package com.doc.biz.controller;
 
-import com.doc.biz.domain.*;
-import com.doc.biz.service.*;
+import com.doc.biz.domain.DocDir;
+import com.doc.biz.domain.DocInfo;
+import com.doc.biz.domain.DocSpace;
+import com.doc.biz.domain.EsDocInfo;
+import com.doc.biz.service.IDocDirService;
+import com.doc.biz.service.IDocInfoService;
+import com.doc.biz.service.IEsDocInfoService;
+import com.doc.biz.service.IMongoService;
 import com.doc.biz.vo.DocInfoVO;
 import com.doc.biz.vo.DocumentVO;
-import com.doc.chat.domain.ChatMsg;
-import com.doc.chat.service.IChatMsgService;
 import com.doc.common.annotation.Log;
 import com.doc.common.config.EsConfig;
 import com.doc.common.core.controller.BaseController;
@@ -15,21 +19,23 @@ import com.doc.common.enums.BusinessType;
 import com.doc.common.utils.FileContentUtils;
 import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.bean.BeanUtils;
+import com.doc.common.utils.file.FileUtils;
 import com.doc.common.utils.poi.ExcelUtil;
-import com.doc.system.service.ISysConfigService;
 import io.swagger.annotations.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.elasticsearch.NoSuchIndexException;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.ResponseEntity;
+import org.springframework.util.ResourceUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-import org.yaml.snakeyaml.util.UriEncoder;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.*;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Function;
 
 /**
@@ -52,10 +58,6 @@ public class DocInfoController extends BaseController {
     @Resource
     private EsConfig esConfig;
     @Resource
-    private IDocShareService shareService;
-    @Resource
-    private IChatMsgService msgService;
-    @Resource
     private IDocDirService dirService;
 
     /**
@@ -119,6 +121,46 @@ public class DocInfoController extends BaseController {
     }
 
     /**
+     * 新建文件
+     */
+    @ApiOperation("新建文件")
+    @GetMapping("/create")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "type", value = "文件类型 \"word\":word文档 \"excel\":excel文件 \"ppt\".ppt文件", required = true),
+            @ApiImplicitParam(name = "spaceId", value = "空间ID", required = true),
+            @ApiImplicitParam(name = "dirId", value = "目录ID", required = true)
+    })
+    public AjaxResult create(Long spaceId, Long dirId, String type) {
+        try {
+            File file = null;
+            String fileName = "";
+            switch (type) {
+                case "word":
+                    file = ResourceUtils.getFile("classpath:file/new.docx");
+                    fileName = "新建word文档.docx";
+                    break;
+                case "excel":
+                    file = ResourceUtils.getFile("classpath:file/new.xlsx");
+                    fileName = "新建Excel文档.xlsx";
+                    break;
+                case "ppt":
+                    file = ResourceUtils.getFile("classpath:file/new.pptx");
+                    fileName = "新建ppt文档.pptx";
+                    break;
+            }
+
+            FileInputStream is = new FileInputStream(file);
+            MultipartFile multipartFile = FileUtils.getMultipartFile(is, fileName);
+            DocumentVO vo = mongoService.uploadFile(multipartFile);
+            process(vo, spaceId, dirId);
+            return success();
+        } catch (Exception e) {
+            log.error("新建文件出错啦", e.getMessage());
+            return error("新建文件出错");
+        }
+    }
+
+    /**
      * 文件移动
      */
     @ApiOperation("文件移动")
@@ -149,39 +191,9 @@ public class DocInfoController extends BaseController {
         return success();
     }
 
-    /**
-     * 文件分享
-     */
-    @ApiOperation("文件分享获取详情")
-    @GetMapping("/share/{docId}")
-    public List<DocShare> shareInfo(@ApiParam(value = "文件ID", required = true) @PathVariable(name = "docId") Long docId) {
-        return shareService.selectDocShareListByDocId(docId);
-    }
 
     /**
-     * 文件分享
-     */
-    @ApiOperation("文件分享添加人员")
-    @PostMapping("/share/{docId}")
-    public AjaxResult share(@ApiParam(value = "文件ID", required = true) @PathVariable(name = "docId") Long docId, @ApiParam(value = "分享人员", required = true) @RequestBody List<DocShare> shares) {
-        shareService.deleteDocShareByDocId(docId);
-
-        shares.forEach(s -> {
-            s.setDocId(docId);
-            ChatMsg msg = new ChatMsg();
-            msg.setMsgType("1");
-            msg.setToId(s.getUserId());
-            msg.setContent(docId + "");
-            msg.setFromId(SecurityUtils.getUserId());
-            msgService.send(msg);
-            shareService.insertDocShare(s);
-        });
-
-        return success();
-    }
-
-    /**
-     * 复制文件
+     * 重命名
      */
     @ApiOperation("文件重命名")
     @GetMapping("/rename")
@@ -193,9 +205,7 @@ public class DocInfoController extends BaseController {
 
         info.setUpdateBy(SecurityUtils.getUsername());
 
-        docInfoService.insertDocInfo(info);
-
-        return success();
+        return success(docInfoService.updateDocInfo(info));
     }
 
     /**

doc-biz/src/main/java/com/doc/biz/controller/DocShareController.java

@@ -2,18 +2,17 @@ package com.doc.biz.controller;
 
 import com.doc.biz.domain.DocShare;
 import com.doc.biz.service.IDocShareService;
-import com.doc.common.annotation.Log;
+import com.doc.chat.domain.ChatMsg;
+import com.doc.chat.service.IChatMsgService;
 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.common.utils.poi.ExcelUtil;
+import com.doc.common.utils.SecurityUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
 
 /**
@@ -28,72 +27,109 @@ import java.util.List;
 public class DocShareController extends BaseController {
     @Resource
     private IDocShareService docShareService;
+    @Resource
+    private IChatMsgService msgService;
 
     /**
-     * 查询文档分享列表
-     */
-    @ApiOperation("查询文档分享列表")
-    //@PreAuthorize("@ss.hasPermi('biz:share:list')")
-    @GetMapping("/list")
-    public TableDataInfo list(DocShare docShare) {
-        startPage();
-        List<DocShare> list = docShareService.selectDocShareList(docShare);
-        return getDataTable(list);
-    }
-
-    /**
-     * 导出文档分享列表
-     */
-    @ApiOperation("导出文档分享列表")
-    //@PreAuthorize("@ss.hasPermi('biz:share:export')")
-    @Log(title = "文档分享", businessType = BusinessType.EXPORT)
-    @PostMapping("/export")
-    public void export(HttpServletResponse response, DocShare docShare) {
-        List<DocShare> list = docShareService.selectDocShareList(docShare);
-        ExcelUtil<DocShare> util = new ExcelUtil<DocShare>(DocShare.class);
-        util.exportExcel(response, list, "文档分享数据");
-    }
-
-    /**
-     * 获取文档分享详细信息
+     * 文件分享
      */
-    @ApiOperation("获取文档分享详细信息")
-    //@PreAuthorize("@ss.hasPermi('biz:share:query')")
-    @GetMapping(value = "/{shareId}")
-    public AjaxResult getInfo(@PathVariable("shareId") Long shareId) {
-        return success(docShareService.selectDocShareByShareId(shareId));
+    @ApiOperation("获取已选择人员")
+    @GetMapping("/{docId}")
+    public List<DocShare> shareInfo(@ApiParam(value = "文件ID", required = true) @PathVariable(name = "docId") Long docId) {
+        return docShareService.selectDocShareListByDocId(docId);
     }
 
     /**
-     * 新增文档分享
+     * 文件分享
      */
-    @ApiOperation("新增文档分享")
-    //@PreAuthorize("@ss.hasPermi('biz:share:add')")
-    @Log(title = "文档分享", businessType = BusinessType.INSERT)
-    @PostMapping
-    public AjaxResult add(@RequestBody DocShare docShare) {
-        return toAjax(docShareService.insertDocShare(docShare));
-    }
+    @ApiOperation("添加人员")
+    @PostMapping("/{docId}")
+    public AjaxResult share(@ApiParam(value = "文件ID", required = true) @PathVariable(name = "docId") Long docId, @ApiParam(value = "分享人员", required = true) @RequestBody List<Long> users) {
+        docShareService.deleteDocShareByDocId(docId);
+        users.forEach(uid -> {
+            //发送消息
+            ChatMsg msg = new ChatMsg();
+            msg.setMsgType("1");
+            msg.setToId(uid);
+            msg.setContent(docId + "");
+            msg.setFromId(SecurityUtils.getUserId());
+            msgService.send(msg);
 
-    /**
-     * 修改文档分享
-     */
-    @ApiOperation("修改文档分享")
-    //@PreAuthorize("@ss.hasPermi('biz:share:edit')")
-    @Log(title = "文档分享", businessType = BusinessType.UPDATE)
-    @PutMapping
-    public AjaxResult edit(@RequestBody DocShare docShare) {
-        return toAjax(docShareService.updateDocShare(docShare));
-    }
+            //添加人员
+            DocShare share = new DocShare();
+            share.setDocId(docId);
+            share.setUserId(uid);
+            docShareService.insertDocShare(share);
+        });
 
-    /**
-     * 删除文档分享
-     */
-    @ApiOperation("删除文档分享")
-    //@PreAuthorize("@ss.hasPermi('biz:share:remove')")
-    @Log(title = "文档分享", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{shareIds}")
-    public AjaxResult remove(@PathVariable Long[] shareIds) {
-        return toAjax(docShareService.deleteDocShareByShareIds(shareIds));
+        return success();
     }
+//
+//    /**
+//     * 查询文档分享列表
+//     */
+////    @ApiOperation("查询文档分享列表")
+//    //@PreAuthorize("@ss.hasPermi('biz:share:list')")
+//    @GetMapping("/list")
+//    public TableDataInfo list(DocShare docShare) {
+//        startPage();
+//        List<DocShare> list = docShareService.selectDocShareList(docShare);
+//        return getDataTable(list);
+//    }
+//
+//    /**
+//     * 导出文档分享列表
+//     */
+////    @ApiOperation("导出文档分享列表")
+//    //@PreAuthorize("@ss.hasPermi('biz:share:export')")
+//    @Log(title = "文档分享", businessType = BusinessType.EXPORT)
+//    @PostMapping("/export")
+//    public void export(HttpServletResponse response, DocShare docShare) {
+//        List<DocShare> list = docShareService.selectDocShareList(docShare);
+//        ExcelUtil<DocShare> util = new ExcelUtil<DocShare>(DocShare.class);
+//        util.exportExcel(response, list, "文档分享数据");
+//    }
+//
+//    /**
+//     * 获取文档分享详细信息
+//     */
+////    @ApiOperation("获取文档分享详细信息")
+//    //@PreAuthorize("@ss.hasPermi('biz:share:query')")
+//    @GetMapping(value = "/{shareId}")
+//    public AjaxResult getInfo(@PathVariable("shareId") Long shareId) {
+//        return success(docShareService.selectDocShareByShareId(shareId));
+//    }
+//
+//    /**
+//     * 新增文档分享
+//     */
+////    @ApiOperation("新增文档分享")
+//    //@PreAuthorize("@ss.hasPermi('biz:share:add')")
+//    @Log(title = "文档分享", businessType = BusinessType.INSERT)
+//    @PostMapping
+//    public AjaxResult add(@RequestBody DocShare docShare) {
+//        return toAjax(docShareService.insertDocShare(docShare));
+//    }
+//
+//    /**
+//     * 修改文档分享
+//     */
+////    @ApiOperation("修改文档分享")
+//    //@PreAuthorize("@ss.hasPermi('biz:share:edit')")
+//    @Log(title = "文档分享", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestBody DocShare docShare) {
+//        return toAjax(docShareService.updateDocShare(docShare));
+//    }
+//
+//    /**
+//     * 删除文档分享
+//     */
+////    @ApiOperation("删除文档分享")
+//    //@PreAuthorize("@ss.hasPermi('biz:share:remove')")
+//    @Log(title = "文档分享", businessType = BusinessType.DELETE)
+//    @DeleteMapping("/{shareIds}")
+//    public AjaxResult remove(@PathVariable Long[] shareIds) {
+//        return toAjax(docShareService.deleteDocShareByShareIds(shareIds));
+//    }
 }

doc-biz/src/main/java/com/doc/biz/controller/ElasticSearchController.java

@@ -1,6 +1,5 @@
 package com.doc.biz.controller;
 
-import com.alibaba.fastjson2.JSON;
 import com.doc.biz.domain.DocInfo;
 import com.doc.biz.domain.DocSpace;
 import com.doc.biz.domain.EsDocInfo;

doc-biz/src/main/java/com/doc/biz/controller/OnlyOfficeController.java

@@ -10,7 +10,6 @@ import com.doc.biz.vo.DocumentVO;
 import com.doc.common.core.domain.entity.SysUser;
 import com.doc.common.utils.file.FileUtils;
 import com.doc.system.service.ISysUserService;
-import org.bson.types.Binary;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
@@ -20,7 +19,7 @@ import org.springframework.web.multipart.MultipartFile;
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.PrintWriter;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.util.Date;

doc-biz/src/main/java/com/doc/biz/domain/DocActor.java

@@ -3,54 +3,45 @@ package com.doc.biz.domain;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.doc.common.annotation.Excel;
 import com.doc.common.core.domain.BaseEntity;
+import com.fasterxml.jackson.annotation.JsonFormat;
 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 java.util.Date;
+
 /**
  * 文档协作对象 doc_actor
  *
  * @author wukai
- * @date 2023-08-21
+ * @date 2023-09-18
  */
-@ApiModel(value = "DocActor" , description = "文档协作")
+@ApiModel(value = "DocActor", description = "文档协作")
 public class DocActor extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 自增ID
-     */
-    @ApiModelProperty("自增ID")
-    @TableId
-    private Long autoId;
-
-    /**
      * 文件ID
      */
     @ApiModelProperty("文件ID")
+    @TableId
     private Long docId;
 
     /**
-     * 用户ID
+     * 是否归档;Y.完成 N.未完成
      */
-    @ApiModelProperty("用户ID")
-    private Long userId;
+    @ApiModelProperty("是否归档;Y.完成 N.未完成")
+    @Excel(name = "是否归档;Y.完成 N.未完成")
+    private String isFiled;
 
     /**
-     * 是否完成
+     * 归档时间
      */
-    @ApiModelProperty("是否完成")
-    @Excel(name = "是否完成")
-    private String isCompleted;
-
-    public void setAutoId(Long autoId) {
-        this.autoId = autoId;
-    }
-
-    public Long getAutoId() {
-        return autoId;
-    }
+    @ApiModelProperty("归档时间")
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    @Excel(name = "归档时间", width = 30, dateFormat = "yyyy-MM-dd")
+    private Date filedTime;
 
     public void setDocId(Long docId) {
         this.docId = docId;
@@ -60,34 +51,28 @@ public class DocActor extends BaseEntity {
         return docId;
     }
 
-    public void setUserId(Long userId) {
-        this.userId = userId;
+    public void setIsFiled(String isFiled) {
+        this.isFiled = isFiled;
     }
 
-    public Long getUserId() {
-        return userId;
+    public String getIsFiled() {
+        return isFiled;
     }
 
-    public void setIsCompleted(String isCompleted) {
-        this.isCompleted = isCompleted;
+    public void setFiledTime(Date filedTime) {
+        this.filedTime = filedTime;
     }
 
-    public String getIsCompleted() {
-        return isCompleted;
+    public Date getFiledTime() {
+        return filedTime;
     }
 
     @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())
+                .append("docId", getDocId())
+                .append("isFiled", getIsFiled())
+                .append("filedTime", getFiledTime())
                 .toString();
     }
 }

doc-biz/src/main/java/com/doc/biz/domain/DocActorUser.java

@@ -0,0 +1,59 @@
+package com.doc.biz.domain;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+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;
+
+/**
+ * 文档协作成员对象 doc_actor_user
+ *
+ * @author wukai
+ * @date 2023-09-18
+ */
+@ApiModel(value = "DocActorUser", description = "文档协作成员")
+public class DocActorUser extends BaseEntity {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 文档ID
+     */
+    @ApiModelProperty("文档ID")
+    @Excel(name = "文档ID")
+    @TableId
+    private Long docId;
+
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
+    @Excel(name = "用户ID")
+    private Long userId;
+
+    public void setDocId(Long docId) {
+        this.docId = docId;
+    }
+
+    public Long getDocId() {
+        return docId;
+    }
+
+    public void setUserId(Long userId) {
+        this.userId = userId;
+    }
+
+    public Long getUserId() {
+        return userId;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("docId", getDocId())
+                .append("userId", getUserId())
+                .toString();
+    }
+}

doc-biz/src/main/java/com/doc/biz/domain/DocDirUser.java

@@ -4,8 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.doc.common.annotation.Excel;
 import com.doc.common.core.domain.BaseEntity;
-import com.doc.common.core.domain.entity.SysUser;
-import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;

doc-biz/src/main/java/com/doc/biz/domain/DocInfo.java

@@ -5,8 +5,6 @@ import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 文件基本信息表对象 doc_info

doc-biz/src/main/java/com/doc/biz/domain/DocRecent.java

@@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author wukai
  * @date 2023-08-21
  */
-@ApiModel(value = "DocRecent" , description = "最近文件")
+@ApiModel(value = "DocRecent", description = "最近文件")
 public class DocRecent extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -77,15 +77,15 @@ public class DocRecent extends BaseEntity {
     @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())
+                .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();
     }
 }

doc-biz/src/main/java/com/doc/biz/domain/DocShare.java

@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author wukai
  * @date 2023-08-21
  */
-@ApiModel(value = "DocShare" , description = "文档分享")
+@ApiModel(value = "DocShare", description = "文档分享")
 public class DocShare extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -79,15 +79,15 @@ public class DocShare extends BaseEntity {
     @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())
+                .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();
     }
 }

doc-biz/src/main/java/com/doc/biz/domain/DocSpace.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  * @author wukai
  * @date 2023-08-21
  */
-@ApiModel(value = "DocSpace" , description = "文档空间管理")
+@ApiModel(value = "DocSpace", description = "文档空间管理")
 public class DocSpace extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -128,18 +128,18 @@ public class DocSpace extends BaseEntity {
     @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())
+                .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();
     }
 }

doc-biz/src/main/java/com/doc/biz/domain/DocSpaceExpansion.java

@@ -16,7 +16,7 @@ import java.math.BigDecimal;
  * @author wukai
  * @date 2023-08-21
  */
-@ApiModel(value = "DocSpaceExpansion" , description = "空间扩容管理")
+@ApiModel(value = "DocSpaceExpansion", description = "空间扩容管理")
 public class DocSpaceExpansion extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -112,17 +112,17 @@ public class DocSpaceExpansion extends BaseEntity {
     @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())
+                .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();
     }
 }

doc-biz/src/main/java/com/doc/biz/domain/DocTransfer.java

@@ -13,7 +13,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author wukai
  * @date 2023-08-21
  */
-@ApiModel(value = "DocTransfer" , description = "文件传输")
+@ApiModel(value = "DocTransfer", description = "文件传输")
 public class DocTransfer extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -49,13 +49,13 @@ public class DocTransfer extends BaseEntity {
     @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())
+                .append("tranId", getTranId())
+                .append("docId", getDocId())
+                .append("createBy", getCreateBy())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateTime", getUpdateTime())
+                .append("remark", getRemark())
                 .toString();
     }
 }

doc-biz/src/main/java/com/doc/biz/domain/DocVersion.java

@@ -14,7 +14,7 @@ import org.apache.commons.lang3.builder.ToStringStyle;
  * @author wukai
  * @date 2023-08-21
  */
-@ApiModel(value = "DocVersion" , description = "文档版本信息")
+@ApiModel(value = "DocVersion", description = "文档版本信息")
 public class DocVersion extends BaseEntity {
     private static final long serialVersionUID = 1L;
 
@@ -65,14 +65,14 @@ public class DocVersion extends BaseEntity {
     @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())
+                .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();
     }
 }

doc-biz/src/main/java/com/doc/biz/mapper/DocActorMapper.java

@@ -9,16 +9,16 @@ import java.util.List;
  * 文档协作Mapper接口
  *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-18
  */
 public interface DocActorMapper extends BaseMapper<DocActor> {
     /**
      * 查询文档协作
      *
-     * @param autoId 文档协作主键
+     * @param docId 文档协作主键
      * @return 文档协作
      */
-    public DocActor selectDocActorByAutoId(Long autoId);
+    public DocActor selectDocActorByDocId(Long docId);
 
     /**
      * 查询文档协作列表
@@ -47,16 +47,16 @@ public interface DocActorMapper extends BaseMapper<DocActor> {
     /**
      * 删除文档协作
      *
-     * @param autoId 文档协作主键
+     * @param docId 文档协作主键
      * @return 结果
      */
-    public int deleteDocActorByAutoId(Long autoId);
+    public int deleteDocActorByDocId(Long docId);
 
     /**
      * 批量删除文档协作
      *
-     * @param autoIds 需要删除的数据主键集合
+     * @param docIds 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteDocActorByAutoIds(Long[] autoIds);
+    public int deleteDocActorByDocIds(Long[] docIds);
 }

doc-biz/src/main/java/com/doc/biz/mapper/DocActorUserMapper.java

@@ -0,0 +1,62 @@
+package com.doc.biz.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.doc.biz.domain.DocActorUser;
+
+import java.util.List;
+
+/**
+ * 文档协作成员Mapper接口
+ *
+ * @author wukai
+ * @date 2023-09-18
+ */
+public interface DocActorUserMapper extends BaseMapper<DocActorUser> {
+    /**
+     * 查询文档协作成员
+     *
+     * @param docId 文档协作成员主键
+     * @return 文档协作成员
+     */
+    public DocActorUser selectDocActorUserByDocId(Long docId);
+
+    /**
+     * 查询文档协作成员列表
+     *
+     * @param docActorUser 文档协作成员
+     * @return 文档协作成员集合
+     */
+    public List<DocActorUser> selectDocActorUserList(DocActorUser docActorUser);
+
+    /**
+     * 新增文档协作成员
+     *
+     * @param docActorUser 文档协作成员
+     * @return 结果
+     */
+    public int insertDocActorUser(DocActorUser docActorUser);
+
+    /**
+     * 修改文档协作成员
+     *
+     * @param docActorUser 文档协作成员
+     * @return 结果
+     */
+    public int updateDocActorUser(DocActorUser docActorUser);
+
+    /**
+     * 删除文档协作成员
+     *
+     * @param docId 文档协作成员主键
+     * @return 结果
+     */
+    public int deleteDocActorUserByDocId(Long docId);
+
+    /**
+     * 批量删除文档协作成员
+     *
+     * @param docIds 需要删除的数据主键集合
+     * @return 结果
+     */
+    public int deleteDocActorUserByDocIds(Long[] docIds);
+}

doc-biz/src/main/java/com/doc/biz/service/IDocActorService.java

@@ -8,16 +8,16 @@ import java.util.List;
  * 文档协作Service接口
  *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-18
  */
 public interface IDocActorService {
     /**
      * 查询文档协作
      *
-     * @param autoId 文档协作主键
+     * @param docId 文档协作主键
      * @return 文档协作
      */
-    public DocActor selectDocActorByAutoId(Long autoId);
+    public DocActor selectDocActorByDocId(Long docId);
 
     /**
      * 查询文档协作列表
@@ -46,16 +46,16 @@ public interface IDocActorService {
     /**
      * 批量删除文档协作
      *
-     * @param autoIds 需要删除的文档协作主键集合
+     * @param docIds 需要删除的文档协作主键集合
      * @return 结果
      */
-    public int deleteDocActorByAutoIds(Long[] autoIds);
+    public int deleteDocActorByDocIds(Long[] docIds);
 
     /**
      * 删除文档协作信息
      *
-     * @param autoId 文档协作主键
+     * @param docId 文档协作主键
      * @return 结果
      */
-    public int deleteDocActorByAutoId(Long autoId);
+    public int deleteDocActorByDocId(Long docId);
 }

doc-biz/src/main/java/com/doc/biz/service/IDocActorUserService.java

@@ -0,0 +1,61 @@
+package com.doc.biz.service;
+
+import com.doc.biz.domain.DocActorUser;
+
+import java.util.List;
+
+/**
+ * 文档协作成员Service接口
+ *
+ * @author wukai
+ * @date 2023-09-18
+ */
+public interface IDocActorUserService {
+    /**
+     * 查询文档协作成员
+     *
+     * @param docId 文档协作成员主键
+     * @return 文档协作成员
+     */
+    public DocActorUser selectDocActorUserByDocId(Long docId);
+
+    /**
+     * 查询文档协作成员列表
+     *
+     * @param docActorUser 文档协作成员
+     * @return 文档协作成员集合
+     */
+    public List<DocActorUser> selectDocActorUserList(DocActorUser docActorUser);
+
+    /**
+     * 新增文档协作成员
+     *
+     * @param docActorUser 文档协作成员
+     * @return 结果
+     */
+    public int insertDocActorUser(DocActorUser docActorUser);
+
+    /**
+     * 修改文档协作成员
+     *
+     * @param docActorUser 文档协作成员
+     * @return 结果
+     */
+    public int updateDocActorUser(DocActorUser docActorUser);
+
+    /**
+     * 批量删除文档协作成员
+     *
+     * @param docIds 需要删除的文档协作成员主键集合
+     * @return 结果
+     */
+    public int deleteDocActorUserByDocIds(Long[] docIds);
+
+    /**
+     * 删除文档协作成员信息
+     *
+     * @param docId 文档协作成员主键
+     * @return 结果
+     */
+    public int deleteDocActorUserByDocId(Long docId);
+}

doc-biz/src/main/java/com/doc/biz/service/impl/DocActorServiceImpl.java

@@ -3,7 +3,6 @@ package com.doc.biz.service.impl;
 import com.doc.biz.domain.DocActor;
 import com.doc.biz.mapper.DocActorMapper;
 import com.doc.biz.service.IDocActorService;
-import com.doc.common.utils.DateUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -13,7 +12,7 @@ import java.util.List;
  * 文档协作Service业务层处理
  *
  * @author wukai
- * @date 2023-08-15
+ * @date 2023-09-18
  */
 @Service
 public class DocActorServiceImpl implements IDocActorService {
@@ -23,12 +22,12 @@ public class DocActorServiceImpl implements IDocActorService {
     /**
      * 查询文档协作
      *
-     * @param autoId 文档协作主键
+     * @param docId 文档协作主键
      * @return 文档协作
      */
     @Override
-    public DocActor selectDocActorByAutoId(Long autoId) {
-        return docActorMapper.selectDocActorByAutoId(autoId);
+    public DocActor selectDocActorByDocId(Long docId) {
+        return docActorMapper.selectDocActorByDocId(docId);
     }
 
     /**
@@ -50,7 +49,6 @@ public class DocActorServiceImpl implements IDocActorService {
      */
     @Override
     public int insertDocActor(DocActor docActor) {
-        docActor.setCreateTime(DateUtils.getNowDate());
         return docActorMapper.insertDocActor(docActor);
     }
 
@@ -62,29 +60,28 @@ public class DocActorServiceImpl implements IDocActorService {
      */
     @Override
     public int updateDocActor(DocActor docActor) {
-        docActor.setUpdateTime(DateUtils.getNowDate());
         return docActorMapper.updateDocActor(docActor);
     }
 
     /**
      * 批量删除文档协作
      *
-     * @param autoIds 需要删除的文档协作主键
+     * @param docIds 需要删除的文档协作主键
      * @return 结果
      */
     @Override
-    public int deleteDocActorByAutoIds(Long[] autoIds) {
-        return docActorMapper.deleteDocActorByAutoIds(autoIds);
+    public int deleteDocActorByDocIds(Long[] docIds) {
+        return docActorMapper.deleteDocActorByDocIds(docIds);
     }
 
     /**
      * 删除文档协作信息
      *
-     * @param autoId 文档协作主键
+     * @param docId 文档协作主键
      * @return 结果
      */
     @Override
-    public int deleteDocActorByAutoId(Long autoId) {
-        return docActorMapper.deleteDocActorByAutoId(autoId);
+    public int deleteDocActorByDocId(Long docId) {
+        return docActorMapper.deleteDocActorByDocId(docId);
     }
 }

doc-biz/src/main/java/com/doc/biz/service/impl/DocActorUserServiceImpl.java

@@ -0,0 +1,87 @@
+package com.doc.biz.service.impl;
+
+import com.doc.biz.domain.DocActorUser;
+import com.doc.biz.mapper.DocActorUserMapper;
+import com.doc.biz.service.IDocActorUserService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+/**
+ * 文档协作成员Service业务层处理
+ *
+ * @author wukai
+ * @date 2023-09-18
+ */
+@Service
+public class DocActorUserServiceImpl implements IDocActorUserService {
+    @Resource
+    private DocActorUserMapper docActorUserMapper;
+
+    /**
+     * 查询文档协作成员
+     *
+     * @param docId 文档协作成员主键
+     * @return 文档协作成员
+     */
+    @Override
+    public DocActorUser selectDocActorUserByDocId(Long docId) {
+        return docActorUserMapper.selectDocActorUserByDocId(docId);
+    }
+
+    /**
+     * 查询文档协作成员列表
+     *
+     * @param docActorUser 文档协作成员
+     * @return 文档协作成员
+     */
+    @Override
+    public List<DocActorUser> selectDocActorUserList(DocActorUser docActorUser) {
+        return docActorUserMapper.selectDocActorUserList(docActorUser);
+    }
+
+    /**
+     * 新增文档协作成员
+     *
+     * @param docActorUser 文档协作成员
+     * @return 结果
+     */
+    @Override
+    public int insertDocActorUser(DocActorUser docActorUser) {
+        return docActorUserMapper.insertDocActorUser(docActorUser);
+    }
+
+    /**
+     * 修改文档协作成员
+     *
+     * @param docActorUser 文档协作成员
+     * @return 结果
+     */
+    @Override
+    public int updateDocActorUser(DocActorUser docActorUser) {
+        return docActorUserMapper.updateDocActorUser(docActorUser);
+    }
+
+    /**
+     * 批量删除文档协作成员
+     *
+     * @param docIds 需要删除的文档协作成员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDocActorUserByDocIds(Long[] docIds) {
+        return docActorUserMapper.deleteDocActorUserByDocIds(docIds);
+    }
+
+    /**
+     * 删除文档协作成员信息
+     *
+     * @param docId 文档协作成员主键
+     * @return 结果
+     */
+    @Override
+    public int deleteDocActorUserByDocId(Long docId) {
+        return docActorUserMapper.deleteDocActorUserByDocId(docId);
+    }
+}

doc-biz/src/main/java/com/doc/biz/service/impl/DocSpaceServiceImpl.java

@@ -11,7 +11,6 @@ import com.doc.common.utils.DateUtils;
 import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.bean.BeanUtils;
 import com.doc.system.service.ISysConfigService;
-import com.doc.system.service.ISysUserService;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

doc-biz/src/main/java/com/doc/biz/vo/DocInfoVO.java

@@ -1,16 +1,11 @@
 package com.doc.biz.vo;
 
-import com.baomidou.mybatisplus.annotation.TableId;
 import com.doc.biz.domain.DocDir;
 import com.doc.biz.domain.DocSpace;
 import com.doc.common.core.domain.BaseEntity;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-import java.io.Serializable;
 
 /**
  * 文件基本信息表对象 doc_info

doc-biz/src/main/java/com/doc/biz/ws/ChatMessageListener.java

@@ -36,7 +36,7 @@ public class ChatMessageListener implements MessageListener {
         String value = valueSerializer.deserialize(message.getBody());
 
         if (StringUtils.isNotBlank(value)) {
-            log.info("监听集群websocket消息--- {}" , value);
+            log.info("监听集群websocket消息--- {}", value);
             //集群模式 推送消息
             ObjectMapper mapper = new ObjectMapper();
             ChatMsg msg;

doc-biz/src/main/java/com/doc/biz/ws/WebSocketConfig.java

@@ -5,7 +5,7 @@ import org.springframework.context.annotation.Configuration;
 import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 /**
- *  开启WebSocket支持
+ * 开启WebSocket支持
  *
  * @author ruoyi
  */

doc-biz/src/main/java/com/doc/chat/controller/ChatMsgController.java

@@ -1,10 +1,8 @@
 package com.doc.chat.controller;
 
-import com.alibaba.fastjson2.JSON;
 import com.doc.chat.domain.ChatMsg;
 import com.doc.chat.service.IChatMsgService;
 import com.doc.common.annotation.Log;
-import com.doc.common.constant.CacheConstants;
 import com.doc.common.core.controller.BaseController;
 import com.doc.common.core.domain.AjaxResult;
 import com.doc.common.core.page.TableDataInfo;
@@ -13,12 +11,10 @@ import com.doc.common.utils.SecurityUtils;
 import com.doc.common.utils.poi.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.data.redis.core.StringRedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
-import java.util.Date;
 import java.util.List;
 
 /**

doc-biz/src/main/java/com/doc/chat/domain/ChatMsg.java

@@ -11,8 +11,6 @@ import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.util.List;
-
 /**
  * 聊天消息管理对象 chat_msg
  *

doc-biz/src/main/java/com/doc/chat/mapper/ChatMsgMapper.java

@@ -67,6 +67,7 @@ public interface ChatMsgMapper extends BaseMapper<ChatMsg> {
      * @return 聊天记录列表
      */
     List<ChatMsg> selectRecordList(String idIndex);
+
     /**
      * 查询好友列表
      *

doc-biz/src/main/resources/mapper/biz/DocActorMapper.xml

@@ -1,84 +1,69 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.doc.biz.mapper.DocActorMapper">
-    
+
     <resultMap type="DocActor" id="DocActorResult">
-        <result property="autoId"    column="AUTO_ID"    />
-        <result property="docId"    column="DOC_ID"    />
-        <result property="userId"    column="USER_ID"    />
-        <result property="isCompleted"    column="IS_COMPLETED"    />
-        <result property="createBy"    column="CREATE_BY"    />
-        <result property="createTime"    column="CREATE_TIME"    />
-        <result property="updateBy"    column="UPDATE_BY"    />
-        <result property="updateTime"    column="UPDATE_TIME"    />
-        <result property="remark"    column="REMARK"    />
+        <result property="docId" column="DOC_ID"/>
+        <result property="isFiled" column="IS_FILED"/>
+        <result property="filedTime" column="FILED_TIME"/>
     </resultMap>
 
     <sql id="selectDocActorVo">
-        select AUTO_ID, DOC_ID, USER_ID, IS_COMPLETED, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK from doc_actor
+        select DOC_ID, IS_FILED, FILED_TIME
+        from doc_actor
     </sql>
 
     <select id="selectDocActorList" parameterType="DocActor" resultMap="DocActorResult">
         <include refid="selectDocActorVo"/>
-        <where>  
-            <if test="isCompleted != null  and isCompleted != ''"> and IS_COMPLETED = #{isCompleted}</if>
+        <where>
+            <if test="docId != null ">and DOC_ID = #{docId}</if>
+            <if test="isFiled != null  and isFiled != ''">and IS_FILED = #{isFiled}</if>
+            <if test="params.beginFiledTime != null and params.beginFiledTime != '' and params.endFiledTime != null and params.endFiledTime != ''">
+                and FILED_TIME between #{params.beginFiledTime} and #{params.endFiledTime}
+            </if>
         </where>
     </select>
-    
-    <select id="selectDocActorByAutoId" parameterType="Long" resultMap="DocActorResult">
+
+    <select id="selectDocActorByDocId" parameterType="Long" resultMap="DocActorResult">
         <include refid="selectDocActorVo"/>
-        where AUTO_ID = #{autoId}
+        where DOC_ID = #{docId}
     </select>
-        
-    <insert id="insertDocActor" parameterType="DocActor" useGeneratedKeys="true" keyProperty="autoId">
+
+    <insert id="insertDocActor" parameterType="DocActor">
         insert into doc_actor
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="docId != null">DOC_ID,</if>
-            <if test="userId != null">USER_ID,</if>
-            <if test="isCompleted != null">IS_COMPLETED,</if>
-            <if test="createBy != null">CREATE_BY,</if>
-            <if test="createTime != null">CREATE_TIME,</if>
-            <if test="updateBy != null">UPDATE_BY,</if>
-            <if test="updateTime != null">UPDATE_TIME,</if>
-            <if test="remark != null">REMARK,</if>
-         </trim>
+            <if test="isFiled != null">IS_FILED,</if>
+            <if test="filedTime != null">FILED_TIME,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="docId != null">#{docId},</if>
-            <if test="userId != null">#{userId},</if>
-            <if test="isCompleted != null">#{isCompleted},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="remark != null">#{remark},</if>
-         </trim>
+            <if test="isFiled != null">#{isFiled},</if>
+            <if test="filedTime != null">#{filedTime},</if>
+        </trim>
     </insert>
 
     <update id="updateDocActor" parameterType="DocActor">
         update doc_actor
         <trim prefix="SET" suffixOverrides=",">
-            <if test="docId != null">DOC_ID = #{docId},</if>
-            <if test="userId != null">USER_ID = #{userId},</if>
-            <if test="isCompleted != null">IS_COMPLETED = #{isCompleted},</if>
-            <if test="createBy != null">CREATE_BY = #{createBy},</if>
-            <if test="createTime != null">CREATE_TIME = #{createTime},</if>
-            <if test="updateBy != null">UPDATE_BY = #{updateBy},</if>
-            <if test="updateTime != null">UPDATE_TIME = #{updateTime},</if>
-            <if test="remark != null">REMARK = #{remark},</if>
+            <if test="isFiled != null">IS_FILED = #{isFiled},</if>
+            <if test="filedTime != null">FILED_TIME = #{filedTime},</if>
         </trim>
-        where AUTO_ID = #{autoId}
+        where DOC_ID = #{docId}
     </update>
 
-    <delete id="deleteDocActorByAutoId" parameterType="Long">
-        delete from doc_actor where AUTO_ID = #{autoId}
+    <delete id="deleteDocActorByDocId" parameterType="Long">
+        delete
+        from doc_actor
+        where DOC_ID = #{docId}
     </delete>
 
-    <delete id="deleteDocActorByAutoIds" parameterType="String">
-        delete from doc_actor where AUTO_ID in 
-        <foreach item="autoId" collection="array" open="(" separator="," close=")">
-            #{autoId}
+    <delete id="deleteDocActorByDocIds" parameterType="String">
+        delete from doc_actor where DOC_ID in
+        <foreach item="docId" collection="array" open="(" separator="," close=")">
+            #{docId}
         </foreach>
     </delete>
 </mapper>

doc-biz/src/main/resources/mapper/biz/DocActorUserMapper.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.doc.biz.mapper.DocActorUserMapper">
+
+    <resultMap type="DocActorUser" id="DocActorUserResult">
+        <result property="docId" column="DOC_ID"/>
+        <result property="userId" column="USER_ID"/>
+    </resultMap>
+
+    <sql id="selectDocActorUserVo">
+        select DOC_ID, USER_ID
+        from doc_actor_user
+    </sql>
+
+    <select id="selectDocActorUserList" parameterType="DocActorUser" resultMap="DocActorUserResult">
+        <include refid="selectDocActorUserVo"/>
+        <where>
+            <if test="docId != null ">and DOC_ID = #{docId}</if>
+            <if test="userId != null ">and USER_ID = #{userId}</if>
+        </where>
+    </select>
+
+    <select id="selectDocActorUserByDocId" parameterType="Long" resultMap="DocActorUserResult">
+        <include refid="selectDocActorUserVo"/>
+        where DOC_ID = #{docId}
+    </select>
+
+    <insert id="insertDocActorUser" parameterType="DocActorUser">
+        insert into doc_actor_user
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="docId != null">DOC_ID,</if>
+            <if test="userId != null">USER_ID,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="docId != null">#{docId},</if>
+            <if test="userId != null">#{userId},</if>
+        </trim>
+    </insert>
+
+    <update id="updateDocActorUser" parameterType="DocActorUser">
+        update doc_actor_user
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="userId != null">USER_ID = #{userId},</if>
+        </trim>
+        where DOC_ID = #{docId}
+    </update>
+
+    <delete id="deleteDocActorUserByDocId" parameterType="Long">
+        delete
+        from doc_actor_user
+        where DOC_ID = #{docId}
+    </delete>
+
+    <delete id="deleteDocActorUserByDocIds" parameterType="String">
+        delete from doc_actor_user where DOC_ID in
+        <foreach item="docId" collection="array" open="(" separator="," close=")">
+            #{docId}
+        </foreach>
+    </delete>
+</mapper>

doc-biz/src/main/resources/mapper/biz/DocFavoriteMapper.xml

@@ -1,30 +1,40 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.doc.biz.mapper.DocFavoriteMapper">
 
     <resultMap type="DocFavorite" id="DocFavoriteResult">
-        <result property="favoriteId"    column="FAVORITE_ID"    />
-        <result property="labelId"    column="LABEL_ID"    />
-        <result property="isFolder"    column="IS_FOLDER"    />
-        <result property="relaId"    column="RELA_ID"    />
-        <result property="owner"    column="OWNER"    />
-        <result property="createBy"    column="CREATE_BY"    />
-        <result property="createTime"    column="CREATE_TIME"    />
-        <result property="updateBy"    column="UPDATE_BY"    />
-        <result property="updateTime"    column="UPDATE_TIME"    />
-        <result property="remark"    column="REMARK"    />
+        <result property="favoriteId" column="FAVORITE_ID"/>
+        <result property="labelId" column="LABEL_ID"/>
+        <result property="isFolder" column="IS_FOLDER"/>
+        <result property="relaId" column="RELA_ID"/>
+        <result property="owner" column="OWNER"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+        <result property="remark" column="REMARK"/>
     </resultMap>
 
     <sql id="selectDocFavoriteVo">
-        select FAVORITE_ID, LABEL_ID, IS_FOLDER, RELA_ID, OWNER, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK from doc_favorite
+        select FAVORITE_ID,
+               LABEL_ID,
+               IS_FOLDER,
+               RELA_ID,
+               OWNER,
+               CREATE_BY,
+               CREATE_TIME,
+               UPDATE_BY,
+               UPDATE_TIME,
+               REMARK
+        from doc_favorite
     </sql>
 
     <select id="selectDocFavoriteList" parameterType="DocFavorite" resultMap="DocFavoriteResult">
         <include refid="selectDocFavoriteVo"/>
         <where>
-            <if test="isFolder != null  and isFolder != ''"> and IS_FOLDER = #{isFolder}</if>
+            <if test="isFolder != null  and isFolder != ''">and IS_FOLDER = #{isFolder}</if>
         </where>
     </select>
 
@@ -45,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">UPDATE_BY,</if>
             <if test="updateTime != null">UPDATE_TIME,</if>
             <if test="remark != null">REMARK,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="labelId != null">#{labelId},</if>
             <if test="isFolder != null">#{isFolder},</if>
@@ -56,7 +66,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDocFavorite" parameterType="DocFavorite">
@@ -76,7 +86,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDocFavoriteByFavoriteId" parameterType="Long">
-        delete from doc_favorite where FAVORITE_ID = #{favoriteId}
+        delete
+        from doc_favorite
+        where FAVORITE_ID = #{favoriteId}
     </delete>
 
     <delete id="deleteDocFavoriteByFavoriteIds" parameterType="String">

doc-biz/src/main/resources/mapper/biz/DocInfoMapper.xml

@@ -38,7 +38,7 @@
     <select id="selectDocInfoList" parameterType="DocInfo" resultMap="DocInfoResult">
         <include refid="selectDocInfoVo"/>
         <where>
-            <if test="dirId != null  and dirId != ''">and DIR_ID like concat('%', #{dirId}, '%')</if>
+            <if test="dirId != null  and dirId != ''">and DIR_ID = #{dirId}</if>
             <if test="spaceId != null  and spaceId != ''">and SPACE_ID like concat('%', #{spaceId}, '%')</if>
             <if test="fileName != null  and fileName != ''">and FILE_NAME like concat('%', #{fileName}, '%')</if>
             <if test="params.beginCreateTime != null and params.beginCreateTime != '' and params.endCreateTime != null and params.endCreateTime != ''">

doc-biz/src/main/resources/mapper/biz/DocRecentMapper.xml

@@ -1,36 +1,45 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.doc.biz.mapper.DocRecentMapper">
-    
+
     <resultMap type="DocRecent" id="DocRecentResult">
-        <result property="recentId"    column="RECENT_ID"    />
-        <result property="isFolder"    column="IS_FOLDER"    />
-        <result property="relaId"    column="RELA_ID"    />
-        <result property="owner"    column="OWNER"    />
-        <result property="createBy"    column="CREATE_BY"    />
-        <result property="createTime"    column="CREATE_TIME"    />
-        <result property="updateBy"    column="UPDATE_BY"    />
-        <result property="updateTime"    column="UPDATE_TIME"    />
-        <result property="remark"    column="REMARK"    />
+        <result property="recentId" column="RECENT_ID"/>
+        <result property="isFolder" column="IS_FOLDER"/>
+        <result property="relaId" column="RELA_ID"/>
+        <result property="owner" column="OWNER"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+        <result property="remark" column="REMARK"/>
     </resultMap>
 
     <sql id="selectDocRecentVo">
-        select RECENT_ID, IS_FOLDER, RELA_ID, OWNER, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK from doc_recent
+        select RECENT_ID,
+               IS_FOLDER,
+               RELA_ID,
+               OWNER,
+               CREATE_BY,
+               CREATE_TIME,
+               UPDATE_BY,
+               UPDATE_TIME,
+               REMARK
+        from doc_recent
     </sql>
 
     <select id="selectDocRecentList" parameterType="DocRecent" resultMap="DocRecentResult">
         <include refid="selectDocRecentVo"/>
-        <where>  
+        <where>
         </where>
     </select>
-    
+
     <select id="selectDocRecentByRecentId" parameterType="Long" resultMap="DocRecentResult">
         <include refid="selectDocRecentVo"/>
         where RECENT_ID = #{recentId}
     </select>
-        
+
     <insert id="insertDocRecent" parameterType="DocRecent" useGeneratedKeys="true" keyProperty="recentId">
         insert into doc_recent
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -42,7 +51,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">UPDATE_BY,</if>
             <if test="updateTime != null">UPDATE_TIME,</if>
             <if test="remark != null">REMARK,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="isFolder != null">#{isFolder},</if>
             <if test="relaId != null">#{relaId},</if>
@@ -52,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDocRecent" parameterType="DocRecent">
@@ -71,11 +80,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDocRecentByRecentId" parameterType="Long">
-        delete from doc_recent where RECENT_ID = #{recentId}
+        delete
+        from doc_recent
+        where RECENT_ID = #{recentId}
     </delete>
 
     <delete id="deleteDocRecentByRecentIds" parameterType="String">
-        delete from doc_recent where RECENT_ID in 
+        delete from doc_recent where RECENT_ID in
         <foreach item="recentId" collection="array" open="(" separator="," close=")">
             #{recentId}
         </foreach>

doc-biz/src/main/resources/mapper/biz/DocSpaceExpansionMapper.xml

@@ -1,42 +1,53 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.doc.biz.mapper.DocSpaceExpansionMapper">
-    
+
     <resultMap type="DocSpaceExpansion" id="DocSpaceExpansionResult">
-        <result property="autoId"    column="AUTO_ID"    />
-        <result property="spaceId"    column="SPACE_ID"    />
-        <result property="spaceName"    column="SPACE_NAME"    />
-        <result property="currentCap"    column="CURRENT_CAP"    />
-        <result property="expandCap"    column="EXPAND_CAP"    />
-        <result property="expandReson"    column="EXPAND_RESON"    />
-        <result property="createBy"    column="CREATE_BY"    />
-        <result property="createTime"    column="CREATE_TIME"    />
-        <result property="updateBy"    column="UPDATE_BY"    />
-        <result property="updateTime"    column="UPDATE_TIME"    />
-        <result property="remark"    column="REMARK"    />
+        <result property="autoId" column="AUTO_ID"/>
+        <result property="spaceId" column="SPACE_ID"/>
+        <result property="spaceName" column="SPACE_NAME"/>
+        <result property="currentCap" column="CURRENT_CAP"/>
+        <result property="expandCap" column="EXPAND_CAP"/>
+        <result property="expandReson" column="EXPAND_RESON"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+        <result property="remark" column="REMARK"/>
     </resultMap>
 
     <sql id="selectDocSpaceExpansionVo">
-        select AUTO_ID, SPACE_ID, SPACE_NAME, CURRENT_CAP, EXPAND_CAP, EXPAND_RESON, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK from doc_space_expansion
+        select AUTO_ID,
+               SPACE_ID,
+               SPACE_NAME,
+               CURRENT_CAP,
+               EXPAND_CAP,
+               EXPAND_RESON,
+               CREATE_BY,
+               CREATE_TIME,
+               UPDATE_BY,
+               UPDATE_TIME,
+               REMARK
+        from doc_space_expansion
     </sql>
 
     <select id="selectDocSpaceExpansionList" parameterType="DocSpaceExpansion" resultMap="DocSpaceExpansionResult">
         <include refid="selectDocSpaceExpansionVo"/>
-        <where>  
-            <if test="spaceName != null  and spaceName != ''"> and SPACE_NAME like concat('%', #{spaceName}, '%')</if>
-            <if test="currentCap != null "> and CURRENT_CAP = #{currentCap}</if>
-            <if test="expandCap != null "> and EXPAND_CAP = #{expandCap}</if>
-            <if test="expandReson != null  and expandReson != ''"> and EXPAND_RESON = #{expandReson}</if>
+        <where>
+            <if test="spaceName != null  and spaceName != ''">and SPACE_NAME like concat('%', #{spaceName}, '%')</if>
+            <if test="currentCap != null ">and CURRENT_CAP = #{currentCap}</if>
+            <if test="expandCap != null ">and EXPAND_CAP = #{expandCap}</if>
+            <if test="expandReson != null  and expandReson != ''">and EXPAND_RESON = #{expandReson}</if>
         </where>
     </select>
-    
+
     <select id="selectDocSpaceExpansionByAutoId" parameterType="Long" resultMap="DocSpaceExpansionResult">
         <include refid="selectDocSpaceExpansionVo"/>
         where AUTO_ID = #{autoId}
     </select>
-        
+
     <insert id="insertDocSpaceExpansion" parameterType="DocSpaceExpansion" useGeneratedKeys="true" keyProperty="autoId">
         insert into doc_space_expansion
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -50,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">UPDATE_BY,</if>
             <if test="updateTime != null">UPDATE_TIME,</if>
             <if test="remark != null">REMARK,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="spaceId != null">#{spaceId},</if>
             <if test="spaceName != null">#{spaceName},</if>
@@ -62,7 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDocSpaceExpansion" parameterType="DocSpaceExpansion">
@@ -83,11 +94,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDocSpaceExpansionByAutoId" parameterType="Long">
-        delete from doc_space_expansion where AUTO_ID = #{autoId}
+        delete
+        from doc_space_expansion
+        where AUTO_ID = #{autoId}
     </delete>
 
     <delete id="deleteDocSpaceExpansionByAutoIds" parameterType="String">
-        delete from doc_space_expansion where AUTO_ID in 
+        delete from doc_space_expansion where AUTO_ID in
         <foreach item="autoId" collection="array" open="(" separator="," close=")">
             #{autoId}
         </foreach>

doc-biz/src/main/resources/mapper/biz/DocTransferMapper.xml

@@ -1,40 +1,41 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.doc.biz.mapper.DocTransferMapper">
-    
+
     <resultMap type="DocTransfer" id="DocTransferResult">
-        <result property="tranId"    column="TRAN_ID"    />
-        <result property="docId"    column="DOC_ID"    />
-        <result property="createBy"    column="CREATE_BY"    />
-        <result property="createTime"    column="CREATE_TIME"    />
-        <result property="updateBy"    column="UPDATE_BY"    />
-        <result property="updateTime"    column="UPDATE_TIME"    />
-        <result property="remark"    column="REMARK"    />
+        <result property="tranId" column="TRAN_ID"/>
+        <result property="docId" column="DOC_ID"/>
+        <result property="createBy" column="CREATE_BY"/>
+        <result property="createTime" column="CREATE_TIME"/>
+        <result property="updateBy" column="UPDATE_BY"/>
+        <result property="updateTime" column="UPDATE_TIME"/>
+        <result property="remark" column="REMARK"/>
     </resultMap>
 
     <sql id="selectDocTransferVo">
-        select TRAN_ID, DOC_ID, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK from doc_transfer
+        select TRAN_ID, DOC_ID, CREATE_BY, CREATE_TIME, UPDATE_BY, UPDATE_TIME, REMARK
+        from doc_transfer
     </sql>
 
     <select id="selectDocTransferList" parameterType="DocTransfer" resultMap="DocTransferResult">
         <include refid="selectDocTransferVo"/>
-        <where>  
-            <if test="docId != null "> and DOC_ID = #{docId}</if>
-            <if test="createBy != null  and createBy != ''"> and CREATE_BY = #{createBy}</if>
-            <if test="createTime != null "> and CREATE_TIME = #{createTime}</if>
-            <if test="updateBy != null  and updateBy != ''"> and UPDATE_BY = #{updateBy}</if>
-            <if test="updateTime != null "> and UPDATE_TIME = #{updateTime}</if>
-            <if test="remark != null  and remark != ''"> and REMARK = #{remark}</if>
+        <where>
+            <if test="docId != null ">and DOC_ID = #{docId}</if>
+            <if test="createBy != null  and createBy != ''">and CREATE_BY = #{createBy}</if>
+            <if test="createTime != null ">and CREATE_TIME = #{createTime}</if>
+            <if test="updateBy != null  and updateBy != ''">and UPDATE_BY = #{updateBy}</if>
+            <if test="updateTime != null ">and UPDATE_TIME = #{updateTime}</if>
+            <if test="remark != null  and remark != ''">and REMARK = #{remark}</if>
         </where>
     </select>
-    
+
     <select id="selectDocTransferByTranId" parameterType="Long" resultMap="DocTransferResult">
         <include refid="selectDocTransferVo"/>
         where TRAN_ID = #{tranId}
     </select>
-        
+
     <insert id="insertDocTransfer" parameterType="DocTransfer" useGeneratedKeys="true" keyProperty="tranId">
         insert into doc_transfer
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -44,7 +45,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">UPDATE_BY,</if>
             <if test="updateTime != null">UPDATE_TIME,</if>
             <if test="remark != null">REMARK,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="docId != null">#{docId},</if>
             <if test="createBy != null">#{createBy},</if>
@@ -52,7 +53,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="remark != null">#{remark},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateDocTransfer" parameterType="DocTransfer">
@@ -69,11 +70,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </update>
 
     <delete id="deleteDocTransferByTranId" parameterType="Long">
-        delete from doc_transfer where TRAN_ID = #{tranId}
+        delete
+        from doc_transfer
+        where TRAN_ID = #{tranId}
     </delete>
 
     <delete id="deleteDocTransferByTranIds" parameterType="String">
-        delete from doc_transfer where TRAN_ID in 
+        delete from doc_transfer where TRAN_ID in
         <foreach item="tranId" collection="array" open="(" separator="," close=")">
             #{tranId}
         </foreach>