diff --git a/pom.xml b/pom.xml index c7379ba9..9104e0da 100644 --- a/pom.xml +++ b/pom.xml @@ -91,7 +91,7 @@ org.springframework.boot spring-boot-starter-data-redis - + diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/META.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/META.java index b83c51c1..20d06940 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/META.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/META.java @@ -1,17 +1,26 @@ package com.gzzn.omms.msgexchangeapi.entity.msg; +import com.fasterxml.jackson.annotation.JsonAutoDetect; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class META { - @JsonProperty("SNDR") + + @JacksonXmlProperty(localName ="SNDR") + @JsonProperty("SNDR") private String sndr; + @JacksonXmlProperty(localName ="SEQN") @JsonProperty("SEQN") private String seqn; + @JacksonXmlProperty(localName ="DTTM") @JsonProperty("DTTM") private String dttm; + @JacksonXmlProperty(localName ="TYPE") @JsonProperty("TYPE") private String type; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Msg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Msg.java index 8ca7af1f..040e695f 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Msg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/Msg.java @@ -1,12 +1,17 @@ package com.gzzn.omms.msgexchangeapi.entity.msg; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; @JsonIgnoreProperties(ignoreUnknown = true) +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class Msg { @JsonProperty("META") + @JacksonXmlProperty(localName ="META") private META meta; public META getMeta() { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/ACFTMsg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/ACFTMsg.java index 4965f36f..a206b409 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/ACFTMsg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/ACFTMsg.java @@ -3,6 +3,9 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.flop.acft; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import com.gzzn.omms.msgexchangeapi.entity.msg.META; /** @@ -11,10 +14,15 @@ import com.gzzn.omms.msgexchangeapi.entity.msg.META; * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JacksonXmlRootElement(localName="MSG") +@JsonIgnoreProperties(ignoreUnknown = true) public class ACFTMsg { + @JacksonXmlProperty(localName ="META") private META META; + @JacksonXmlProperty(localName ="FLOP") private FLOP FLOP; + public void setMETA(META META) { this.META = META; } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/FLOP.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/FLOP.java index d9c058d5..488d6c50 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/FLOP.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/flop/acft/FLOP.java @@ -3,6 +3,8 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.flop.acft; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-04 13:55:4 * @@ -11,9 +13,13 @@ package com.gzzn.omms.msgexchangeapi.entity.msg.flop.acft; */ public class FLOP { + @JacksonXmlProperty(localName ="FLID") private String FLID; + @JacksonXmlProperty(localName ="FFID") private String FFID; + @JacksonXmlProperty(localName ="ACFT") private String ACFT; + public void setFLID(String FLID) { this.FLID = FLID; } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java index 7f01c830..e9afaf20 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java @@ -3,19 +3,37 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class CHDT { + @JacksonXmlProperty(localName ="CHNO") + @JsonProperty("CHNO") private String CHNO; + @JacksonXmlProperty(localName ="CHUT") + @JsonProperty("CHUT") private String CHUT; + @JacksonXmlProperty(localName ="CCLS") + @JsonProperty("CCLS") private String CCLS; + @JacksonXmlProperty(localName ="PCBT") + @JsonProperty("PCBT") private String PCBT; + @JacksonXmlProperty(localName ="PCET") + @JsonProperty("PCET") private String PCET; + @JacksonXmlProperty(localName ="CTYP") + @JsonProperty("CTYP") private String CTYP; public void setCHNO(String CHNO) { this.CHNO = CHNO; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java index 3c2b9bc0..82676b33 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java @@ -3,20 +3,40 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class CKDT { + @JacksonXmlProperty(localName ="CKNO") + @JsonProperty("CKNO") private String CKNO; + @JacksonXmlProperty(localName ="CHKC") + @JsonProperty("CHKC") private String CHKC; + @JacksonXmlProperty(localName ="CCLS") + @JsonProperty("CCLS") private String CCLS; + @JacksonXmlProperty(localName ="PCOT") + @JsonProperty("PCOT") private String PCOT; + @JacksonXmlProperty(localName ="PCCT") + @JsonProperty("PCCT") private String PCCT; + @JacksonXmlProperty(localName ="CCTM") + @JsonProperty("CCTM") private String CCTM; + @JacksonXmlProperty(localName ="CTYP") + @JsonProperty("CTYP") private String CTYP; public void setCKNO(String CKNO) { this.CKNO = CKNO; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CLDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CLDT.java new file mode 100644 index 00000000..92017cf9 --- /dev/null +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CLDT.java @@ -0,0 +1,67 @@ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) +public class CLDT { + + @JacksonXmlProperty(localName ="CLNO") + @JsonProperty("CLNO") + private String CLNO; + @JacksonXmlProperty(localName ="BELT") + @JsonProperty("BELT") + private String BELT; + @JacksonXmlProperty(localName ="BCLS") + @JsonProperty("BCLS") + private String BCLS; + @JacksonXmlProperty(localName ="PCOT") + @JsonProperty("PCOT") + private String PCOT; + @JacksonXmlProperty(localName ="PCCT") + @JsonProperty("PCCT") + private String PCCT; + @JacksonXmlProperty(localName ="BTYP") + @JsonProperty("BTYP") + private String BTYP; + + public String getBELT() { + return BELT; + } + public void setBELT(String bELT) { + BELT = bELT; + } + public String getBCLS() { + return BCLS; + } + public void setBCLS(String bCLS) { + BCLS = bCLS; + } + public String getPCOT() { + return PCOT; + } + public void setPCOT(String pCOT) { + PCOT = pCOT; + } + public String getPCCT() { + return PCCT; + } + public void setPCCT(String pCCT) { + PCCT = pCCT; + } + public String getBTYP() { + return BTYP; + } + public void setBTYP(String bTYP) { + BTYP = bTYP; + } + public String getCLNO() { + return CLNO; + } + public void setCLNO(String cLNO) { + CLNO = cLNO; + } + +} diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DNLDMsg.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DNLDMsg.java index 5b5beb3f..7053a1a5 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DNLDMsg.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DNLDMsg.java @@ -3,6 +3,13 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlRootElement; import com.gzzn.omms.msgexchangeapi.entity.msg.META; /** @@ -11,10 +18,19 @@ import com.gzzn.omms.msgexchangeapi.entity.msg.META; * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JacksonXmlRootElement(localName="MSG") +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class DNLDMsg { + @JacksonXmlProperty(localName ="META") + @JsonProperty("META") private META META; + + @JacksonXmlProperty(localName ="SCHD") + @JsonProperty("SCHD") private SCHD SCHD; + public void setMETA(META META) { this.META = META; } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java index 231edc3a..84fb73d4 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java @@ -3,18 +3,40 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class ERUT { + @JacksonXmlProperty(localName ="RTNO") + @JsonProperty("RTNO") private String RTNO; + @JacksonXmlProperty(localName ="APCD") + @JsonProperty("APCD") private String APCD; + @JacksonXmlProperty(localName ="SCDT") + @JsonProperty("SCDT") private String SCDT; - public void setRTNO(String RTNO) { + @JacksonXmlProperty(localName ="SCAT") + @JsonProperty("SCAT") + private String SCAT; + + public String getSCAT() { + return SCAT; + } + public void setSCAT(String sCAT) { + SCAT = sCAT; + } + public void setRTNO(String RTNO) { this.RTNO = RTNO; } public String getRTNO() { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java index ad53a138..9bb54513 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java @@ -4,46 +4,193 @@ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; import java.util.List; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class FLTR { + @JacksonXmlProperty(localName ="FLID") + @JsonProperty("FLID") private String FLID; + @JacksonXmlProperty(localName ="ALCD") + @JsonProperty("ALCD") private String ALCD; + @JacksonXmlProperty(localName ="FLNO") + @JsonProperty("FLNO") private String FLNO; + @JacksonXmlProperty(localName ="MVIN") + @JsonProperty("MVIN") private String MVIN; + @JacksonXmlProperty(localName ="SODT") + @JsonProperty("SODT") private String SODT; + @JacksonXmlProperty(localName ="FLTY") + @JsonProperty("FLTY") private String FLTY; + @JacksonXmlProperty(localName ="FLIN") + @JsonProperty("FLIN") private String FLIN; + @JacksonXmlProperty(localName ="ROUT") + @JsonProperty("ROUT") + @JacksonXmlElementWrapper(localName ="ROUT", useWrapping =false) private List ROUT; + @JacksonXmlProperty(localName ="ACFT") + @JsonProperty("ACFT") private String ACFT; + @JacksonXmlProperty(localName ="RENO") + @JsonProperty("RENO") private String RENO; + @JacksonXmlProperty(localName ="TAOP") + @JsonProperty("TAOP") private String TAOP; + @JacksonXmlProperty(localName ="TAFL") + @JsonProperty("TAFL") private String TAFL; + @JacksonXmlProperty(localName ="TAID") + @JsonProperty("TAID") private String TAID; + @JacksonXmlProperty(localName ="TRML") + @JsonProperty("TRML") private String TRML; + @JacksonXmlProperty(localName ="ESTT") + @JsonProperty("ESTT") private String ESTT; + @JacksonXmlProperty(localName ="ACTT") + @JsonProperty("ACTT") private String ACTT; + @JacksonXmlProperty(localName ="CHDT") + @JsonProperty("CHDT") private CHDT CHDT; + @JacksonXmlProperty(localName ="GTDT") + @JsonProperty("GTDT") + @JacksonXmlElementWrapper(localName ="GTDT", useWrapping =false) private List GTDT; + @JacksonXmlProperty(localName ="STND") + @JsonProperty("STND") private String STND; + @JacksonXmlProperty(localName ="PSDT") + @JsonProperty("PSDT") private PSDT PSDT; + @JacksonXmlProperty(localName ="CKDT") + @JsonProperty("CKDT") + @JacksonXmlElementWrapper(localName ="CKDT", useWrapping =false) private List CKDT; + @JacksonXmlProperty(localName ="PHAG") + @JsonProperty("PHAG") private String PHAG; + @JacksonXmlProperty(localName ="BOTM") + @JsonProperty("BOTM") private String BOTM; + @JacksonXmlProperty(localName ="LACL") + @JsonProperty("LACL") private String LACL; + @JacksonXmlProperty(localName ="FHAG") + @JsonProperty("FHAG") private String FHAG; + @JacksonXmlProperty(localName ="MHAG") + @JsonProperty("MHAG") private String MHAG; + @JacksonXmlProperty(localName ="ERUT") + @JsonProperty("ERUT") + @JacksonXmlElementWrapper(localName ="ERUT", useWrapping =false) private List ERUT; + @JacksonXmlProperty(localName ="EXSC") + @JsonProperty("EXSC") private String EXSC; + @JacksonXmlProperty(localName ="FTSS") + @JsonProperty("FTSS") private String FTSS; + @JacksonXmlProperty(localName ="NEAT") + @JsonProperty("NEAT") private String NEAT; + @JacksonXmlProperty(localName ="NAAT") + @JsonProperty("NAAT") private String NAAT; - public void setFLID(String FLID) { + @JacksonXmlProperty(localName ="MAXP") + @JsonProperty("MAXP") + private String MAXP; + @JacksonXmlProperty(localName ="CSOP") + @JsonProperty("CSOP") + private String CSOP; + @JacksonXmlProperty(localName ="CSFT") + @JsonProperty("CSFT") + private String CSFT; + @JacksonXmlProperty(localName ="MAID") + @JsonProperty("MAID") + private String MAID; + @JacksonXmlProperty(localName ="VIPP") + @JsonProperty("VIPP") + private String VIPP; + @JacksonXmlProperty(localName ="VIPR") + @JsonProperty("VIPR") + private String VIPR; + @JacksonXmlProperty(localName ="VIPF") + @JsonProperty("VIPF") + private VIPF VIPF; + @JacksonXmlProperty(localName ="PEDT") + @JsonProperty("PEDT") + private String PEDT; + @JacksonXmlProperty(localName ="CLDT") + @JsonProperty("CLDT") + private CLDT CLDT; + @JacksonXmlProperty(localName ="PADT") + @JsonProperty("PADT") + private String PADT; + + + public VIPF getVIPF() { + return VIPF; + } + public void setVIPF(VIPF vIPF) { + VIPF = vIPF; + } + public String getVIPR() { + return VIPR; + } + public void setVIPR(String vIPR) { + VIPR = vIPR; + } + public String getVIPP() { + return VIPP; + } + public void setVIPP(String vIPP) { + VIPP = vIPP; + } + public String getMAID() { + return MAID; + } + public void setMAID(String mAID) { + MAID = mAID; + } + public String getCSFT() { + return CSFT; + } + public void setCSFT(String cSFT) { + CSFT = cSFT; + } + public String getCSOP() { + return CSOP; + } + public void setCSOP(String cSOP) { + CSOP = cSOP; + } + public String getMAXP() { + return MAXP; + } + public void setMAXP(String mAXP) { + MAXP = mAXP; + } + public void setFLID(String FLID) { this.FLID = FLID; } public String getFLID() { @@ -259,5 +406,23 @@ public class FLTR { public String getNAAT() { return NAAT; } + public String getPEDT() { + return PEDT; + } + public void setPEDT(String pEDT) { + PEDT = pEDT; + } + public CLDT getCLDT() { + return CLDT; + } + public void setCLDT(CLDT cLDT) { + CLDT = cLDT; + } + public String getPADT() { + return PADT; + } + public void setPADT(String pADT) { + PADT = pADT; + } } \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java index 6132aa45..8161c037 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java @@ -3,19 +3,42 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class GTDT { + @JacksonXmlProperty(localName ="GTNO") + @JsonProperty("GTNO") private String GTNO; + + @JacksonXmlProperty(localName ="GATE") + @JsonProperty("GATE") private String GATE; + + @JacksonXmlProperty(localName ="PGOT") + @JsonProperty("PGOT") private String PGOT; + + @JacksonXmlProperty(localName ="PGCT") + @JsonProperty("PGCT") private String PGCT; + + @JacksonXmlProperty(localName ="GCTM") + @JsonProperty("GCTM") private String GCTM; + + @JacksonXmlProperty(localName ="GTYP") + @JsonProperty("GTYP") private String GTYP; public void setGTNO(String GTNO) { this.GTNO = GTNO; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java index 205e9001..03030dd4 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java @@ -3,17 +3,31 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class PSDT { + @JacksonXmlProperty(localName ="PSNO") + @JsonProperty("PSNO") private String PSNO; + @JacksonXmlProperty(localName ="PSST") + @JsonProperty("PSST") private String PSST; + @JacksonXmlProperty(localName ="STST") + @JsonProperty("STST") private String STST; + @JacksonXmlProperty(localName ="STET") + @JsonProperty("STET") private String STET; public void setPSNO(String PSNO) { this.PSNO = PSNO; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java index 5066952c..c3313243 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java @@ -3,17 +3,31 @@ */ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class ROUT { + @JacksonXmlProperty(localName ="RTNO") + @JsonProperty("RTNO") private String RTNO; + @JacksonXmlProperty(localName ="APCD") + @JsonProperty("APCD") private String APCD; + @JacksonXmlProperty(localName ="SCAT") + @JsonProperty("SCAT") private String SCAT; + @JacksonXmlProperty(localName ="SCDT") + @JsonProperty("SCDT") private String SCDT; public void setRTNO(String RTNO) { this.RTNO = RTNO; diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/SCHD.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/SCHD.java index 4ece0989..6fd418f9 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/SCHD.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/SCHD.java @@ -5,27 +5,43 @@ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; import java.util.List; +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + /** * Auto-generated: 2018-12-05 11:38:31 * * @author bejson.com (i@bejson.com) * @website http://www.bejson.com/java2pojo/ */ +@JsonIgnoreProperties(ignoreUnknown = true) +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) public class SCHD { + @JacksonXmlProperty(localName ="RECS") + @JsonProperty("RECS") private String RECS; - private List FLTRS; + + @JacksonXmlProperty(localName ="FLTR") + @JsonProperty("FLTR") + @JacksonXmlElementWrapper(localName ="FLTR", useWrapping =false) + private List FLTR; - public void setRECS(String RECS) { + public List getFLTR() { + return FLTR; + } + public void setFLTR(List fLTR) { + FLTR = fLTR; + } + public void setRECS(String RECS) { this.RECS = RECS; } public String getRECS() { return RECS; } - public List getFLTRS() { - return FLTRS; - } - public void setFLTRS(List fLTRS) { - FLTRS = fLTRS; - } + } \ No newline at end of file diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/VIPF.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/VIPF.java new file mode 100644 index 00000000..330be9ea --- /dev/null +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/VIPF.java @@ -0,0 +1,32 @@ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +import com.fasterxml.jackson.annotation.JsonAutoDetect; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonAutoDetect.Visibility; +import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlProperty; + +@JsonAutoDetect(setterVisibility=Visibility.NONE,getterVisibility=Visibility.NONE) +public class VIPF { + + @JacksonXmlProperty(localName ="VPCD") + @JsonProperty("VPCD") + private String VPCD; + + @JacksonXmlProperty(localName ="VFES") + @JsonProperty("VFES") + private String VFES; + + + public String getVPCD() { + return VPCD; +} +public void setVPCD(String vPCD) { + VPCD = vPCD; +} +public String getVFES() { + return VFES; +} +public void setVFES(String vFES) { + VFES = vFES; +} +} diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java index 4d9c7593..75d7f63a 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/MsgHandlerDispatcher.java @@ -3,14 +3,19 @@ package com.gzzn.omms.msgexchangeapi.msghandler; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.gzzn.omms.msgexchangeapi.entity.msg.Msg; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; +import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; @Service public class MsgHandlerDispatcher { + private Logger logger = LoggerFactory.getLogger(MsgHandlerDispatcher.class); + @Autowired IExchangeService exchangeService; @@ -34,7 +39,9 @@ public class MsgHandlerDispatcher { | SecurityException | IllegalArgumentException | InvocationTargetException e) { - throw new RuntimeException(e); + //throw new RuntimeException(e); + logger.error("消息处理失败:{}",e.getMessage()); + return HandlerResult.failure(); } }//end function diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ACFTHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ACFTHandler.java index db6b9b19..9cca531b 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ACFTHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ACFTHandler.java @@ -2,7 +2,6 @@ package com.gzzn.omms.msgexchangeapi.msghandler.flop; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; import com.gzzn.omms.msgexchangeapi.entity.msg.flop.acft.ACFTMsg; import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.FLTR; @@ -10,22 +9,20 @@ import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; import com.gzzn.omms.msgexchangeapi.msghandler.IBaseHandler; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; import com.gzzn.omms.msgexchangeapi.service.flightInfo.IFlightInfoService; +import com.gzzn.omms.msgexchangeapi.utils.SpringUtil; public class ACFTHandler implements IBaseHandler { private static Logger logger = LoggerFactory.getLogger(ACFTHandler.class); - @Autowired - IExchangeService exchangeService; - - @Autowired - IFlightInfoService flightInfoService; - /** * 处理航班消息,更新航班动态信息 */ @Override public HandlerResult run(String msg) { + IExchangeService exchangeService = (IExchangeService) SpringUtil.getBean("exchangeService"); + IFlightInfoService flightInfoService = (IFlightInfoService) SpringUtil.getBean("flightInfoService"); + ACFTMsg acftMsg = exchangeService.xmlstrToObject(msg, ACFTMsg.class); FLTR fltr = flightInfoService.getByFlid(acftMsg.getFLOP().getFLID()); if(null != fltr) diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java index 3bfbb8a5..c6b83579 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImpl.java @@ -9,11 +9,10 @@ import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; -import com.fasterxml.jackson.databind.ObjectWriter; import com.fasterxml.jackson.dataformat.xml.XmlMapper; import com.gzzn.omms.msgexchangeapi.exception.ExchangeServiceException; -@Service +@Service("exchangeService") public class ExchangeServiceImpl implements IExchangeService { @Override diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java index 1c485976..744e814a 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java @@ -15,7 +15,7 @@ import com.gzzn.omms.msgexchangeapi.msghandler.MsgHandlerDispatcher; import com.gzzn.omms.msgexchangeapi.redis.RedisService; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; -@Service +@Service("flightInfoService") public class FlightInfoServiceImpl implements IFlightInfoService { private static final String redisKey="FlightInfo:"; @@ -38,7 +38,7 @@ public class FlightInfoServiceImpl implements IFlightInfoService { // List lsFltr = dnldMsg .getSCHD() - .getFLTRS(); + .getFLTR(); for(FLTR fltr : lsFltr) { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java b/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java index 9c0ebfb7..cc830217 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java @@ -19,6 +19,7 @@ import com.gzzn.omms.msgexchangeapi.service.IExchangeService; import com.gzzn.omms.msgexchangeapi.service.IKafkaService; import com.gzzn.omms.msgexchangeapi.service.flightInfo.IFlightInfoService; import com.gzzn.omms.msgexchangeapi.service.flightInfo.UpdateByCminmsgsResult; +import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; /** @@ -54,7 +55,7 @@ public class ExchangeTask { Boolean isWaitSchd = (Boolean)redisService.get(RedisKeyConstant.KEY_ISWAITSCHD); - Long beginId = null; + Integer tryTimes = 0; while (isWaitSchd && tryTimes < 10) { logger.info("正在第{}次获取返回的动态航班日计划消息",tryTimes); @@ -68,15 +69,24 @@ public class ExchangeTask { { //如果找到，添加到内存数据库动态航班信息表 logger.info("找到返回的动态航班计划,开始更新动态航班信息..."); - flightInfoService.updateByDaySchd(opCminmsg.get()); + Boolean updateResult = flightInfoService.updateByDaySchd(opCminmsg.get()); + if(false == updateResult) + { + logger.error("更新动态航班信息失败"); + break; + } // - beginId = opCminmsg.get().getCminmsgsId(); + Long beginId = opCminmsg.get().getCminmsgsId(); + redisService.set(RedisKeyConstant.KEY_LASTBEGINID,beginId); + //更新状态 isWaitSchd = false; redisService.set(RedisKeyConstant.KEY_ISWAITSCHD,isWaitSchd); + logger.info("动态航班计划更新完成..."); + break; //跳出循环 } else { @@ -96,15 +106,22 @@ public class ExchangeTask { return ; } - if(null == beginId) - { - //获取上次的beginId - beginId = (Long)redisService.get(RedisKeyConstant.KEY_LASTBEGINID); - logger.info("从上次获取的消息位置{}开始",beginId); - } + //获取上次的beginId + Integer beginIdInt = (Integer)redisService.get(RedisKeyConstant.KEY_LASTBEGINID); + Long beginId = beginIdInt.longValue(); + + logger.info("从上次获取的消息位置{}开始",beginId); + //获取航班动态消息 List lsCminmsgs = cminmsgService.getNewMsgsAfterId(beginId); + if(null == lsCminmsgs || lsCminmsgs.size() <= 0) + { + logger.info("本周期没有获取到最新消息，直接退出本次循环"); + return; + } + + logger.info("获取到{}条最新信息,准备更新动态航班信息",lsCminmsgs.size()); List lsUpdatedFlightInfo = flightInfoService.updateByCminmsgs(lsCminmsgs); //新增或变更 航班动态信息 发送 到kafka的SCHD topic @@ -113,7 +130,7 @@ public class ExchangeTask { if(updateResult.getIsSuccess()) { updateResult.getFltrs().forEach(node->{ - String jsonMsg = exchangeService.objectToXmlstr(node); + String jsonMsg = JsonUtil.getString(node); kafkaservice.msgSend("schd", jsonMsg); }); } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/utils/SpringUtil.java b/src/main/java/com/gzzn/omms/msgexchangeapi/utils/SpringUtil.java new file mode 100644 index 00000000..40b2d76b --- /dev/null +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/utils/SpringUtil.java @@ -0,0 +1,50 @@ +package com.gzzn.omms.msgexchangeapi.utils; + +import org.springframework.beans.BeansException; +import org.springframework.context.ApplicationContext; +import org.springframework.context.ApplicationContextAware; +import org.springframework.context.annotation.Lazy; +import org.springframework.stereotype.Component; + +/** + * + * @author zhouxiunai + * + */ +@Component +@Lazy(false) +public class SpringUtil implements ApplicationContextAware { + + private static ApplicationContext applicationContext; + + //获取applicationContext + public static ApplicationContext getApplicationContext() { + return applicationContext; + } + + //通过name获取 Bean. + public static Object getBean(String name) { + return getApplicationContext().getBean(name); + } + + //通过class获取Bean. + public static T getBean(Class clazz) { + return getApplicationContext().getBean(clazz); + } + + //通过name,以及Clazz返回指定的Bean + public static T getBean(String name, Class clazz) { + return getApplicationContext().getBean(name, clazz); + } + + @Override + public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { + if (SpringUtil.applicationContext == null) { + SpringUtil.applicationContext = applicationContext; + } + } + + private SpringUtil() { + } +} + diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java index fed1d32e..275549ed 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/service/ExchangeServiceImplTest.java @@ -1,6 +1,10 @@ package com.gzzn.omms.msgexchangeapi.service; +import java.io.File; +import java.io.FileOutputStream; import java.io.IOException; +import java.nio.charset.Charset; +import java.nio.charset.CharsetEncoder; import java.util.Map; import org.junit.Test; @@ -12,6 +16,9 @@ import org.springframework.test.context.junit4.SpringRunner; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.dataformat.xml.XmlMapper; +import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; +import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.DNLDMsg; +import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; @RunWith(SpringRunner.class) @SpringBootTest @@ -19,6 +26,9 @@ public class ExchangeServiceImplTest { @Autowired private IExchangeService exchangeService; + @Autowired + private CminmsgDao cminmsgDao; + @Test public void testXmlToJson() throws JsonParseException, JsonMappingException, IOException { @@ -72,4 +82,22 @@ public class ExchangeServiceImplTest { Map map = xmlMapper.readValue(xmlString,Map.class); } + + + @Test + public void testXmlToDNLDMsg() throws JsonParseException, JsonMappingException, IOException + { + String xml = cminmsgDao.findOne(300L).getCminmsgsClobMsg(); + + DNLDMsg dNLDMsg = exchangeService.xmlstrToObject(xml, DNLDMsg.class); + String jsonString=JsonUtil.getString(dNLDMsg); + + File file = new File("schd.json"); + FileOutputStream fos = new FileOutputStream(file); + fos.write(jsonString.getBytes("utf-8")); + fos.close(); + + + System.out.println(jsonString); + } }