ak/file
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

!109 代码合并

Browse Source 
Merge pull request !109 from MAC/develop
This commit is contained in:
MAC 2022-03-30 13:11:57 +00:00 committed by Gitee
commit 215d7fbe1f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/qiwenshare/file/controller/OfficeController.java
View File

@ -122,15 +122,11 @@ public class OfficeController {
userFile.setFileId(fileBean.getFileId());
userFileService.save(userFile);
}
result.success();
result.setMessage("文件创建成功！");
return RestResult.success().message("文件创建成功");
} catch (Exception e) {
log.error(e.getMessage());
result.setCode(500);
result.setMessage("服务器错误！");
return RestResult.fail().message(e.getMessage());
}
return result;
}
@Operation(summary = "预览office文件", description = "预览office文件", tags = {"office"})

3
src/main/java/com/qiwenshare/file/service/FiletransferService.java
View File

@ -202,7 +202,7 @@ public class FiletransferService implements IFiletransferService {
userFile.setIsDir(0);
List<UserFile> userFileList = userFileMapper.selectList(new QueryWrapper<>(userFile));
if (userFileList.size() > 0) {
String fileName = fileDealComp.getRepeatFileName(userFile, uploadFileDto.getFilePath());
String fileName = fileDealComp.getRepeatFileName(userFile, userFile.getFilePath());
userFile.setFileName(fileName);
}
userFile.setFileId(fileBean.getFileId());
@ -391,7 +391,6 @@ public class FiletransferService implements IFiletransferService {
}
PreviewFile previewFile = new PreviewFile();
previewFile.setFileUrl(fileBean.getFileUrl());
// previewFile.setFileSize(fileBean.getFileSize());
try {
if ("true".equals(previewDTO.getIsMin())) {
previewer.imageThumbnailPreview(httpServletResponse, previewFile);

12
src/main/java/com/qiwenshare/file/service/UserFileService.java
View File

@ -118,13 +118,13 @@ public class UserFileService extends ServiceImpl<UserFileMapper, UserFile> impl
oldfilePath = oldfilePath + fileName + "/";
newfilePath = newfilePath + fileName + "/";
oldfilePath = oldfilePath.replace("\\", "\\\\\\\\");
oldfilePath = oldfilePath.replace("'", "\\'");
oldfilePath = oldfilePath.replace("%", "\\%");
oldfilePath = oldfilePath.replace("_", "\\_");
if (StringUtils.isEmpty(extendName)) { //为空说明是目录，则需要移动子目录
userFileMapper.updateFilepathByFilepath(oldfilePath, newfilePath, userId);
List<UserFile> list = selectFileListLikeRightFilePath(oldfilePath, userId);
for (UserFile newUserFile : list) {
newUserFile.setFilePath(newUserFile.getFilePath().replaceFirst(oldfilePath, newfilePath));
userFileMapper.updateById(newUserFile);
}
}
}

3
src/main/java/com/qiwenshare/file/util/OperationLogUtil.java
View File

@ -1,5 +1,6 @@
package com.qiwenshare.file.util;
import com.qiwenshare.common.constant.PlatformEnum;
import com.qiwenshare.common.util.CollectUtil;
import com.qiwenshare.common.util.DateUtil;
import com.qiwenshare.file.domain.OperationLogBean;
@ -29,7 +30,7 @@ public class OperationLogUtil {
operationLogBean.setResult(isSuccess);
operationLogBean.setOperation(operation);
operationLogBean.setDetail(detail);
operationLogBean.setPlatform(3);
operationLogBean.setPlatform(PlatformEnum.PAN.getCode());
return operationLogBean;
}