diff --git a/src/main/java/com/muyu/aliyun/bailian/AddDataManagement.java b/src/main/java/com/muyu/aliyun/bailian/AddDataManagement.java index 8a06f8e..3d0ee09 100644 --- a/src/main/java/com/muyu/aliyun/bailian/AddDataManagement.java +++ b/src/main/java/com/muyu/aliyun/bailian/AddDataManagement.java @@ -1,38 +1,44 @@ package com.muyu.aliyun.bailian; -import com.aliyun.bailian20231229.Client; -import com.aliyun.bailian20231229.models.AddFileRequest; -import com.aliyun.bailian20231229.models.AddFileResponse; -import com.aliyun.bailian20231229.models.AddFileResponseBody; -import com.aliyun.tea.TeaException; -import com.aliyun.teautil.models.RuntimeOptions; + +import com.aliyun.sdk.service.bailian20231229.AsyncClient; +import com.aliyun.sdk.service.bailian20231229.models.AddFileRequest; +import com.aliyun.sdk.service.bailian20231229.models.AddFileResponse; import com.muyu.aliyun.bailian.data.UploadDataManagementMode; import com.muyu.aliyun.bailian.data.fixed.AddFileResponseBodyDataMode; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import java.util.concurrent.CompletableFuture; +import com.aliyun.sdk.service.bailian20231229.models.AddFileResponseBody; -import java.util.HashMap; -import java.util.Map; @Component @Log4j2 public class AddDataManagement { -// @Autowired - private Client client; + @Autowired + private AsyncClient client; public AddFileResponseBodyDataMode addFile(UploadDataManagementMode uploadDataManagementMode) { - AddFileRequest addFileRequest = new AddFileRequest(); - RuntimeOptions runtime = new RuntimeOptions(); - Map headers = new HashMap<>(); + AddFileRequest addFileRequest = AddFileRequest.builder() + .workspaceId( uploadDataManagementMode.getWorkspaceId() ) + .regionId( uploadDataManagementMode.getLeaseId() ) + .categoryId( uploadDataManagementMode.getLeaseId() ) + .categoryType( uploadDataManagementMode.getCategoryType() ) + .leaseId( uploadDataManagementMode.getLeaseId() ) + .parser( uploadDataManagementMode.getParser() ) + .tags( uploadDataManagementMode.getTags() ) + .build(); + String exceptionName = ""; try { - AddFileResponse addFileResponse = client.addFileWithOptions(uploadDataManagementMode.getWorkspaceId(), addFileRequest, headers, runtime); - if (addFileResponse.getStatusCode() != 200) { - throw new RuntimeException(addFileResponse.toString()); + CompletableFuture addFileResponse = client.addFile(addFileRequest); + AddFileResponse addFileResponseget = addFileResponse.get(); + if (addFileResponseget.getStatusCode() != 200) { + throw new RuntimeException(addFileResponseget.toString()); } - AddFileResponseBody body = addFileResponse.getBody(); - AddFileResponseBody.AddFileResponseBodyData data = body.getData(); + AddFileResponseBody body = addFileResponseget.getBody(); + AddFileResponseBody.Data data = body.getData(); log.info("data:{}", data); return AddFileResponseBodyDataMode.builder() .fileId(data.getFileId()) diff --git a/src/main/java/com/muyu/aliyun/bailian/ReviewResolution.java b/src/main/java/com/muyu/aliyun/bailian/ReviewResolution.java index 5593089..099470e 100644 --- a/src/main/java/com/muyu/aliyun/bailian/ReviewResolution.java +++ b/src/main/java/com/muyu/aliyun/bailian/ReviewResolution.java @@ -2,38 +2,47 @@ package com.muyu.aliyun.bailian; import com.aliyun.bailian20231229.Client; import com.aliyun.bailian20231229.models.*; +import com.aliyun.sdk.service.bailian20231229.AsyncClient; +import com.aliyun.sdk.service.bailian20231229.models.DescribeFileRequest; import com.aliyun.tea.*; -import com.aliyun.teautil.models.RuntimeOptions; +import com.aliyun.sdk.service.bailian20231229.models.DescribeFileResponse; import com.muyu.aliyun.bailian.data.UploadDescribeFileMode; import com.muyu.aliyun.bailian.data.fixed.DescribeFileResponseBodyDataMode; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; - +import com.aliyun.sdk.service.bailian20231229.models.DescribeFileResponseBody; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.CompletableFuture; + @Component @Log4j2 public class ReviewResolution { -// @Autowired - private Client client; + + @Autowired + private AsyncClient client; public DescribeFileResponseBodyDataMode DescribeFile(UploadDescribeFileMode uploadDescribeFileMode) { - RuntimeOptions runtime = new RuntimeOptions(); - Map headers = new HashMap<>(); + DescribeFileRequest describeFileRequest = DescribeFileRequest.builder() + .workspaceId( uploadDescribeFileMode.getWorkspaceId() ) + .regionId( uploadDescribeFileMode.getRegionId() ) + .regionId( uploadDescribeFileMode.getFileId() ) + .build(); try { // 复制代码运行请自行打印 API 的返回值 - DescribeFileResponse describeFileResponse = client.describeFileWithOptions(uploadDescribeFileMode.getWorkspaceId(), uploadDescribeFileMode.getFileId(), headers, runtime); - if (describeFileResponse.getStatusCode() == 200) { + CompletableFuture describeFileResponse = client.describeFile(describeFileRequest); + DescribeFileResponse describeFileResponseget = describeFileResponse.get(); + if (describeFileResponseget.getStatusCode() == 200) { log.info("文件信息获取成功"); } else { log.info("文件信息获取失败"); - throw new RuntimeException(describeFileResponse.toString()); + throw new RuntimeException(describeFileResponseget.toString()); } - DescribeFileResponseBody body = describeFileResponse.getBody(); - DescribeFileResponseBody.DescribeFileResponseBodyData data = body.getData(); + DescribeFileResponseBody body = describeFileResponseget.getBody(); + DescribeFileResponseBody.Data data = body.getData(); log.info("data:{}", data); return DescribeFileResponseBodyDataMode.builder() .categoryId(data.getCategoryId()) diff --git a/src/main/java/com/muyu/aliyun/bailian/data/UploadDataManagementMode.java b/src/main/java/com/muyu/aliyun/bailian/data/UploadDataManagementMode.java index 7b066d5..77d5c00 100644 --- a/src/main/java/com/muyu/aliyun/bailian/data/UploadDataManagementMode.java +++ b/src/main/java/com/muyu/aliyun/bailian/data/UploadDataManagementMode.java @@ -5,6 +5,8 @@ import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import java.util.List; + @Data @Builder @NoArgsConstructor @@ -16,12 +18,37 @@ public class UploadDataManagementMode { * * 用于在系统中唯一标识一个工作空间,便于在不同模块和功能中引用和操作特定的工作空间 */ - private String WorkspaceId; + private String workspaceId; /** * 租约的标识符 * * 用于在系统中唯一标识一个租约,便于在不同模块和功能中引用和操作特定的租约 */ private String LeaseId; + /** + * 区域ID,用于标识不同的区域 + */ + private String regionId; + /** + * 分类ID,用于标识不同的分类 + */ + private String categoryId; + + /** + * 分类类型,用于进一步细化分类 + */ + private String categoryType; + + /** + * 租赁ID,用于标识不同的租赁协议 + */ + private String leaseId; + + /** + * 解析器,用于指定解析规则或工具 + */ + private String parser; + + private List tags; } diff --git a/src/main/java/com/muyu/aliyun/bailian/data/UploadDescribeFileMode.java b/src/main/java/com/muyu/aliyun/bailian/data/UploadDescribeFileMode.java index 20b35f3..ff4c8e7 100644 --- a/src/main/java/com/muyu/aliyun/bailian/data/UploadDescribeFileMode.java +++ b/src/main/java/com/muyu/aliyun/bailian/data/UploadDescribeFileMode.java @@ -15,12 +15,19 @@ public class UploadDescribeFileMode { * 工作空间标识符 * 用于唯一标识一个工作空间,在处理与工作空间相关的操作时使用 */ - private String WorkspaceId; + private String workspaceId; + /** * 文件标识符 * 用于唯一标识一个文件,在处理与文件相关的操作时使用 */ - private String FileId; + private String fileId; + + /** + * 区域ID + * 用于标识特定的地理区域或可用区 + */ + private String regionId; }