From 75dab1689bbedd434ae0100ef4901714ea92872a Mon Sep 17 00:00:00 2001 From: weiweiw <14335254+weiweiw22@user.noreply.gitee.com> Date: Tue, 26 Nov 2024 13:03:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=A8=E7=BA=BF=E6=A0=87?= =?UTF-8?q?=E6=B3=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../client/OnlineAnnotationServiceOkHttp.java | 4 +- .../com/bonus/ai/client/TaskInputParam.java | 64 +++++++++++++++++++ .../dataset/AnnotationTaskServiceImpl.java | 4 +- 3 files changed, 68 insertions(+), 4 deletions(-) create mode 100644 bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/TaskInputParam.java diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/OnlineAnnotationServiceOkHttp.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/OnlineAnnotationServiceOkHttp.java index 23b6e70..7871e59 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/OnlineAnnotationServiceOkHttp.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/OnlineAnnotationServiceOkHttp.java @@ -89,7 +89,7 @@ public class OnlineAnnotationServiceOkHttp { * task <------> 人工智能数据中心的具体的标注文件 * task 增删改查 */ - public TaskParam createTask(TaskParam taskParam) throws IOException { + public TaskParam createTask(TaskInputParam taskParam) throws IOException { String url = onlineAnnotateConfig.getUrl()+ "/tasks/"; String json = objectMapper.writeValueAsString(taskParam); @@ -130,7 +130,7 @@ public class OnlineAnnotationServiceOkHttp { return response != null && !response.isEmpty(); } - public TaskParam updateTask(TaskParam taskParam) throws IOException { + public TaskParam updateTask(TaskInputParam taskParam) throws IOException { String url = onlineAnnotateConfig.getUrl()+ "/tasks/"+ taskParam.getId() + "/"; String json = objectMapper.writeValueAsString(taskParam); diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/TaskInputParam.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/TaskInputParam.java new file mode 100644 index 0000000..e3db294 --- /dev/null +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/client/TaskInputParam.java @@ -0,0 +1,64 @@ +package com.bonus.ai.client; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import lombok.Data; + +import java.util.List; +import java.util.Map; + +//@JsonIgnoreProperties(ignoreUnknown = true) +@Data +public class TaskInputParam { + + private Data data; + + private Long project; + + private Long id; + // Getters and Setters for all fields + + @lombok.Data + public static class Data { + private String image; + private String text; + } + + public static class UpdatedBy { + @JsonProperty("user_id") + private int userId; + + // Getters and Setters + } + + public static TaskInputParam fromJson(String json) throws JsonProcessingException { + ObjectMapper mapper = new ObjectMapper(); + // 注册 Java 时间模块 + mapper.registerModule(new JavaTimeModule()); + return mapper.readValue(json, TaskInputParam.class); + } + + public String toJson() throws Exception { + ObjectMapper mapper = new ObjectMapper(); + return mapper.writeValueAsString(this); + } + + public static void main(String[] args) throws JsonProcessingException { + String json = "{\n" + + " \"data\": {\n" + + " \"image\": \"https://example.com/image.jpg\",\n" + + " \"text\": \"Hello, world!\"\n" + + " },\n" + + " \"project\": 4\n" + + "}"; + + + System.out.println(json); + + TaskInputParam record = TaskInputParam.fromJson(json); + System.out.println("Image URL: " + record.getData().getImage()); + } +} + diff --git a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java index c8172ad..96f7c6c 100644 --- a/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java +++ b/bonus-modules/bonus-ai/src/main/java/com/bonus/ai/service/Impl/dataset/AnnotationTaskServiceImpl.java @@ -109,8 +109,8 @@ public class AnnotationTaskServiceImpl implements AnnotationTaskService { entity.setTaskId(annotationTaskid); Long finalProjectId = projectId; executorService.execute(()->{ - TaskParam taskParam = new TaskParam(); - TaskParam.Data data = new TaskParam.Data(); + TaskInputParam taskParam = new TaskInputParam(); + TaskInputParam.Data data = new TaskInputParam.Data(); String imageUrl = minioConfig.getEndpoint() + "/" + minioConfig.getBucketName() + "/"+ entity.getFileUrl(); data.setImage(imageUrl); data.setText("Hello, world!");