bonus
/
pub_svc_platform_service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
haozq 2025-11-25 09:38:09 +08:00
parent f939eba40a
commit 8a810acce6
3 changed files with 347 additions and 73 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
bonus-business/src/main/java/com/bonus/business/mapper/DocumentScreenMapper.java
View File

@ -159,6 +159,8 @@ public interface DocumentScreenMapper {
*/ */
List<DocumentTreeVo> getFileChildList(); List<DocumentTreeVo> getFileChildList();
List<DocumentTreeVo> getFileChildList2();
/** /**
* 数据查询 * 数据查询
* @param vo * @param vo
@ -197,4 +199,37 @@ public interface DocumentScreenMapper {
* @return * @return
*/ */
Integer getPublicFolderNum(TbFolderFileVo vo); Integer getPublicFolderNum(TbFolderFileVo vo);
/**
* 修改状态类型
* @param childeList2
* @param type
*/
void updateDocumentToType(@Param("list") List<DocumentTreeVo> childeList2,@Param("type") String type,@Param("userId")String userId);
/**
* 修改状态
* @param id
* @param type
*/
void updateDocumentType(@Param("id") String id,@Param("type") String type,@Param("userId")String userId);
/**
* 更新文件内容
* @param tbUserFiles
*/
void updateDocumentData(TbUserFiles tbUserFiles);
/**
* 删除数据
* @param tbUserFiles
*/
void delLables(TbUserFiles tbUserFiles);
/**
* 查询修改数据信息
* @param vo
* @return
*/
TbDocumentFolder getDocumnetData(TbFolderFileVo vo);
} }

308
bonus-business/src/main/java/com/bonus/business/service/impl/DocumentScreenImpl.java
View File

@ -19,10 +19,7 @@ import javax.servlet.http.HttpServletResponse;
import java.io.*; import java.io.*;
import java.nio.file.*; import java.nio.file.*;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList; import java.util.*;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.zip.ZipEntry; import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream; import java.util.zip.ZipOutputStream;
@ -141,7 +138,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
public AjaxResult addDocument(TbDocumentFolder vo) { public AjaxResult addDocument(TbDocumentFolder vo) {
try{ try{
if("3".equals(vo.getType()) || "userDocument".equals(vo.getParentId())){ if("3".equals(vo.getType()) || "userDocument".equals(vo.getParentId())){
vo.setTttt(vo.getType()); vo.setTttt("3");
} }
if("companyDocument".equals(vo.getParentId())){ if("companyDocument".equals(vo.getParentId())){
return AjaxResult.error("当前文件夹下不运行创建文件夹"); return AjaxResult.error("当前文件夹下不运行创建文件夹");
@ -164,13 +161,14 @@ public class DocumentScreenImpl implements DocumentScreenService {
vo.setParentId(vo.getParentId().split("_")[2]); vo.setParentId(vo.getParentId().split("_")[2]);
} }
} }
if("userDocument".equals(type)){ if("userDocument".equals(vo.getParentId())){
vo.setPublicFolderId(vo.getParentId()); vo.setPublicFolderId(vo.getParentId());
vo.setParentId("0"); vo.setParentId("0");
vo.setType("3");
} }
vo.setType("3");
if("3".equals(vo.getType()) || "userDocument".equals(vo.getParentId())){ if("3".equals(vo.getType()) || "userDocument".equals(vo.getParentId())){
vo.setTttt(vo.getType()); vo.setTttt("3");
} }
vo.setParentIds(vo.getParentIds()+vo.getParentId()+","); vo.setParentIds(vo.getParentIds()+vo.getParentId()+",");
@ -233,11 +231,11 @@ public class DocumentScreenImpl implements DocumentScreenService {
vo.setCreateUser(SecurityUtils.getUserId().toString()); vo.setCreateUser(SecurityUtils.getUserId().toString());
String repeatType=vo.getRepeatType(); String repeatType=vo.getRepeatType();
//创建文件 //创建文件
if("userDocument".equals(vo.getType())){ if("userDocument".equals(vo.getParentId())){
vo.setParentId("0"); vo.setParentId("0");
vo.setType("3"); vo.setType("3");
} }
Map<String,TbUserFiles> map=new HashMap<>();
List<TbUserFiles> list=mapper.getDocumentFileList(vo); List<TbUserFiles> list=mapper.getDocumentFileList(vo);
List<MultipartFile> fileList=new ArrayList<>(file.length); List<MultipartFile> fileList=new ArrayList<>(file.length);
List<TbUserFiles> delete=new ArrayList<>(); List<TbUserFiles> delete=new ArrayList<>();
@ -260,29 +258,31 @@ public class DocumentScreenImpl implements DocumentScreenService {
} }
}else{ }else{
//覆盖 //覆盖
for (MultipartFile multipartFile : file) { for (MultipartFile multipartFile : file) {
String originFileName = multipartFile.getOriginalFilename(); String originFileName = multipartFile.getOriginalFilename();
for (TbUserFiles tbUserFiles : list) {
fileList.add(multipartFile); fileList.add(multipartFile);
assert originFileName != null; for (TbUserFiles tbUserFiles : list) {
if (originFileName.equals(tbUserFiles.getOriginalName())) {
delete.add(tbUserFiles); assert originFileName != null;
break; if (originFileName.equals(tbUserFiles.getOriginalName())) {
delete.add(tbUserFiles);
break;
}
} }
} }
} //删除文件
//删除文件 for (TbUserFiles tbUserFiles : delete) {
for (TbUserFiles tbUserFiles : delete) { //删除文件
//删除文件 map.put(tbUserFiles.getOriginalName(),tbUserFiles);
service.delFile(tbUserFiles.getFilePath()); service.delFile(tbUserFiles.getFilePath());
} }
//删除文件 //删除文件
if(delete.size()>0){ // if(delete.size()>0){
mapper.deleteCompanyFile(delete); // // mapper.deleteCompanyFile(delete);
} // }
} }
AjaxResult result=uploadFile(fileList,vo); AjaxResult result=uploadFile(fileList,vo,map);
// 文件上传 // 文件上传
if(result.isError()){ if(result.isError()){
return result; return result;
@ -384,7 +384,6 @@ public class DocumentScreenImpl implements DocumentScreenService {
if("companyDocument".equals(vo.getNewParentId()) || "myShare".equals(vo.getNewParentId()) || "otherShare".equals(vo.getNewParentId())){ if("companyDocument".equals(vo.getNewParentId()) || "myShare".equals(vo.getNewParentId()) || "otherShare".equals(vo.getNewParentId())){
return AjaxResult.error("目标文件夹没有权限"); return AjaxResult.error("目标文件夹没有权限");
} }
//验证目标文件夹名称 //验证目标文件夹名称
String name=mapper.getNowName(vo); String name=mapper.getNowName(vo);
Integer publicFolderNum= mapper.getPublicFolderNum(vo); Integer publicFolderNum= mapper.getPublicFolderNum(vo);
@ -395,17 +394,26 @@ public class DocumentScreenImpl implements DocumentScreenService {
if ("0".equals(vo.getParentId())) { if ("0".equals(vo.getParentId())) {
TbFolderFileVo data=mapper.getDocumentRealData(vo); TbFolderFileVo data=mapper.getDocumentRealData(vo);
TbDocumentFolder documentFolder = getTbDocumentFolder(vo, data); TbDocumentFolder documentFolder = getTbDocumentFolder(vo, data);
documentFolder.setUserId(userId);
//目标不是文档中心 //目标不是文档中心
if("userDocument".equals(vo.getNewParentId())) { if("userDocument".equals(vo.getNewParentId())) {
vo.setToType("3");
int num=mapper.getToName(name,vo.getPublicFolderId()); int num=mapper.getToName(name,vo.getNewParentId());
if(num>0){ if(num>0){
return AjaxResult.error("目标文件夹名称已存在"); return AjaxResult.error("目标文件夹已存在该文件不可移入");
}
List<DocumentTreeVo> childeList=mapper.getFileChildList2();
TreeBuild treeBuild1 = new TreeBuild(childeList);
List<DocumentTreeVo> childeList2=treeBuild1.buildTree(vo.getId());
List<DocumentTreeVo> allList=new ArrayList<>();
getChildListAll(childeList2,allList);
if(!allList.isEmpty()){
mapper.updateDocumentToType(allList,"3",userId);
} }
mapper.deleteDocumentReal(data); mapper.deleteDocumentReal(data);
mapper.addDocumentRealUser(documentFolder); mapper.addDocumentRealUser(documentFolder);
mapper.updateDocumentType(documentFolder.getId(),"3",userId);
}else{ }else{
List<DocumentTreeVo> childeList=mapper.getFileChildList(); List<DocumentTreeVo> childeList=mapper.getFileChildList();
TreeBuild treeBuild1 = new TreeBuild(childeList); TreeBuild treeBuild1 = new TreeBuild(childeList);
List<DocumentTreeVo> childeList2=treeBuild1.buildTree(vo.getId()); List<DocumentTreeVo> childeList2=treeBuild1.buildTree(vo.getId());
@ -413,22 +421,38 @@ public class DocumentScreenImpl implements DocumentScreenService {
if(isChiild){ if(isChiild){
return AjaxResult.error("目标文件夹不能是自己子文件夹"); return AjaxResult.error("目标文件夹不能是自己子文件夹");
} }
int num=mapper.getToName2(name,vo.getNewParentId()); int num=mapper.getToName2(name,vo.getNewParentId());
if(num>0){ if(num>0){
return AjaxResult.error("目标文件夹名称已存在"); return AjaxResult.error("目标文件夹已存在该文件不可移入");
} }
mapper.deleteDocumentReal(data); mapper.deleteDocumentReal(data);
if(publicFolderNum>0){
vo.setNewParentId("0");
vo.setParentIds("0,");
mapper.addDocumentRealUser(documentFolder);
}
List<DocumentTreeVo> childeList3=mapper.getFileChildList2();
TreeBuild treeBuild4 = new TreeBuild(childeList3);
List<DocumentTreeVo> childeList5=treeBuild4.buildTree(vo.getId());
List<DocumentTreeVo> allList=new ArrayList<>();
getChildListAll(childeList5,allList);
if("3".equals(vo.getToType())){ if("3".equals(vo.getToType())){
vo.setToType("3"); vo.setToType("3");
if(!childeList5.isEmpty()){
mapper.updateDocumentToType(allList,"3",userId);
}
}else{ }else{
vo.setToType(null); vo.setToType(null);
if(!childeList5.isEmpty()){
mapper.updateDocumentToType(allList,null,userId);
}
} }
mapper.updateDocumentParentId(vo); mapper.updateDocumentParentId(vo);
} }
}else{ }else{
//非初始化节点 查询全部子数据 //非初始化节点 查询全部子数据
if("3".equals(vo.getToType())){ if("3".equals(vo.getToType()) || "userDocument".equals(vo.getNewParentId())){
vo.setToType("3"); vo.setToType("3");
}else{ }else{
vo.setToType(null); vo.setToType(null);
@ -450,6 +474,15 @@ public class DocumentScreenImpl implements DocumentScreenService {
} }
mapper.addDocumentRealUser(documentFolder); mapper.addDocumentRealUser(documentFolder);
mapper.updateDocumentParentId(vo); mapper.updateDocumentParentId(vo);
List<DocumentTreeVo> childeList=mapper.getFileChildList2();
TreeBuild treeBuild1 = new TreeBuild(childeList);
List<DocumentTreeVo> childeList2=treeBuild1.buildTree(vo.getId());
List<DocumentTreeVo> allList=new ArrayList<>();
getChildListAll(childeList2,allList);
if(!allList.isEmpty()){
mapper.updateDocumentToType(allList,vo.getToType(),userId);
}
mapper.updateDocumentType(documentFolder.getId(),vo.getToType(),userId);
}else{ }else{
List<DocumentTreeVo> childeList=mapper.getFileChildList(); List<DocumentTreeVo> childeList=mapper.getFileChildList();
TreeBuild treeBuild1 = new TreeBuild(childeList); TreeBuild treeBuild1 = new TreeBuild(childeList);
@ -463,6 +496,17 @@ public class DocumentScreenImpl implements DocumentScreenService {
return AjaxResult.error("目标文件夹名称已存在"); return AjaxResult.error("目标文件夹名称已存在");
} }
mapper.updateDocumentParentId(vo); mapper.updateDocumentParentId(vo);
List<DocumentTreeVo> childList5=mapper.getFileChildList2();
TreeBuild treeBuild3 = new TreeBuild(childList5);
List<DocumentTreeVo> childeList4=treeBuild3.buildTree(vo.getId());
List<DocumentTreeVo> allList=new ArrayList<>();
getChildListAll(childeList4,allList);
if(!allList.isEmpty()){
mapper.updateDocumentToType(allList,vo.getToType(),userId);
}
mapper.updateDocumentType(vo.getId(),vo.getToType(),userId);
} }
} }
} }
@ -490,6 +534,15 @@ public class DocumentScreenImpl implements DocumentScreenService {
} }
private void getChildListAll(List<DocumentTreeVo> childeList2,List<DocumentTreeVo> allList) {
for (DocumentTreeVo vo : childeList2){
allList.add(vo);
if( vo.getChildTree()!=null && !vo.getChildTree().isEmpty()){
getChildListAll(vo.getChildTree(),allList);
}
}
}
/** /**
* *
* @param vo * @param vo
@ -602,9 +655,30 @@ public class DocumentScreenImpl implements DocumentScreenService {
@Override @Override
public AjaxResult updateName(TbFolderFileVo vo) { public AjaxResult updateName(TbFolderFileVo vo) {
try{ try{
if(dataIds.contains(vo.getId())){ if(dataIds.contains(vo.getId())){
return AjaxResult.error("当前文件夹不允许重命名"); return AjaxResult.error("当前文件夹不允许重命名");
} }
TbDocumentFolder documentFolder=mapper.getDocumnetData(vo);
if("0".equals(documentFolder.getParentId())){
if("userDocument".equals(documentFolder.getPublicFolderId())){
documentFolder.setType("3");
}else{
documentFolder.setType("1");
}
}else{
if(StringUtils.isEmpty(documentFolder.getPublicFolderId())){
documentFolder.setType("2");
}
}
documentFolder.setUserId(SecurityUtils.getUserId().toString());
documentFolder.setFolderName(vo.getFolderName());
Integer num= mapper.getDocumentByNum(documentFolder);
if(num!=null && num>0){
return AjaxResult.error("文件夹名称已存在");
}
//父节点更新 //父节点更新
String userId=SecurityUtils.getUserId().toString(); String userId=SecurityUtils.getUserId().toString();
@ -875,6 +949,18 @@ public static String getZipPath(){
e.printStackTrace(); e.printStackTrace();
} }
} }
public static void main(String[] args) {
String filePath = "path/to/your/file.txt"; // 示例路径
// 获取后缀
int dotIndex = filePath.lastIndexOf('.');
String extension = dotIndex > 0 ? filePath.substring(dotIndex) : "";
// 获取名称（不带后缀）
String nameWithoutExtension = dotIndex > 0 ? filePath.substring(filePath.lastIndexOf('/') + 1, dotIndex) : filePath;
System.out.println("Extension: " + extension); // 输出后缀
System.out.println("Name without extension: " + nameWithoutExtension); // 输出不带后缀的名称
}
/** /**
* 依据id 查询全部子节点数据 * 依据id 查询全部子节点数据
@ -909,6 +995,27 @@ public static String getZipPath(){
tbDocumentFolder.setFileType(vo2.getFileType()); tbDocumentFolder.setFileType(vo2.getFileType());
tbDocumentFolder.setRemark(vo2.getRemark()); tbDocumentFolder.setRemark(vo2.getRemark());
tbDocumentFolder.setFilePath(vo2.getFilePath()); tbDocumentFolder.setFilePath(vo2.getFilePath());
if("1".equals(vo2.getFileType())){
//
// 获取后缀
int dotIndex = vo2.getName().lastIndexOf('.');
String extension = dotIndex > 0 ? vo2.getName().substring(dotIndex) : "";
// 获取名称（不带后缀）
String nameWithoutExtension = dotIndex > 0 ? vo2.getName().substring(vo2.getName().lastIndexOf('/') + 1, dotIndex) : vo2.getName();
if(nameWithoutExtension.contains("副本")){
tbDocumentFolder.setFolderName(nameWithoutExtension.split("_")[0]+"_副本_"+time+extension);
}else{
tbDocumentFolder.setFolderName(nameWithoutExtension+"_副本_"+time+extension);
}
}else{
if(vo2.getName().contains("副本")){
tbDocumentFolder.setFolderName(vo2.getName().split("_")[0]+"_副本_"+time);
}else{
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
}
}
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time); tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix()); tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
tbDocumentFolder.setLabels(vo2.getLabName()); tbDocumentFolder.setLabels(vo2.getLabName());
@ -926,6 +1033,7 @@ public static String getZipPath(){
//添加关联数据 //添加关联数据
tbDocumentFolder.setAuthType("4"); tbDocumentFolder.setAuthType("4");
tbDocumentFolder.setDataType("1"); tbDocumentFolder.setDataType("1");
tbDocumentFolder.setAuth("4");
if("0".equals(vo.getNewParentId())){ if("0".equals(vo.getNewParentId())){
tbDocumentFolder.setPublicFolderId(vo.getPublicFolderId()); tbDocumentFolder.setPublicFolderId(vo.getPublicFolderId());
}else{ }else{
@ -941,12 +1049,32 @@ public static String getZipPath(){
tbDocumentFolder.setFileType(vo2.getFileType()); tbDocumentFolder.setFileType(vo2.getFileType());
tbDocumentFolder.setRemark(vo2.getRemark()); tbDocumentFolder.setRemark(vo2.getRemark());
tbDocumentFolder.setFilePath(vo2.getFilePath()); tbDocumentFolder.setFilePath(vo2.getFilePath());
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time); if("1".equals(vo2.getFileType())){
// 获取后缀
int dotIndex = vo2.getName().lastIndexOf('.');
String extension = dotIndex > 0 ? vo2.getName().substring(dotIndex) : "";
// 获取名称（不带后缀）
String nameWithoutExtension = dotIndex > 0 ? vo2.getName().substring(vo2.getName().lastIndexOf('/') + 1, dotIndex) : vo2.getName();
if(nameWithoutExtension.contains("副本")){
tbDocumentFolder.setFolderName(nameWithoutExtension.split("_")[0]+"_副本_"+time+extension);
}else{
tbDocumentFolder.setFolderName(nameWithoutExtension+"_副本_"+time+extension);
}
}else{
if(vo2.getName().contains("副本")){
tbDocumentFolder.setFolderName(vo2.getName().split("_")[0]+"_副本_"+time);
}else{
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
}
}
// tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix()); tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
tbDocumentFolder.setLabels(vo2.getLabName()); tbDocumentFolder.setLabels(vo2.getLabName());
tbDocumentFolder.setCreateUser(vo2.getCreateUser()); tbDocumentFolder.setCreateUser(userId);
tbDocumentFolder.setUpdateUser(vo2.getUpdateUser()); tbDocumentFolder.setUpdateUser(userId);
if("3".equals(vo.getToType())){ if("3".equals(vo.getToType()) || "userDocument".equals(vo.getNewParentId())){
tbDocumentFolder.setTttt("3"); tbDocumentFolder.setTttt("3");
} }
mapper.addDocumentCompany(tbDocumentFolder); mapper.addDocumentCompany(tbDocumentFolder);
@ -973,7 +1101,26 @@ public static String getZipPath(){
tbDocumentFolder.setFileType(vo2.getFileType()); tbDocumentFolder.setFileType(vo2.getFileType());
tbDocumentFolder.setRemark(vo2.getRemark()); tbDocumentFolder.setRemark(vo2.getRemark());
tbDocumentFolder.setFilePath(vo2.getFilePath()); tbDocumentFolder.setFilePath(vo2.getFilePath());
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time); if("1".equals(vo2.getFileType())){
// 获取后缀
int dotIndex = vo2.getName().lastIndexOf('.');
String extension = dotIndex > 0 ? vo2.getName().substring(dotIndex) : "";
// 获取名称（不带后缀）
String nameWithoutExtension = dotIndex > 0 ? vo2.getName().substring(vo2.getName().lastIndexOf('/') + 1, dotIndex) : vo2.getName();
if(nameWithoutExtension.contains("副本")){
tbDocumentFolder.setFolderName(nameWithoutExtension.split("_")[0]+"_副本_"+time+extension);
}else{
tbDocumentFolder.setFolderName(nameWithoutExtension+"_副本_"+time+extension);
}
}else{
if(vo2.getName().contains("副本")){
tbDocumentFolder.setFolderName(vo2.getName().split("_")[0]+"_副本_"+time);
}else{
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
}
}
// tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix()); tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
tbDocumentFolder.setLabels(vo2.getLabName()); tbDocumentFolder.setLabels(vo2.getLabName());
tbDocumentFolder.setCreateUser(userId); tbDocumentFolder.setCreateUser(userId);
@ -993,11 +1140,30 @@ public static String getZipPath(){
tbDocumentFolder.setFileType(vo2.getFileType()); tbDocumentFolder.setFileType(vo2.getFileType());
tbDocumentFolder.setRemark(vo2.getRemark()); tbDocumentFolder.setRemark(vo2.getRemark());
tbDocumentFolder.setFilePath(vo2.getFilePath()); tbDocumentFolder.setFilePath(vo2.getFilePath());
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time); if("1".equals(vo2.getFileType())){
// 获取后缀
int dotIndex = vo2.getName().lastIndexOf('.');
String extension = dotIndex > 0 ? vo2.getName().substring(dotIndex) : "";
// 获取名称（不带后缀）
String nameWithoutExtension = dotIndex > 0 ? vo2.getName().substring(vo2.getName().lastIndexOf('/') + 1, dotIndex) : vo2.getName();
if(nameWithoutExtension.contains("副本")){
tbDocumentFolder.setFolderName(nameWithoutExtension.split("_")[0]+"_副本_"+time+extension);
}else{
tbDocumentFolder.setFolderName(nameWithoutExtension+"_副本_"+time+extension);
}
}else{
if(vo2.getName().contains("副本")){
tbDocumentFolder.setFolderName(vo2.getName().split("_")[0]+"_副本_"+time);
}else{
tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
}
}
// tbDocumentFolder.setFolderName(vo2.getName()+"_副本_"+time);
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix()); tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
tbDocumentFolder.setLabels(vo2.getLabName()); tbDocumentFolder.setLabels(vo2.getLabName());
tbDocumentFolder.setCreateUser(vo2.getCreateUser()); tbDocumentFolder.setCreateUser(userId);
tbDocumentFolder.setUpdateUser(vo2.getUpdateUser()); tbDocumentFolder.setUpdateUser(userId);
mapper.addDocumentCompany(tbDocumentFolder); mapper.addDocumentCompany(tbDocumentFolder);
//如果文件 需要copy标签 //如果文件 需要copy标签
if("1".equals(vo2.getFileType())){ if("1".equals(vo2.getFileType())){
@ -1045,17 +1211,18 @@ public static String getZipPath(){
* @param * @param
* @return * @return
*/ */
public AjaxResult uploadFile(List<MultipartFile> multipartFileList,TbUserFiles files){ public AjaxResult uploadFile(List<MultipartFile> multipartFileList,TbUserFiles files, Map<String,TbUserFiles> map){
String type=files.getType(); String type=files.getType();
String filePath = "document/file/"+files.getUploadUser() +separator + String filePath = "document/file/"+files.getUploadUser() +separator +
year + separator + month + separator + day +separator ; year + separator + month + separator + day +separator ;
TbDocumentFolder documentFolder=new TbDocumentFolder(); TbDocumentFolder documentFolder=new TbDocumentFolder();
//文件类型 //文件类型
documentFolder.setFileType("1"); documentFolder.setFileType("1");
documentFolder.setPublicFolderId(files.getParentId()); documentFolder.setPublicFolderId(files.getParentId());
if("1".equals(type) || "userDocument".equals(files.getParentId())){ if("userDocument".equals(files.getFolderId())){
documentFolder.setPublicFolderId("userDocument");
}
if("1".equals(type) || "userDocument".equals(files.getFolderId())){
documentFolder.setParentId("0"); documentFolder.setParentId("0");
}else{ }else{
documentFolder.setParentId(files.getParentId()); documentFolder.setParentId(files.getParentId());
@ -1080,8 +1247,8 @@ public static String getZipPath(){
String originFileName = file.getOriginalFilename(); String originFileName = file.getOriginalFilename();
String suffix=StringUtils.substringAfterLast(originFileName, "."); String suffix=StringUtils.substringAfterLast(originFileName, ".");
//产品 封面 //产品 封面
filePath =filePath+uuid + "." + suffix; String newPath =filePath+uuid + "." + suffix;
String path=service.uploadFile(file, filePath); String path=service.uploadFile(file, newPath);
if(path==null){ if(path==null){
return AjaxResult.error("文件上传失败"); return AjaxResult.error("文件上传失败");
} }
@ -1089,7 +1256,7 @@ public static String getZipPath(){
files.setDownTimes(0); files.setDownTimes(0);
files.setSeeTimes(0); files.setSeeTimes(0);
files.setFileName(uuid+"." + suffix); files.setFileName(uuid+"." + suffix);
files.setFilePath(filePath); files.setFilePath(newPath);
files.setBucketName(path); files.setBucketName(path);
files.setOriginalName(originFileName); files.setOriginalName(originFileName);
files.setFileSuffix(suffix); files.setFileSuffix(suffix);
@ -1101,7 +1268,7 @@ public static String getZipPath(){
//数据 //数据
documentFolder.setFolderName(originFileName); documentFolder.setFolderName(originFileName);
documentFolder.setFileSuffix(suffix); documentFolder.setFileSuffix(suffix);
documentFolder.setFilePath(filePath); documentFolder.setFilePath(newPath);
String userId=SecurityUtils.getUserId().toString(); String userId=SecurityUtils.getUserId().toString();
documentFolder.setCreateUser(userId); documentFolder.setCreateUser(userId);
documentFolder.setUpdateUser(userId); documentFolder.setUpdateUser(userId);
@ -1110,23 +1277,36 @@ public static String getZipPath(){
if("3".equals(type)){ if("3".equals(type)){
documentFolder.setTttt(type); documentFolder.setTttt(type);
} }
documentFolder.setAuth("4");
//新增文档 //新增文档
Integer num=mapper.addDocumentCompany(documentFolder);
//新增文档标签
mapper.addDocumentLabels(list);
if("1".equals(type) || "userDocument".equals(files.getParentId())){ TbUserFiles tbUserFiles=map.get(originFileName);
documentFolder.setAuthType("4"); if(tbUserFiles==null){
//创建的都是4 Integer num=mapper.addDocumentCompany(documentFolder);
documentFolder.setDataType("1"); //新增文档标签
Integer num3= mapper.addDocumentRealUser(documentFolder); mapper.addDocumentLabels(list);
if(num3!=1){
if("1".equals(type) || "userDocument".equals(files.getParentId()) || "userDocument".equals(files.getFolderId())){
documentFolder.setAuthType("4");
//创建的都是4
documentFolder.setDataType("1");
Integer num3= mapper.addDocumentRealUser(documentFolder);
if(num3!=1){
return AjaxResult.error("添加失败");
}
}
if(num!=1){
return AjaxResult.error("添加失败"); return AjaxResult.error("添加失败");
} }
}else{
tbUserFiles.setLabels(files.getLabels());
tbUserFiles.setFilePath(newPath);
mapper.updateDocumentData(tbUserFiles);
mapper.delLables(tbUserFiles);
mapper.addDocumentLabels(list);
} }
if(num!=1){
return AjaxResult.error("添加失败");
}
} }
return AjaxResult.success(); return AjaxResult.success();
} }

77
bonus-business/src/main/resources/mapper/business/DocumentScreenMapper.xml
View File

@ -34,6 +34,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<delete id="cancelShare"> <delete id="cancelShare">
delete from tb_public_real_user where user_folder_id=#{id} and data_type in(2,3) delete from tb_public_real_user where user_folder_id=#{id} and data_type in(2,3)
</delete> </delete>
<delete id="delLables">
delete from tb_document_files_label where file_id=#{id}
</delete>
<insert id="addDocumentLabels"> <insert id="addDocumentLabels">
insert into tb_document_files_label( file_id, lable_id, lable_name)values insert into tb_document_files_label( file_id, lable_id, lable_name)values
<foreach collection="list" item="item" separator=","> <foreach collection="list" item="item" separator=",">
@ -69,6 +72,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<update id="updateDownLoadnums2"> <update id="updateDownLoadnums2">
update tb_public_folder set down_times=#{downNum} where id=#{id} update tb_public_folder set down_times=#{downNum} where id=#{id}
</update> </update>
<update id="updateDocumentToType">
update tb_user_document_folder set type=#{type},create_user=#{userId},update_user=#{userId}
where id in
<foreach collection="list" item="item" open="(" separator="," close=")">
#{item.id}
</foreach>
</update>
<update id="updateDocumentType">
update tb_user_document_folder set type=#{type} ,create_user=#{userId},update_user=#{userId} where id =#{id}
</update>
<update id="updateDocumentData">
update tb_user_document_folder set labels=#{labels},file_path=#{filePath}
where id=#{id}
</update>
<select id="getPublicFolderList" resultType="com.bonus.business.domain.DocumentTreeVo"> <select id="getPublicFolderList" resultType="com.bonus.business.domain.DocumentTreeVo">
select tpf.id,level,tpf.folder_name name,tpf.parent_id parentId,tpf.parent_ids parentIds,file_type fileType, select tpf.id,level,tpf.folder_name name,tpf.parent_id parentId,tpf.parent_ids parentIds,file_type fileType,
1 type 1 type
@ -137,7 +156,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) select count(1)
from tb_user_document_folder from tb_user_document_folder
where del_flag=0 and file_type=0 and folder_name=#{folderName} AND parent_id=#{parentId} where del_flag=0 and file_type=0 and folder_name=#{folderName} AND parent_id=#{parentId}
and create_user=#{userId} and create_user=#{userId}
</if> </if>
</select> </select>
<!--查询文件夹数据集合--> <!--查询文件夹数据集合-->
@ -155,14 +174,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and folder.parent_id=#{parentId} and folder.parent_id=#{parentId}
</if> </if>
<if test='type=="3" or type==3 '> <if test='type=="3" or type==3 '>
and folder.parent_id=#{parentId} AND folder.create_user=#{createUser} <if test="parentId=='userDocument'">
and pru.public_folder_id=#{parentId}
</if>
<if test="parentId!='userDocument'">
and folder.parent_id=#{parentId} AND folder.create_user=#{createUser}
</if>
</if> </if>
</select> </select>
<!--查询文件数据集合--> <!--查询文件数据集合-->
<select id="getFileFolderList" resultType="com.bonus.business.domain.TbFolderFileVo"> <select id="getFileFolderList" resultType="com.bonus.business.domain.TbFolderFileVo">
<if test='type=="1" or type==1 '> <if test='type=="1" or type==1 '>
select tpf.id,tpf.folder_name name ,tpf.parent_id parentId,tpf.parent_ids,1 type ,tpf.down_times downNum,0 fileType, '文件夹' fileSuffix, select distinct tpf.id,tpf.folder_name name ,tpf.parent_id parentId,tpf.parent_ids,1 type ,tpf.down_times downNum,0 fileType, '文件夹' fileSuffix,
'' labName, tpf.id publicFolderId,#{auth} auth,'' filePath, '' labName, tpf.id publicFolderId,#{auth} auth,'' filePath,
tpf.see_times readNum,tpf.create_user,tpf.create_time createTime,tpf.update_time updateTime,su.user_name createUser tpf.see_times readNum,tpf.create_user,tpf.create_time createTime,tpf.update_time updateTime,su.user_name createUser
from tb_public_folder tpf from tb_public_folder tpf
@ -201,14 +224,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
) )
</if> </if>
</if> </if>
<if test='type=="2" or type==2 or type=="4" or type==4'> <if test='type=="2" or type==2 '>
SELECT distinct tudf.id, tudf.folder_name name,tudf.parent_id parentId,tudf.parent_ids,IFNULL(tudf.type,2) type ,tudf.down_times downNum, SELECT distinct tudf.id, tudf.folder_name name,tudf.parent_id parentId,tudf.parent_ids,IFNULL(tudf.type,2) type ,tudf.down_times downNum,
tudf.file_type fileType,tudf.file_suffix fileSuffix,tpru.public_folder_id publicFolderId,if(tpru.auth is null,#{auth},tpru.auth) auth, tudf.file_type fileType,tudf.file_suffix fileSuffix,tpru.public_folder_id publicFolderId,if(tpru.auth is null,#{auth},tpru.auth) auth,
tudf.see_times readNum, tudf.create_user,tudf.create_time createTime,tudf.update_time updateTime,su.user_name createUser, tudf.see_times readNum, tudf.create_user,tudf.create_time createTime,tudf.update_time updateTime,su.user_name createUser,
tudf.file_path filePath, tudf.file_path filePath,
tudf.labels AS labName tudf.labels AS labName
FROM tb_user_document_folder tudf FROM tb_user_document_folder tudf
left join tb_public_real_user tpru on tpru.user_folder_id=tudf.id left join tb_public_real_user tpru on tpru.user_folder_id=tudf.id AND tpru.public_folder_id not in('myShare','otherShare')
left join sys_user su on su.user_id=tudf.create_user
LEFT JOIN tb_document_files_label tdfl on tdfl.file_id = tudf.id
where tudf.del_flag=0 and tudf.parent_id=#{parentId}
<if test='keyWord!=null'>
and INSTR(tudf.folder_name,#{keyWord}) > 0
</if>
<if test="labelIds!=null and labelIds!=''">
AND tdfl.lable_id in(
<foreach collection="labelIdList" item="item" separator=",">
#{item}
</foreach>
)
</if>
</if>
<if test=' type=="4" or type==4'>
SELECT distinct tudf.id, tudf.folder_name name,tudf.parent_id parentId,tudf.parent_ids,IFNULL(tudf.type,2) type ,tudf.down_times downNum,
tudf.file_type fileType,tudf.file_suffix fileSuffix,tpru.public_folder_id publicFolderId,if(tpru.auth is null,#{auth},tpru.auth) auth,
tudf.see_times readNum, tudf.create_user,tudf.create_time createTime,tudf.update_time updateTime,su.user_name createUser,
tudf.file_path filePath,
tudf.labels AS labName
FROM tb_user_document_folder tudf
left join tb_public_real_user tpru on tpru.user_folder_id=tudf.id AND tpru.public_folder_id not in('myShare','otherShare')
left join sys_user su on su.user_id=tudf.create_user left join sys_user su on su.user_id=tudf.create_user
LEFT JOIN tb_document_files_label tdfl on tdfl.file_id = tudf.id LEFT JOIN tb_document_files_label tdfl on tdfl.file_id = tudf.id
where tudf.del_flag=0 and tudf.parent_id=#{parentId} where tudf.del_flag=0 and tudf.parent_id=#{parentId}
@ -230,7 +275,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
tudf.file_path filePath, tudf.file_path filePath,
tudf.labels AS labName tudf.labels AS labName
FROM tb_user_document_folder tudf FROM tb_user_document_folder tudf
left join tb_public_real_user tpru on tpru.user_folder_id=tudf.id left join tb_public_real_user tpru on tpru.user_folder_id=tudf.id AND tpru.public_folder_id not in('myShare','otherShare')
left join sys_user su on su.user_id=tudf.create_user left join sys_user su on su.user_id=tudf.create_user
LEFT JOIN tb_document_files_label tdfl on tdfl.file_id = tudf.id LEFT JOIN tb_document_files_label tdfl on tdfl.file_id = tudf.id
where tudf.del_flag=0 and tudf.create_user=#{userId} where tudf.del_flag=0 and tudf.create_user=#{userId}
@ -258,7 +303,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
public_folder_id publicFolderId,user_id userId, user_folder_id folderId, public_folder_id publicFolderId,user_id userId, user_folder_id folderId,
auth, share_user_id shareUserId, data_type dataType auth, share_user_id shareUserId, data_type dataType
from tb_public_real_user from tb_public_real_user
where user_id=#{userId} and user_folder_id=#{id} and public_folder_id=#{publicFolderId} where user_folder_id=#{id} and public_folder_id=#{publicFolderId}
<if test="publicFolderId=='userDocument'">
and user_id=#{userId}
</if>
</select> </select>
<!--数量--> <!--数量-->
<select id="getLookNum" resultType="java.lang.Integer"> <select id="getLookNum" resultType="java.lang.Integer">
@ -305,7 +353,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<!--查询子数据--> <!--查询子数据-->
<select id="getChilderList" resultType="com.bonus.business.domain.TbFolderFileVo"> <select id="getChilderList" resultType="com.bonus.business.domain.TbFolderFileVo">
select id, folder_name as name, parent_id parentId, file_type fileType, parent_ids parentIds, file_path filePath, select id, folder_name as name, parent_id parentId, file_type fileType, parent_ids parentIds, file_path filePath,
#{newId} newParentId, #{newId} newParentId,labels labName,
IFNULL(down_times,0) downNum, 0 readNum IFNULL(down_times,0) downNum, 0 readNum
from tb_user_document_folder from tb_user_document_folder
where parent_id=#{id} where parent_id=#{id}
@ -336,11 +384,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from tb_user_document_folder from tb_user_document_folder
where file_type=0 where file_type=0
</select> </select>
<select id="getFileChildList2" resultType="com.bonus.business.domain.DocumentTreeVo">
select parent_id,id,folder_name
from tb_user_document_folder
</select>
<select id="getPublicFolderNum" resultType="java.lang.Integer"> <select id="getPublicFolderNum" resultType="java.lang.Integer">
select count(1) select count(1)
FROM tb_public_folder FROM tb_public_folder
WHERE id=#{newParentId} WHERE id=#{newParentId}
</select> </select>
<select id="getDocumnetData" resultType="com.bonus.business.domain.TbDocumentFolder">
select folder.id,folder.folder_name folderName,folder.parent_id parentId,folder.type,pru.public_folder_id publicFolderId
from tb_user_document_folder folder
left join tb_public_real_user pru on folder.id=pru.user_folder_id AND pru.public_folder_id not in('myShare','otherShare')
where folder.id=#{id} and folder.del_flag=0
</select>
</mapper> </mapper>