This commit is contained in:
coderfengyun 2014-02-21 17:53:16 +08:00
parent 6d791b7035
commit d748c293f3
2 changed files with 7 additions and 18 deletions

View File

@ -12,7 +12,6 @@ public class TestPlanDBModel {
private Date createDateTime; private Date createDateTime;
private UserModel userModel; private UserModel userModel;
private String testPlanRunId; private String testPlanRunId;
private String testPlanModelContent;
private String currentStatus; private String currentStatus;
private int failTimes; private int failTimes;
private boolean reportCreated; private boolean reportCreated;
@ -62,15 +61,6 @@ public class TestPlanDBModel {
this.testPlanRunId = testPlanRunId; this.testPlanRunId = testPlanRunId;
} }
@XmlElement
public String getTestPlanModelContent() {
return testPlanModelContent;
}
public void setTestPlanModelContent(String testPlanModelContent) {
this.testPlanModelContent = testPlanModelContent;
}
@XmlElement @XmlElement
public String getCurrentStatus() { public String getCurrentStatus() {
return currentStatus; return currentStatus;

View File

@ -13,7 +13,7 @@ import org.bench4q.share.enums.master.TestPlanStatus;
public class TestPlanResultModel { public class TestPlanResultModel {
private UUID testPlanId; private UUID testPlanId;
private TestPlanStatus currentStatus; private TestPlanStatus currentStatus;
private List<RunningScriptModel> runningScriptModels; private List<Integer> scriptIds;
private List<MonitorModel> monitorModels; private List<MonitorModel> monitorModels;
@XmlElement(name = "testPlanId") @XmlElement(name = "testPlanId")
@ -34,15 +34,14 @@ public class TestPlanResultModel {
this.currentStatus = currentStatus; this.currentStatus = currentStatus;
} }
@XmlElementWrapper(name = "ScriptModelList") @XmlElementWrapper(name = "scriptIdList")
@XmlElement(name = "RunningScriptModel") @XmlElement(name = "scriptId")
public List<RunningScriptModel> getRunningScriptModels() { public List<Integer> getScriptIds() {
return runningScriptModels; return scriptIds;
} }
public void setRunningScriptModels( public void setScriptIds(List<Integer> scriptIds) {
List<RunningScriptModel> runningScriptContextModels) { this.scriptIds = scriptIds;
this.runningScriptModels = runningScriptContextModels;
} }
@XmlElementWrapper(name = "MonitorModelList") @XmlElementWrapper(name = "MonitorModelList")