接口联调
This commit is contained in:
parent
f0f96e1673
commit
d5997b427e
|
|
@ -101,7 +101,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
}else {
|
||||
vo.setParentId(vo.getParentId().split("_")[2]);
|
||||
}
|
||||
vo.setParentIds(vo.getParentIds()+vo.getParentId()+",");
|
||||
vo.setParentIds(vo.getParentIds()+vo.getParentId()+",");
|
||||
/**
|
||||
* 查询文件夹名称是否重复
|
||||
*/
|
||||
|
|
@ -321,7 +321,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
String userId=SecurityUtils.getUserId().toString();
|
||||
vo.setUserId(userId);
|
||||
if("1".equals(vo.getType())){
|
||||
return AjaxResult.success("当前文件夹没权限共享");
|
||||
return AjaxResult.success("当前文件夹没权限共享");
|
||||
}else{
|
||||
//
|
||||
vo.setId(vo.getId().split("_")[2]);
|
||||
|
|
@ -395,25 +395,25 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
@Override
|
||||
public AjaxResult copy(TbFolderFileVo vo) {
|
||||
try{
|
||||
//父节点更新
|
||||
String userId=SecurityUtils.getUserId().toString();
|
||||
vo.setUserId(userId);
|
||||
if(dataIds.contains(vo.getToId())){
|
||||
return AjaxResult.success("目标文件夹不允许创建副本");
|
||||
}
|
||||
if("1".equals(vo.getType())){
|
||||
//父节点更新
|
||||
String userId=SecurityUtils.getUserId().toString();
|
||||
vo.setUserId(userId);
|
||||
if(dataIds.contains(vo.getToId())){
|
||||
return AjaxResult.success("目标文件夹不允许创建副本");
|
||||
}
|
||||
if("1".equals(vo.getType())){
|
||||
return AjaxResult.success("当前文件夹不允许添加副本");
|
||||
}else{
|
||||
}else{
|
||||
|
||||
vo.setId(vo.getId().split("_")[2]);
|
||||
//查询当前节点下全部信息
|
||||
//重新添加头部信息
|
||||
getTreeList(vo);
|
||||
vo.setId(vo.getId().split("_")[2]);
|
||||
//查询当前节点下全部信息
|
||||
//重新添加头部信息
|
||||
getTreeList(vo);
|
||||
}
|
||||
return AjaxResult.success("添加副本成功");
|
||||
}catch (Exception e){
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
return AjaxResult.success("添加副本成功");
|
||||
}catch (Exception e){
|
||||
log.error(e.toString(),e);
|
||||
}
|
||||
return AjaxResult.error("副本添加失败");
|
||||
}
|
||||
|
||||
|
|
@ -444,7 +444,7 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
//图片压缩包
|
||||
List<UploadFileVo> fileVoList=new ArrayList<>();
|
||||
String packageName =DateUtils.getYMDDate()+ "下载压缩包.zip";
|
||||
// String url=minioUtil.downloadFilesAsZip(null,fileVoList,packageName);
|
||||
// String url=minioUtil.downloadFilesAsZip(null,fileVoList,packageName);
|
||||
minioUtil.fileDownload("",response);
|
||||
//删除指定文件
|
||||
minioUtil.deleteObject("");
|
||||
|
|
@ -474,51 +474,51 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
}
|
||||
//第一节点直接存储到父节点
|
||||
if("1".equals(vo.getToType())){
|
||||
TbDocumentFolder tbDocumentFolder=new TbDocumentFolder();
|
||||
for (TbFolderFileVo vo2 : treeList) {
|
||||
tbDocumentFolder.setId(vo2.getNewId());
|
||||
tbDocumentFolder.setLevel(vo2.getLevel());
|
||||
tbDocumentFolder.setParentId("0");
|
||||
tbDocumentFolder.setParentIds("0,");
|
||||
tbDocumentFolder.setFileType(vo2.getFileType());
|
||||
tbDocumentFolder.setRemark(vo2.getRemark());
|
||||
tbDocumentFolder.setFilePath(vo2.getFilePath());
|
||||
tbDocumentFolder.setFolderName(vo2.getName()+"_副本");
|
||||
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
|
||||
tbDocumentFolder.setLabels(vo2.getLabName());
|
||||
tbDocumentFolder.setCreateUser(vo2.getCreateUser());
|
||||
tbDocumentFolder.setUpdateUser(vo2.getUpdateUser());
|
||||
mapper.addDocumentCompany(tbDocumentFolder);
|
||||
//如果文件 需要copy标签
|
||||
if("1".equals(vo2.getFileType())){
|
||||
List<TbUserLabel> labList=mapper.getLabelsList(vo2);
|
||||
mapper.addDocumentLabels(labList);
|
||||
}
|
||||
//添加关联数据
|
||||
tbDocumentFolder.setAuthType("4");
|
||||
tbDocumentFolder.setDataType("1");
|
||||
mapper.addDocumentRealUser(tbDocumentFolder);
|
||||
}
|
||||
for (TbFolderFileVo vo2 : list) {
|
||||
tbDocumentFolder.setId(vo2.getNewId());
|
||||
tbDocumentFolder.setLevel(vo2.getLevel());
|
||||
tbDocumentFolder.setParentId(vo2.getNewParentId());
|
||||
tbDocumentFolder.setParentIds(vo2.getParentIds()+vo2.getNewParentId()+",");
|
||||
tbDocumentFolder.setFileType(vo2.getFileType());
|
||||
tbDocumentFolder.setRemark(vo2.getRemark());
|
||||
tbDocumentFolder.setFilePath(vo2.getFilePath());
|
||||
tbDocumentFolder.setFolderName(vo2.getName()+"_副本");
|
||||
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
|
||||
tbDocumentFolder.setLabels(vo2.getLabName());
|
||||
tbDocumentFolder.setCreateUser(vo2.getCreateUser());
|
||||
tbDocumentFolder.setUpdateUser(vo2.getUpdateUser());
|
||||
mapper.addDocumentCompany(tbDocumentFolder);
|
||||
//如果文件 需要copy标签
|
||||
if("1".equals(vo2.getFileType())){
|
||||
List<TbUserLabel> labList=mapper.getLabelsList(vo2);
|
||||
mapper.addDocumentLabels(labList);
|
||||
}
|
||||
}
|
||||
TbDocumentFolder tbDocumentFolder=new TbDocumentFolder();
|
||||
for (TbFolderFileVo vo2 : treeList) {
|
||||
tbDocumentFolder.setId(vo2.getNewId());
|
||||
tbDocumentFolder.setLevel(vo2.getLevel());
|
||||
tbDocumentFolder.setParentId("0");
|
||||
tbDocumentFolder.setParentIds("0,");
|
||||
tbDocumentFolder.setFileType(vo2.getFileType());
|
||||
tbDocumentFolder.setRemark(vo2.getRemark());
|
||||
tbDocumentFolder.setFilePath(vo2.getFilePath());
|
||||
tbDocumentFolder.setFolderName(vo2.getName()+"_副本");
|
||||
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
|
||||
tbDocumentFolder.setLabels(vo2.getLabName());
|
||||
tbDocumentFolder.setCreateUser(vo2.getCreateUser());
|
||||
tbDocumentFolder.setUpdateUser(vo2.getUpdateUser());
|
||||
mapper.addDocumentCompany(tbDocumentFolder);
|
||||
//如果文件 需要copy标签
|
||||
if("1".equals(vo2.getFileType())){
|
||||
List<TbUserLabel> labList=mapper.getLabelsList(vo2);
|
||||
mapper.addDocumentLabels(labList);
|
||||
}
|
||||
//添加关联数据
|
||||
tbDocumentFolder.setAuthType("4");
|
||||
tbDocumentFolder.setDataType("1");
|
||||
mapper.addDocumentRealUser(tbDocumentFolder);
|
||||
}
|
||||
for (TbFolderFileVo vo2 : list) {
|
||||
tbDocumentFolder.setId(vo2.getNewId());
|
||||
tbDocumentFolder.setLevel(vo2.getLevel());
|
||||
tbDocumentFolder.setParentId(vo2.getNewParentId());
|
||||
tbDocumentFolder.setParentIds(vo2.getParentIds()+vo2.getNewParentId()+",");
|
||||
tbDocumentFolder.setFileType(vo2.getFileType());
|
||||
tbDocumentFolder.setRemark(vo2.getRemark());
|
||||
tbDocumentFolder.setFilePath(vo2.getFilePath());
|
||||
tbDocumentFolder.setFolderName(vo2.getName()+"_副本");
|
||||
tbDocumentFolder.setFileSuffix(vo2.getFileSuffix());
|
||||
tbDocumentFolder.setLabels(vo2.getLabName());
|
||||
tbDocumentFolder.setCreateUser(vo2.getCreateUser());
|
||||
tbDocumentFolder.setUpdateUser(vo2.getUpdateUser());
|
||||
mapper.addDocumentCompany(tbDocumentFolder);
|
||||
//如果文件 需要copy标签
|
||||
if("1".equals(vo2.getFileType())){
|
||||
List<TbUserLabel> labList=mapper.getLabelsList(vo2);
|
||||
mapper.addDocumentLabels(labList);
|
||||
}
|
||||
}
|
||||
|
||||
}else{
|
||||
//目标路径
|
||||
|
|
@ -574,17 +574,17 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
* @return
|
||||
*/
|
||||
private List<TbFolderFileVo> getChilderList(TbFolderFileVo vo2, List<TbFolderFileVo> list) {
|
||||
List<TbFolderFileVo> childer= mapper.getChilderList(vo2);
|
||||
if(childer!=null && !childer.isEmpty()){
|
||||
list.addAll(childer);
|
||||
for (TbFolderFileVo vo : childer) {
|
||||
String uuid=StringUtils.randomUUID();
|
||||
vo.setNewId(uuid);
|
||||
getChilderList(vo,list);
|
||||
}
|
||||
vo2.setChild(childer);
|
||||
List<TbFolderFileVo> childer= mapper.getChilderList(vo2);
|
||||
if(childer!=null && !childer.isEmpty()){
|
||||
list.addAll(childer);
|
||||
for (TbFolderFileVo vo : childer) {
|
||||
String uuid=StringUtils.randomUUID();
|
||||
vo.setNewId(uuid);
|
||||
getChilderList(vo,list);
|
||||
}
|
||||
return childer;
|
||||
vo2.setChild(childer);
|
||||
}
|
||||
return childer;
|
||||
}
|
||||
|
||||
private TbDocumentFolder getTbDocumentFolder(TbFolderFileVo vo, TbFolderFileVo data) {
|
||||
|
|
@ -608,35 +608,35 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
String type=files.getType();
|
||||
String filePath = "document/file/"+files.getUploadUser() +separator +
|
||||
year + separator + month + separator + day +separator ;
|
||||
TbDocumentFolder documentFolder=new TbDocumentFolder();
|
||||
//文件类型
|
||||
String documentId=StringUtils.randomUUID();
|
||||
documentFolder.setFileType("1");
|
||||
documentFolder.setId(documentId);
|
||||
documentFolder.setPublicFolderId(documentFolder.getParentId());
|
||||
if("1".equals(type)){
|
||||
documentFolder.setParentId("0");
|
||||
}else{
|
||||
documentFolder.setParentId(files.getParentId());
|
||||
}
|
||||
documentFolder.setParentIds(documentFolder.getParentIds()+documentFolder.getParentId()+",");
|
||||
//
|
||||
String[] ids=files.getLabelIds().split(",");
|
||||
String[] name= files.getLabels().split(",");
|
||||
List<TbUserLabel> list=new ArrayList<TbUserLabel>();
|
||||
TbUserLabel vo=new TbUserLabel();
|
||||
for (int i = 0; i <ids.length ; i++) {
|
||||
vo.setFileId(documentId);
|
||||
vo.setLabelId(ids[i]);
|
||||
vo.setLabelName(name[i]);
|
||||
list.add(vo);
|
||||
}
|
||||
TbDocumentFolder documentFolder=new TbDocumentFolder();
|
||||
//文件类型
|
||||
String documentId=StringUtils.randomUUID();
|
||||
documentFolder.setFileType("1");
|
||||
documentFolder.setId(documentId);
|
||||
documentFolder.setPublicFolderId(documentFolder.getParentId());
|
||||
if("1".equals(type)){
|
||||
documentFolder.setParentId("0");
|
||||
}else{
|
||||
documentFolder.setParentId(files.getParentId());
|
||||
}
|
||||
documentFolder.setParentIds(documentFolder.getParentIds()+documentFolder.getParentId()+",");
|
||||
//
|
||||
String[] ids=files.getLabelIds().split(",");
|
||||
String[] name= files.getLabels().split(",");
|
||||
List<TbUserLabel> list=new ArrayList<TbUserLabel>();
|
||||
TbUserLabel vo=new TbUserLabel();
|
||||
for (int i = 0; i <ids.length ; i++) {
|
||||
vo.setFileId(documentId);
|
||||
vo.setLabelId(ids[i]);
|
||||
vo.setLabelName(name[i]);
|
||||
list.add(vo);
|
||||
}
|
||||
for (MultipartFile file: multipartFileList) {
|
||||
String uuid = StringUtils.randomUUID();
|
||||
String originFileName = file.getOriginalFilename();
|
||||
String suffix=StringUtils.substringAfterLast(originFileName, ".");
|
||||
//产品 封面
|
||||
filePath =filePath+uuid + "." + suffix;
|
||||
filePath =filePath+uuid + "." + suffix;
|
||||
String path=service.uploadFile(file, filePath);
|
||||
if(path==null){
|
||||
return AjaxResult.error("文件上传失败");
|
||||
|
|
@ -693,20 +693,4 @@ public class DocumentScreenImpl implements DocumentScreenService {
|
|||
else return String.format("%.2f MB", bytes / (1024 * 1024.0));
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue