From 84066c7dfdadaa576ec089731e5d2d9534268492 Mon Sep 17 00:00:00 2001 From: xuzhiheng <2543137953@qq.com> Date: Tue, 24 Jun 2025 11:37:53 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E7=BB=93?= =?UTF-8?q?=E6=9E=84=E4=BD=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kernel/extensions/servicewebapi/JsonBinder.java | 8 +++++++- .../servicewebapi/v1/V1RequestHandler.java | 12 +----------- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/JsonBinder.java b/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/JsonBinder.java index 9b8635c..924cc9b 100644 --- a/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/JsonBinder.java +++ b/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/JsonBinder.java @@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import java.io.IOException; +import java.util.HashMap; /** * Binds JSON strings to objects and vice versa. @@ -59,9 +60,14 @@ public class JsonBinder { public String toJson(Object object) throws IllegalStateException { try { + HashMap wrapper = new HashMap<>(); + wrapper.put("data", object); + wrapper.put("code", 200); + wrapper.put("message", "success"); + return objectMapper .writerWithDefaultPrettyPrinter() - .writeValueAsString(object); + .writeValueAsString(wrapper); } catch (JsonProcessingException exc) { throw new IllegalStateException("Could not produce JSON output", exc); diff --git a/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/v1/V1RequestHandler.java b/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/v1/V1RequestHandler.java index 7711b25..2e26d97 100644 --- a/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/v1/V1RequestHandler.java +++ b/opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/v1/V1RequestHandler.java @@ -292,7 +292,7 @@ public class V1RequestHandler vehicleHandler.postReceiveCallback( request.body() ); - return ""; + return jsonBinder.toJson(""); } private Object handlePostDispatcherTrigger(Request request, Response response) @@ -389,16 +389,6 @@ public class V1RequestHandler dataList ) ); -// return jsonBinder.toJson( -// transportOrderHandler.getTransportOrders( -// transportOrderHandler.createWmsTask( -// request.params(":NAME"), -// executeVehicle, -// type, -// dataList -// ) -// ) -// ); // return jsonBinder.toJson( // GetTransportOrderResponseTO.fromTransportOrder(