From a1cf2d10338b3c6a82db160d9856cfab3542bc7a Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Mon, 3 Nov 2025 11:24:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application-druid.yml | 9 +- bonus-base/src/main/resources/application.yml | 22 +- .../bonus/business/domain/DocumentTreeVo.java | 22 ++ .../business/domain/TbDocumentFolder.java | 24 ++ .../bonus/business/domain/TbUserFiles.java | 8 + .../com/bonus/business/domain/TreeBuild.java | 60 ++++ .../business/mapper/DocumentScreenMapper.java | 160 +++------- .../service/impl/DocumentScreenImpl.java | 293 +++++++----------- ...LabelMappper.xml => DockerLabelMapper.xml} | 0 .../mapper/business/DocumentScreenMapper.xml | 55 ++++ 10 files changed, 342 insertions(+), 311 deletions(-) rename bonus-business/src/main/resources/mapper/business/{DockerLabelMappper.xml => DockerLabelMapper.xml} (100%) diff --git a/bonus-base/src/main/resources/application-druid.yml b/bonus-base/src/main/resources/application-druid.yml index 135a03f..84c81ec 100644 --- a/bonus-base/src/main/resources/application-druid.yml +++ b/bonus-base/src/main/resources/application-druid.yml @@ -6,9 +6,12 @@ spring: druid: # 主库数据源 master: - url: jdbc:mysql://192.168.0.14:4417/bonus_cloud_service?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 - username: root - password: Bonus@admin123! +# url: jdbc:mysql://192.168.0.14:4417/bonus_cloud_service?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 +# username: root +# password: Bonus@admin123! + url: jdbc:mysql://127.0.0.1:3306/bonus_cloud_service?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 + username: mroot + password: bonus@admin123 # url: jdbc:mysql://192.168.0.7:13308/bonus_cloud_service?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8 # username: root # password: Bonus@admin123! diff --git a/bonus-base/src/main/resources/application.yml b/bonus-base/src/main/resources/application.yml index 7933d36..397e5a5 100644 --- a/bonus-base/src/main/resources/application.yml +++ b/bonus-base/src/main/resources/application.yml @@ -69,9 +69,12 @@ spring: enabled: true # redis 配置 redis: - host: 192.168.0.14 - port: 2003 - password: Fyzbns@Redis123! + host: 127.0.0.1 + port: 6379 + # password: Fyzbns@Redis123! +# host: 192.168.0.14 +# port: 2003 +# password: Fyzbns@Redis123! # 地址 # host: 192.168.0.7 # 端口，默认为6379 @@ -133,13 +136,18 @@ xss: # 匹配链接 urlPatterns: /system/*,/monitor/*,/tool/* - minio: - url: http://192.168.0.14:9090 - endpoint: http://192.168.0.14:9090 + url: http://47.92.234.255:9090 + endpoint: http://47.92.234.255:9090 accessKey: minio - secretKey: bonus@admin123 + secretKey: Bonus@admin123! bucketName: product +#minio: +# url: http://192.168.0.14:9090 +# endpoint: http://192.168.0.14:9090 +# accessKey: minio +# secretKey: bonus@admin123 +# bucketName: product management: server: port: -1 # 禁用独立管理端口（与业务端口共用） diff --git a/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java b/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java index a0a9fd6..b3abd3b 100644 --- a/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java +++ b/bonus-business/src/main/java/com/bonus/business/domain/DocumentTreeVo.java @@ -46,6 +46,28 @@ public class DocumentTreeVo { *子集合 */ private List childTree; + /** + * 管理id + */ + private String realId; + /** + * 公共的级别id + */ + private String pubFolderId; + + + /** + * 上级节点id + */ + private String parent; + /** + * 实际id + */ + private String exeId; + /** + * 数据类型 + */ + private String datType; } diff --git a/bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFolder.java b/bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFolder.java index f4cb75c..ffd0aed 100644 --- a/bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFolder.java +++ b/bonus-business/src/main/java/com/bonus/business/domain/TbDocumentFolder.java @@ -74,6 +74,30 @@ public class TbDocumentFolder extends BaseEntity * 分享人id */ private String shareUserId; + /** + * 文件路径 + */ + private String filePath; + /** + * 文件id + */ + private String fileId; + /** + * 文件后缀 + */ + private String fileSuffix; + + private String labels; + + /** + * 公共文件夹id + */ + private String publicFolderId; + /** + * 数据类型 + */ + private String dataType; + /** * 权限集合 */ diff --git a/bonus-business/src/main/java/com/bonus/business/domain/TbUserFiles.java b/bonus-business/src/main/java/com/bonus/business/domain/TbUserFiles.java index b8f48e5..aa6d516 100644 --- a/bonus-business/src/main/java/com/bonus/business/domain/TbUserFiles.java +++ b/bonus-business/src/main/java/com/bonus/business/domain/TbUserFiles.java @@ -75,6 +75,11 @@ public class TbUserFiles extends BaseEntity @Excel(name = "文档标签") private String labels; + /** + * 上级节点 + */ + private String parentId; + /** * 桶名称 */ @@ -101,5 +106,8 @@ public class TbUserFiles extends BaseEntity private String repeatType; + private String fileType; + + } diff --git a/bonus-business/src/main/java/com/bonus/business/domain/TreeBuild.java b/bonus-business/src/main/java/com/bonus/business/domain/TreeBuild.java index ec00d3d..7c8d0a5 100644 --- a/bonus-business/src/main/java/com/bonus/business/domain/TreeBuild.java +++ b/bonus-business/src/main/java/com/bonus/business/domain/TreeBuild.java @@ -37,6 +37,30 @@ public class TreeBuild { return rootNodeList; } + + /** + * 获取需构建的所有根节点（顶级节点） "0" + * @return 所有根节点List集合 + */ + public List getRootNode1(String parentId,String isAdmin){ + // 保存所有根节点（所有根节点的数据） + List rootNodeList = new ArrayList<>(); + // treeNode：查询出的每一条数据（节点） + for (DocumentTreeVo treeNode : nodeList){ + // 判断当前节点是否为根节点，此处注意：若parentId类型是String，则要采用equals()方法判断。 + if (parentId.equals(treeNode.getParent()) ) { + if("1".equals(isAdmin) && "1".equals(treeNode.getDatType())){ + // 是，添加 + rootNodeList.add(treeNode); + }else{ + rootNodeList.add(treeNode); + } + + } + } + return rootNodeList; + } + /** * 根据每一个顶级节点（根节点）进行构建树形结构 * @return 构建整棵树 @@ -54,6 +78,20 @@ public class TreeBuild { return treeNodes; } + public List buildTree1(String parentId,String isAdmin){ + // treeNodes：保存一个顶级节点所构建出来的完整树形 + List treeNodes = new ArrayList(); + // getRootNode()：获取所有的根节点 + for (DocumentTreeVo treeRootNode : getRootNode1(parentId,isAdmin)) { + // 将顶级节点进行构建子树 + treeRootNode = buildChildTree1(treeRootNode); + // 完成一个顶级节点所构建的树形，增加进来 + treeNodes.add(treeRootNode); + } + return treeNodes; + } + + /** * 递归-----构建子树形结构 * @param pNode 根节点（顶级节点） @@ -69,6 +107,28 @@ public class TreeBuild { childTree.add(buildChildTree(treeNode)); } } + if(pNode.getChildTree()==null || pNode.getChildTree().isEmpty()){ + // for循环结束，即节点下没有任何节点，树形构建结束，设置树结果 + pNode.setChildTree(childTree); + } + return pNode; + } + + /** + * 递归-----构建子树形结构 + * @param pNode 根节点（顶级节点） + * @return 整棵树 + */ + public DocumentTreeVo buildChildTree1(DocumentTreeVo pNode){ + List childTree = new ArrayList(); + // nodeList：所有节点集合（所有数据） + for (DocumentTreeVo treeNode : nodeList) { + // 判断当前节点的父节点ID是否等于根节点的ID，即当前节点为其下的子节点 + if (treeNode.getParent().equals(pNode.getExeId())) { + // 再递归进行判断当前节点的情况，调用自身方法 + childTree.add(buildChildTree1(treeNode)); + } + } // for循环结束，即节点下没有任何节点，树形构建结束，设置树结果 pNode.setChildTree(childTree); return pNode; diff --git a/bonus-business/src/main/java/com/bonus/business/mapper/DocumentScreenMapper.java b/bonus-business/src/main/java/com/bonus/business/mapper/DocumentScreenMapper.java index 006c80f..d1d4e67 100644 --- a/bonus-business/src/main/java/com/bonus/business/mapper/DocumentScreenMapper.java +++ b/bonus-business/src/main/java/com/bonus/business/mapper/DocumentScreenMapper.java @@ -3,131 +3,12 @@ package com.bonus.business.mapper; import com.bonus.business.domain.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; -import org.springframework.security.core.parameters.P; import java.util.List; @Mapper public interface DocumentScreenMapper { - /** - * 查询文档库数据 - * @param vo - * @return - */ - List getCompanyChildList(DocumentTreeVo vo); - - /** - * 查询每个人自己的文档数据 - * @param vo - * @return - */ - List getMyChildList(DocumentTreeVo vo); - - /** - * 查询其他人共享给我的 - * @param vo - * @return - */ - List getOtherShare(DocumentTreeVo vo); - - /** - * 查询我分享出去的文档 - * @param vo - * @return - */ - List getMyShareList(DocumentTreeVo vo); - - /** - * 查询全部数据 - * @param vo - * @return - */ - List getDocumentList(DocumentTreeVo vo); - - /** - * 新增公司文档 - * @param vo - */ - Integer addDocumentCompany(TbDocumentFolder vo); - - /** - * 新增文件夹权限数据 - * @param auth - */ - void addDocumentAuth(TbDocumentFolderAuth auth); - - /** - * 新增个人文档文件夹 - * @param vo - */ - void addDocumentUser(TbDocumentFolder vo); - - /** - * 插入图片-个人 - * @param productCaseImage - */ - void insertUserFile(TbUserFiles productCaseImage); - - /** - * 插入文档-公司 - * @param productCaseImage - */ - void insertCompanyFile(TbUserFiles productCaseImage); - - /** - * - * @param list - * @param id - */ - void addFileLabel(@Param("list") List list, @Param("id") String id); - - /** - * 文件标签 - * @param list - * @param id - */ - void addUserFileLabel(List list, String id); - - /** - * 查询文件夹下存在的文件 - * @param vo - * @return - */ - List getCompanyFileList(TbUserFiles vo); - - /** - * 查询个人文件数据集合 - * @param vo - * @return - */ - List getUserFileList(TbUserFiles vo); - - /** - * 删除公司下文件 - * @param delete - */ - void deleteCompanyFile(@Param("list") List delete); - - /** - * 删除用户文件 - * @param delete - */ - void deleteUserFile(@Param("list")List delete); - - /** - * 获取 公司文件夹下文件及 - * @param vo - * @return - */ - List getCompanyUserFileList(TbFolderFileVo vo); - - /** - * 个人 文件夹下 的文件夹及我呢见 - * @param vo - * @return - */ - List getMyUserFileList(TbFolderFileVo vo); @@ -144,4 +25,45 @@ public interface DocumentScreenMapper { * @return */ List getUserFolderList(DocumentTreeVo vo); + + /** + * 文件夹名称是否重复 + * @param vo + * @return + */ + Integer getDocumentByNum(TbDocumentFolder vo); + + /** + * 新建文件夹名称 + * @param vo + * @return + */ + Integer addDocumentCompany(TbDocumentFolder vo); + + /** + * 新增文件夹关联信息 + * @param vo + * @return + */ + Integer addDocumentRealUser(TbDocumentFolder vo); + + /** + * 查询数据 + * @param vo + * @return + */ + List getDocumentFileList(TbUserFiles vo); + + /** + * 删除数据 + * @param delete + */ + void deleteCompanyFile(@Param("list") List delete); + + /** + * 查询数据详情 + * @param vo + * @return + */ + List getFileFolderList(TbFolderFileVo vo); } diff --git a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java index ddeff4b..ed1414b 100644 --- a/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java +++ b/bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java @@ -42,7 +42,6 @@ public class DocumentScreenImpl implements DocumentScreenService { */ @Override public AjaxResult getDocumentTree(DocumentTreeVo vo) { - try{ String userId= SecurityUtils.getUserId().toString(); vo.setUserId(userId); @@ -54,8 +53,13 @@ public class DocumentScreenImpl implements DocumentScreenService { vo.setIsAdmin("1"); } List allList=mapper.getPublicFolderList(vo); + List childeList=mapper.getUserFolderList(vo); //查询 子节点集合 + TreeBuild treeBuild1 = new TreeBuild(childeList); + List childeList2=treeBuild1.buildTree1("0",vo.getIsAdmin()); + allList.addAll(childeList2); + //查询 子节点集合 TreeBuild treeBuild = new TreeBuild(allList); List list=treeBuild.buildTree("0"); return AjaxResult.success(list); @@ -79,26 +83,38 @@ public class DocumentScreenImpl implements DocumentScreenService { vo.setId(StringUtils.randomUUID()); //类型 String type=vo.getType(); - //文档库 - vo.setParentIds(vo.getParentIds()+","+vo.getParentId()+","); + vo.setFileType("0"); + // 如果上级节点是public 数据 parentId设置为新的起点 0 if("1".equals(type)){ - Integer num= mapper.addDocumentCompany(vo); - if(num!=null && num>0){ - TbDocumentFolderAuth auth=new TbDocumentFolderAuth(); - auth.setFolderId(vo.getId()); - auth.setUserId(userId); - auth.setFolderType("1"); - auth.setFolderSource("0"); - auth.setFolderAuth("4"); - auth.setIsShare("0"); - //新增数据 - mapper.addDocumentAuth(auth); - }else{ - return AjaxResult.error("添加失败"); - } - }else{ - mapper.addDocumentUser(vo); + vo.setPublicFolderId(vo.getParentId()); + vo.setParentId("0"); } + vo.setParentIds(vo.getParentIds()+vo.getParentId()+","); + /** + * 查询文件夹名称是否重复 + */ + Integer num= mapper.getDocumentByNum(vo); + if(num!=null && num>0){ + return AjaxResult.error("文件夹名称已存在"); + } + Integer num2= mapper.addDocumentCompany(vo); + + if("1".equals(type)){ + vo.setAuthType("4"); + //创建的都是4 + vo.setDataType("1"); + Integer num3= mapper.addDocumentRealUser(vo); + if(num3!=null && num3>0){ + return AjaxResult.success("添加成功"); + }else{ + return AjaxResult.error("添加失败"); + } + } + if(num2!=null && num2>0){ + return AjaxResult.success("添加成功"); + } + + return AjaxResult.success("添加成功"); }catch (Exception e){ log.error(e.getMessage()); @@ -115,6 +131,7 @@ public class DocumentScreenImpl implements DocumentScreenService { @Override public AjaxResult importFile(MultipartFile[] file, TbUserFiles vo) { try{ + String type=vo.getType(); if(file==null ||file.length==0){ return AjaxResult.error("请上传附件"); } @@ -128,32 +145,27 @@ public class DocumentScreenImpl implements DocumentScreenService { vo.setUploadUser(SecurityUtils.getUserId().toString()); vo.setCreateUser(SecurityUtils.getUserId().toString()); String repeatType=vo.getRepeatType(); - // - List list; - if("1".equals(vo.getType())){ - list=mapper.getCompanyFileList(vo); - }else{ - list=mapper.getUserFileList(vo); - } - List fileList=new ArrayList<>(list.size()); - List delete=new ArrayList<>(); + //创建文件 - //覆盖 覆盖会删除之前的数据 + List list=mapper.getDocumentFileList(vo); + List fileList=new ArrayList<>(file.length); + List delete=new ArrayList<>(); + //是否覆盖之前的数据 if("1".equals(repeatType)){ //跳过 for (MultipartFile multipartFile : file) { - String originFileName = multipartFile.getOriginalFilename(); - boolean iscz = true; - for (TbUserFiles tbUserFiles : list) { - assert originFileName != null; - if (originFileName.equals(tbUserFiles.getOriginalName())) { - iscz = false; - break; - } - } - if (iscz) { - fileList.add(multipartFile); + String originFileName = multipartFile.getOriginalFilename(); + boolean iscz = true; + for (TbUserFiles tbUserFiles : list) { + assert originFileName != null; + if (originFileName.equals(tbUserFiles.getOriginalName())) { + iscz = false; + break; } + } + if (iscz) { + fileList.add(multipartFile); + } } }else{ //覆盖 @@ -168,20 +180,16 @@ public class DocumentScreenImpl implements DocumentScreenService { } } } - for (TbUserFiles tbUserFiles : delete) { - //删除文件 - service.delFile(tbUserFiles.getFilePath()); - } - //个人及公司 - if("1".equals(vo.getType())){ - mapper.deleteCompanyFile(delete); - }else{ - mapper.deleteUserFile(delete); - } } - - // 文件上传 + //删除文件 + for (TbUserFiles tbUserFiles : delete) { + //删除文件 + service.delFile(tbUserFiles.getFilePath()); + } + //删除文件 + mapper.deleteCompanyFile(delete); AjaxResult result=uploadFile(fileList,vo); + // 文件上传 if(result.isError()){ return result; } @@ -200,14 +208,21 @@ public class DocumentScreenImpl implements DocumentScreenService { @Override public List getFileFolderList(TbFolderFileVo vo) { try{ + + List list=mapper.getFileFolderList(vo); // 文件夹类型 String type=vo.getType(); if("1".equals(type)){ - //公司文档 - return mapper.getCompanyUserFileList(vo); - }else if("2".equals(type)){ + //公司文档 公共的查询全部 + + + + }else { + + + //自己的文档 - return mapper.getMyUserFileList(vo); + } }catch (Exception e){ @@ -223,14 +238,21 @@ public class DocumentScreenImpl implements DocumentScreenService { */ public AjaxResult uploadFile(List multipartFileList,TbUserFiles files){ String type=files.getType(); - String filePath="" ; + String filePath = "document/file/"+files.getUploadUser() +file_path + + year + file_path + month + file_path + day +file_path ; + TbDocumentFolder documentFolder=new TbDocumentFolder(); + //文件类型 + documentFolder.setFileType("1"); + documentFolder.setId(StringUtils.randomUUID()); + documentFolder.setPublicFolderId(documentFolder.getParentId()); if("1".equals(type)){ - filePath = "document/company/"+files.getUploadUser() +file_path + - year + file_path + month + file_path + day +file_path ; + documentFolder.setParentId("0"); }else{ - filePath = "document/user/" + files.getUploadUser()+file_path + - year + file_path + month + file_path + day +file_path ; + documentFolder.setParentId(files.getParentId()); } + documentFolder.setParentIds(documentFolder.getParentIds()+documentFolder.getParentId()+","); + + // String[] ids=files.getLabelIds().split(","); String[] name= files.getLabels().split(","); List list=new ArrayList(); @@ -264,14 +286,30 @@ public class DocumentScreenImpl implements DocumentScreenService { // 转换为可读格式（如KB/MB） String humanReadableSize = convertToHumanReadable(sizeInBytes); files.setFileSize(humanReadableSize); + //数据 + documentFolder.setFolderName(originFileName); + documentFolder.setFileSuffix(suffix); + documentFolder.setFilePath(filePath); + String userId=SecurityUtils.getUserId().toString(); + documentFolder.setCreateUser(userId); + documentFolder.setUpdateUser(userId); + //新增文档 + Integer num=mapper.addDocumentCompany(documentFolder); if("1".equals(type)){ - //公司级别 - mapper.insertCompanyFile(files); - mapper.addFileLabel(list,files.getId()); + documentFolder.setAuthType("4"); + //创建的都是4 + documentFolder.setDataType("1"); + Integer num3= mapper.addDocumentRealUser(documentFolder); + if(num3!=null && num3>0){ + return AjaxResult.success(); + }else{ + return AjaxResult.error("添加失败"); + } + } + if(num!=null && num>0){ + return AjaxResult.success(); }else{ - // 个人级别 - mapper.insertUserFile(files); - mapper.addUserFileLabel(list,files.getId()); + return AjaxResult.error("添加失败"); } } return AjaxResult.success(); @@ -284,124 +322,15 @@ public class DocumentScreenImpl implements DocumentScreenService { else return String.format("%.2f MB", bytes / (1024 * 1024.0)); } - /** - * 查询 我的共享文档和他人贡献给我的文档 - * @param vo - * @return - */ - private DocumentTreeVo getShareDocument(DocumentTreeVo vo) { - DocumentTreeVo vo1=new DocumentTreeVo(); - vo1.setId("share"); - vo1.setParentId("0"); - vo1.setParentIds("0,"); - vo1.setName("共享文档"); - vo1.setType("3"); - List list=getShareList(vo); - vo1.setChildTree(list); - return vo1; - } - - /** - * 查询共享文档数据集合 - * @param vo - * @return - */ - private List getShareList(DocumentTreeVo vo) { - List allShareList=mapper.getDocumentList(vo); - List list=new ArrayList<>(); - DocumentTreeVo vo1=new DocumentTreeVo(); - vo1.setId("myShare"); - vo1.setParentId("share"); - vo1.setParentIds("share"); - vo1.setName("我共享的"); - vo1.setType("31"); - //我共享出去的文档查询 - List childerList=getMyShareList(vo,allShareList); - vo1.setChildTree(childerList); - DocumentTreeVo vo2=new DocumentTreeVo(); - vo2.setId("otherShare"); - vo2.setParentId("share"); - vo2.setParentIds("share"); - vo2.setName("与我共享"); - vo2.setType("32"); - List childList2=getOtherShare(vo,allShareList); - vo2.setChildTree(childList2); - list.add(vo1); - list.add(vo2); - return list; - } - - /** - * 其他人共享给我的 - * @param vo - * @return - */ - private List getOtherShare(DocumentTreeVo vo, List allShareList) { - //查询他人分享的 -数据源是 文档库 - TreeBuild treeBuild = new TreeBuild(allShareList); - List shareList=mapper.getOtherShare(vo); - for(DocumentTreeVo share:allShareList){ - List list=treeBuild.buildTree(share.getId()); - share.setChildTree(list); - } - return shareList; - } - - /** - * 查询分享给我的文件夹 - * @param vo - * @return - */ - private List getMyShareList(DocumentTreeVo vo, List allShareList) { - //查询我共享出去的文件夹及文件 - TreeBuild treeBuild = new TreeBuild(allShareList); - List shareList=mapper.getMyShareList(vo); - for(DocumentTreeVo share:allShareList){ - List list=treeBuild.buildTree(share.getId()); - share.setChildTree(list); - } - return shareList; - } - - /** - * 查询我的文档数据集合1 - * @param vo - * @return - */ - private DocumentTreeVo getMyChildList(DocumentTreeVo vo) { - DocumentTreeVo vo1=new DocumentTreeVo(); - vo1.setId("myDocument"); - vo1.setParentId("0"); - vo1.setName("我的文档"); - vo1.setType("2"); - List childeList=mapper.getMyChildList(vo); - TreeBuild treeBuild = new TreeBuild(childeList); - List list=treeBuild.buildTree("myDocument"); - vo1.setChildTree(list); - return vo1; - - } - /** - * 公共服务文档数据集合 - * @param vo - * @return - */ - public DocumentTreeVo getCompanyChildList(DocumentTreeVo vo){ - //查询 文档库集合 - DocumentTreeVo vo1=new DocumentTreeVo(); - vo1.setId("companyDocument"); - vo1.setParentId("0"); - vo1.setName("文档库"); - vo1.setType("1"); - List childeList=mapper.getCompanyChildList(vo); - TreeBuild treeBuild = new TreeBuild(childeList); - List list=treeBuild.buildTree("companyDocument"); - vo1.setChildTree(list); - return vo1; - } + + + + + + diff --git a/bonus-business/src/main/resources/mapper/business/DockerLabelMappper.xml b/bonus-business/src/main/resources/mapper/business/DockerLabelMapper.xml similarity index 100% rename from bonus-business/src/main/resources/mapper/business/DockerLabelMappper.xml rename to bonus-business/src/main/resources/mapper/business/DockerLabelMapper.xml diff --git a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml index 5b13ef9..9002073 100644 --- a/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml +++ b/bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml @@ -3,6 +3,30 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> + + insert into tb_user_document_folder( + id, level, folder_name, parent_id, file_type, + remark, parent_ids,file_path, file_id, + down_times, see_times, file_suffix, labels, + create_user, create_time, update_user, update_time, del_flag + )values (#{id},#{level},#{folderName},#{parentId},#{fileType},#{remark},#{parentIds},#{filePath},#{fileId},0,0,#{fileSuffix}, + #{labels},#{createUser},now(),#{updateUser},now(),0 + ) + + + replace into tb_public_real_user( + public_folder_id, user_id, user_folder_id,auth, share_user_id, data_type + )values (#{publicFolderId},#{userId},#{id},#{auth},#{shareUserId},#{dataType}) + + + + update tb_user_document_folder set from del_flag=1 + where id in ( + + #{item.id} + + ) + + + + + + +