agv/opentcs
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改返回结构体

Browse Source
This commit is contained in:
xuzhiheng 2025-06-24 11:37:53 +08:00
parent 6d96ea6891
commit 84066c7dfd
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/JsonBinder.java
View File

@ -7,6 +7,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature; import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import java.io.IOException; import java.io.IOException;
import java.util.HashMap;
/** /**
* Binds JSON strings to objects and vice versa. * Binds JSON strings to objects and vice versa.
@ -59,9 +60,14 @@ public class JsonBinder {
public String toJson(Object object) public String toJson(Object object)
throws IllegalStateException { throws IllegalStateException {
try { try {
HashMap<String, Object> wrapper = new HashMap<>();
wrapper.put("data", object);
wrapper.put("code", 200);
wrapper.put("message", "success");
return objectMapper return objectMapper
.writerWithDefaultPrettyPrinter() .writerWithDefaultPrettyPrinter()
.writeValueAsString(object); .writeValueAsString(wrapper);
} }
catch (JsonProcessingException exc) { catch (JsonProcessingException exc) {
throw new IllegalStateException("Could not produce JSON output", exc); throw new IllegalStateException("Could not produce JSON output", exc);

12
opentcs-kernel-extension-http-services/src/main/java/org/opentcs/kernel/extensions/servicewebapi/v1/V1RequestHandler.java
View File

@ -292,7 +292,7 @@ public class V1RequestHandler
vehicleHandler.postReceiveCallback( vehicleHandler.postReceiveCallback(
request.body() request.body()
); );
return ""; return jsonBinder.toJson("");
} }
private Object handlePostDispatcherTrigger(Request request, Response response) private Object handlePostDispatcherTrigger(Request request, Response response)
@ -389,16 +389,6 @@ public class V1RequestHandler
dataList dataList
) )
); );
// return jsonBinder.toJson(
// transportOrderHandler.getTransportOrders(
// transportOrderHandler.createWmsTask(
// request.params(":NAME"),
// executeVehicle,
// type,
// dataList
// )
// )
// );
// return jsonBinder.toJson( // return jsonBinder.toJson(
// GetTransportOrderResponseTO.fromTransportOrder( // GetTransportOrderResponseTO.fromTransportOrder(