From ddf991e692454ac443336c2f09e81f8728446434 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Sun, 28 Apr 2019 15:41:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9ABNDATA=20=E7=9A=84=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8key=20=E8=B7=9Ftype=E5=80=BC=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msgexchangeapi/entity/msg/ABNDATA.java    | 57 +++++++++----------
 .../msghandler/flop/CNCLHandler.java          |  2 +-
 .../msghandler/flop/DELYHandler.java          |  2 +-
 .../msghandler/flop/FDIVHandler.java          |  2 +-
 .../msghandler/flop/FRETHandler.java          |  2 +-
 5 files changed, 32 insertions(+), 33 deletions(-)

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 d5afb6e1..a663d812 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
@@ -13,21 +13,21 @@ public class ABNDATA {
    @JsonProperty("TYPE")
    protected ABNORMALTYPE type;
      
-   @XmlElement(name = "CNCL")
-   @JsonProperty("CNCL")
-   protected String cncl;//航班取消异常信息
+   @XmlElement(name = "CAN")
+   @JsonProperty("CAN")
+   protected String can;//航班取消异常信息
    
-   @XmlElement(name = "DELY")
-   @JsonProperty("DELY")
-   protected List<OPTDELAYDATA> dely;//航班延误异常信息
+   @XmlElement(name = "DLY")
+   @JsonProperty("DLY")
+   protected List<OPTDELAYDATA> dly;//航班延误异常信息
    
-   @XmlElement(name = "FDIV")
-   @JsonProperty("FDIV")
-   protected DIVERSIONDATA fdiv;//航班备降延误异常信息
+   @XmlElement(name = "ALT")
+   @JsonProperty("ALT")
+   protected DIVERSIONDATA alt;//航班备降延误异常信息
    
-   @XmlElement(name = "FRET")
-   @JsonProperty("FRET")
-   protected RETURNDATA fret;//航班返航异常信息
+   @XmlElement(name = "RTN")
+   @JsonProperty("RTN")
+   protected RETURNDATA rtn;//航班返航异常信息
 
 	public ABNORMALTYPE getType() {
 		return type;
@@ -36,37 +36,36 @@ public class ABNDATA {
 	public void setType(ABNORMALTYPE type) {
 		this.type = type;
 	}
-	
 
-	public String getCncl() {
-		return cncl;
+	public String getCan() {
+		return can;
 	}
 
-	public void setCncl(String cncl) {
-		this.cncl = cncl;
+	public void setCan(String can) {
+		this.can = can;
 	}
 
-	public List<OPTDELAYDATA> getDely() {
-		return dely;
+	public List<OPTDELAYDATA> getDly() {
+		return dly;
 	}
 
-	public void setDely(List<OPTDELAYDATA> dely) {
-		this.dely = dely;
+	public void setDly(List<OPTDELAYDATA> dly) {
+		this.dly = dly;
 	}
 
-	public DIVERSIONDATA getFdiv() {
-		return fdiv;
+	public DIVERSIONDATA getAlt() {
+		return alt;
 	}
 
-	public void setFdiv(DIVERSIONDATA fdiv) {
-		this.fdiv = fdiv;
+	public void setAlt(DIVERSIONDATA alt) {
+		this.alt = alt;
 	}
 
-	public RETURNDATA getFret() {
-		return fret;
+	public RETURNDATA getRtn() {
+		return rtn;
 	}
 
-	public void setFret(RETURNDATA fret) {
-		this.fret = fret;
+	public void setRtn(RETURNDATA rtn) {
+		this.rtn = rtn;
 	}
 }
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/CNCLHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/CNCLHandler.java
index 58fcb3f7..e10a036d 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/CNCLHandler.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/CNCLHandler.java
@@ -36,7 +36,7 @@ public class CNCLHandler   extends FlopBaseHandler {
 		//
 		ABNDATA abndata = new ABNDATA();
 		abndata.setType(ABNORMALTYPE.CAN);
-		abndata.setCncl(flop.getCNCL());
+		abndata.setCan(flop.getCNCL());
 		
 		fltr.getAbn().add(abndata);
 		
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 7a9cd4f0..bf694622 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
@@ -62,7 +62,7 @@ public class DELYHandler  extends FlopBaseHandler  {
 		//DELY 作为一个abn元素，元素类型为 数组
 		ABNDATA abndata = new ABNDATA();
 		abndata.setType(ABNORMALTYPE.DLY);
-		abndata.setDely(flop.getDELY());
+		abndata.setDly(flop.getDELY());
 		fltr.getAbn().add(abndata);
 		
 		return fltr;
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 ed7f18d0..d21b1d57 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
@@ -43,7 +43,7 @@ public class FDIVHandler extends FlopBaseHandler {
 		//
 		ABNDATA abndata = new ABNDATA();
 		abndata.setType(ABNORMALTYPE.ALT);
-		abndata.setFdiv(diversionData);
+		abndata.setAlt(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 f44a18bc..866c19b9 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.setFret(flop.getFRET());
+		abndata.setRtn(flop.getFRET());
 		
 		fltr.getAbn().add(abndata);