diff --git a/src/main/java/com/lz/modules/app/dto/ResultDto.java b/src/main/java/com/lz/modules/app/dto/ResultDto.java index ba7f3d8a..d86a55be 100644 --- a/src/main/java/com/lz/modules/app/dto/ResultDto.java +++ b/src/main/java/com/lz/modules/app/dto/ResultDto.java @@ -6,31 +6,25 @@ import lombok.Data; @Data public class ResultDto { @TaskHeader(value = "index", order = 0) - private Integer index; - @TaskHeader(value = "id", order = 1) - private Long id; - @TaskHeader(value = "内容", order = 2) - private String content; - @TaskHeader(value = "进度", order = 3) //返回值如30%, 如果没有可以不填写 + private String index; + + @TaskHeader(value = "进度", order = 1) //返回值如30%, 如果没有可以不填写 private String rate; + private Long detailId; + private Long taskId; + + @TaskHeader(value = "内容", order = 3) + private String content; public ResultDto() { } - public ResultDto(@TaskHeader("索引") Integer index, @TaskHeader("Id") Long id, @TaskHeader("内容") String content) { + public ResultDto(@TaskHeader(value = "index", order = 0) String index, @TaskHeader(value = "进度", order = 1) String rate, Long detailId, Long taskId, @TaskHeader(value = "内容", order = 3) String content) { this.index = index; - this.id = id; - this.content = content; - } - - - public ResultDto(@TaskHeader("index") Integer index, @TaskHeader("id") Long id, @TaskHeader("内容") String content, @TaskHeader("进度") String rate) { - this.index = index; - this.id = id; - this.content = content; this.rate = rate; + this.detailId = detailId; + this.taskId = taskId; + this.content = content; } - - } diff --git a/src/main/java/com/lz/modules/command/base1000/TaskCommand.java b/src/main/java/com/lz/modules/command/base1000/TaskCommand.java index 6306dec7..2d6b6f1b 100644 --- a/src/main/java/com/lz/modules/command/base1000/TaskCommand.java +++ b/src/main/java/com/lz/modules/command/base1000/TaskCommand.java @@ -212,9 +212,4 @@ public class TaskCommand extends BaseCommand implements ICommand { } - public static void main(String[] args) { - CLI cli = CLIConfigurator.define(TaskCommand.class); - System.out.println(JSON.toJSONString(cli)); - } - }