feat: (REQ-3540) WPS获取文件信息的owner时,没有则取当前登录人
This commit is contained in:
parent
d368c706f7
commit
d2a2857625
@ -22,4 +22,9 @@ public class WpsFetchFileRequest {
|
||||
*/
|
||||
private String docCode;
|
||||
|
||||
/**
|
||||
* 用户Id
|
||||
*/
|
||||
private String personId;
|
||||
|
||||
}
|
||||
|
||||
@ -31,7 +31,7 @@ public class OssSupport {
|
||||
|
||||
private final DocOssGateway docOssGateway;
|
||||
|
||||
public WpsFetchFileResponse fetchFileInfo(String fileKey) {
|
||||
public WpsFetchFileResponse fetchFileInfo(String fileKey, String personId) {
|
||||
fileKey = url2FileKey(fileKey);
|
||||
FetchFileInfoResponse response = docOssGateway.fetchFileInfo(FetchFileInfoRequest.builder().fileKey(fileKey).build());
|
||||
if (Objects.isNull(response) || Objects.isNull(response.getId())) {
|
||||
@ -44,8 +44,8 @@ public class OssSupport {
|
||||
.size(response.getStorageSize())
|
||||
.createAt(response.getCreateAt())
|
||||
.updateAt(response.getUpdateAt())
|
||||
.creatorId(StringUtils.isNotBlank(response.getCreateBy()) ? response.getCreateBy() : Constants.WPS_DEFAULT_USER_ID)
|
||||
.modifierId(StringUtils.isNotBlank(response.getUpdateBy()) ? response.getUpdateBy() : Constants.WPS_DEFAULT_USER_ID)
|
||||
.creatorId(StringUtils.isNotBlank(response.getCreateBy()) ? response.getCreateBy() : personId)
|
||||
.modifierId(StringUtils.isNotBlank(response.getUpdateBy()) ? response.getUpdateBy() : personId)
|
||||
.build();
|
||||
|
||||
}
|
||||
|
||||
@ -37,7 +37,7 @@ public class WpsBaseController implements WpsBaseApi {
|
||||
*/
|
||||
@Override
|
||||
public ApiResult<WpsFetchFileResponse> fetchFile(@Validated @RequestBody WpsFetchFileRequest request) {
|
||||
return ApiResult.ok(wpsBaseManager.fetchFileBase(request.getDocCode()));
|
||||
return ApiResult.ok(wpsBaseManager.fetchFileBase(request.getDocCode(), request.getPersonId()));
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -57,9 +57,9 @@ public class WpsBaseManager {
|
||||
* 获取文件基础信息
|
||||
* @param docCode 文件编码
|
||||
*/
|
||||
public WpsFetchFileResponse fetchFileBase(String docCode) {
|
||||
public WpsFetchFileResponse fetchFileBase(String docCode, String personId) {
|
||||
|
||||
WpsFetchFileResponse wpsFetchFileResponse = ossSupport.fetchFileInfo(docCode);
|
||||
WpsFetchFileResponse wpsFetchFileResponse = ossSupport.fetchFileInfo(docCode, personId);
|
||||
if (Objects.nonNull(wpsFetchFileResponse) && Objects.nonNull(wpsFetchFileResponse.getDocCode())) {
|
||||
return wpsFetchFileResponse;
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user