diff --git a/casic-task/src/main/java/com/casic/missiles/modular/system/dto/TaskDTO.java b/casic-task/src/main/java/com/casic/missiles/modular/system/dto/TaskDTO.java index 3f7c988..59009f4 100644 --- a/casic-task/src/main/java/com/casic/missiles/modular/system/dto/TaskDTO.java +++ b/casic-task/src/main/java/com/casic/missiles/modular/system/dto/TaskDTO.java @@ -51,9 +51,10 @@ @Data public static class DirectedTask { /** - * {"headingAngle":2.56,"taskDepth":26.6} + * {"headingAngle":[120.0,120.5,270.3,120.9],"directCount":4,"taskDepth":10.0} */ - private Double headingAngle; + private Object headingAngle; + private Integer directCount; private Double taskDepth; } @@ -118,7 +119,8 @@ switch (taskType) { case "1": DirectedTask directedTask = new DirectedTask(); - directedTask.setHeadingAngle(taskObject.getDoubleValue("headingAngle")); + directedTask.setHeadingAngle(taskObject.getJSONArray("headingAngle")); + directedTask.setDirectCount(taskObject.getIntValue("directCount")); directedTask.setTaskDepth(taskObject.getDoubleValue("taskDepth")); this.directedTask = directedTask;