diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java b/src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java index 7d82117e..83bbfe9c 100644 --- a/src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java +++ b/src/main/java/org/bench4q/share/models/master/TestPlanDBModel.java @@ -12,7 +12,6 @@ public class TestPlanDBModel { private Date createDateTime; private UserModel userModel; private String testPlanRunId; - private String testPlanModelContent; private String currentStatus; private int failTimes; private boolean reportCreated; @@ -62,15 +61,6 @@ public class TestPlanDBModel { this.testPlanRunId = testPlanRunId; } - @XmlElement - public String getTestPlanModelContent() { - return testPlanModelContent; - } - - public void setTestPlanModelContent(String testPlanModelContent) { - this.testPlanModelContent = testPlanModelContent; - } - @XmlElement public String getCurrentStatus() { return currentStatus; diff --git a/src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java b/src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java index 044e9ac7..ad9001cb 100644 --- a/src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java +++ b/src/main/java/org/bench4q/share/models/master/TestPlanResultModel.java @@ -13,7 +13,7 @@ import org.bench4q.share.enums.master.TestPlanStatus; public class TestPlanResultModel { private UUID testPlanId; private TestPlanStatus currentStatus; - private List runningScriptModels; + private List scriptIds; private List monitorModels; @XmlElement(name = "testPlanId") @@ -34,15 +34,14 @@ public class TestPlanResultModel { this.currentStatus = currentStatus; } - @XmlElementWrapper(name = "ScriptModelList") - @XmlElement(name = "RunningScriptModel") - public List getRunningScriptModels() { - return runningScriptModels; + @XmlElementWrapper(name = "scriptIdList") + @XmlElement(name = "scriptId") + public List getScriptIds() { + return scriptIds; } - public void setRunningScriptModels( - List runningScriptContextModels) { - this.runningScriptModels = runningScriptContextModels; + public void setScriptIds(List scriptIds) { + this.scriptIds = scriptIds; } @XmlElementWrapper(name = "MonitorModelList")