diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/ABNDATA.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/ABNDATA.java index cb0de41f..63dc27be 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/ABNDATA.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/ABNDATA.java @@ -11,7 +11,7 @@ public class ABNDATA { @XmlElement(name = "BODY") @JsonProperty("BODY") - protected String body;//json 串或普通字符串,每个type一种 + protected Object body;//可变类型,根据Type 变化 public ABNORMALTYPE getType() { return type; @@ -21,11 +21,11 @@ public class ABNDATA { this.type = type; } - public String getBody() { + public Object getBody() { return body; } - public void setBody(String body) { + public void setBody(Object body) { this.body = body; } } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandler.java index f885315b..8695da20 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandler.java @@ -61,7 +61,7 @@ public class DELYHandler extends FlopBaseHandler { for (OPTDELAYDATA optdelaydata : flop.getDELY() ) { ABNDATA abndata = new ABNDATA(); abndata.setType(ABNORMALTYPE.DLY); - abndata.setBody(JsonUtil.getString(optdelaydata)); + abndata.setBody(optdelaydata); fltr.getAbn().add(abndata); } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDIVHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDIVHandler.java index db335357..d96921ef 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDIVHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDIVHandler.java @@ -48,7 +48,7 @@ public class FDIVHandler extends FlopBaseHandler { // ABNDATA abndata = new ABNDATA(); abndata.setType(ABNORMALTYPE.ALT); - abndata.setBody(JsonUtil.getString(diversionData)); + abndata.setBody(diversionData); fltr.getAbn().add(abndata); diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FRETHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FRETHandler.java index 990acd08..8e12e2f9 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FRETHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FRETHandler.java @@ -32,7 +32,7 @@ public class FRETHandler extends FlopBaseHandler { // ABNDATA abndata = new ABNDATA(); abndata.setType(ABNORMALTYPE.RTN); - abndata.setBody(JsonUtil.getString(flop.getFRET())); + abndata.setBody(flop.getFRET()); fltr.getAbn().add(abndata); diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandlerTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandlerTest.java index bd0435a5..3936de6d 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandlerTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/DELYHandlerTest.java @@ -26,7 +26,7 @@ public class DELYHandlerTest { @Test public void testRun() { - Cminmsg cminmsg = cminmsgDao.findOne(240451L); + Cminmsg cminmsg = cminmsgDao.findOne(241426L); CminmsgWapper cminmsgWapper = new CminmsgWapper(cminmsg); cminmsgWapper.setMsg(exchangeService.xmlToMsg(cminmsg.getCminmsgsClobMsg()));