From 1b1207b07a9b30a55507c529c3fd09e64832907e Mon Sep 17 00:00:00 2001 From: zhouxiunai <154707516@qq.com> Date: Wed, 5 Dec 2018 11:47:43 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E7=94=9F=E6=88=90dnld=20?= =?UTF-8?q?=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/TestController.java | 17 + .../entity/msg/schd/dnld/CHDT.java | 120 ++-- .../entity/msg/schd/dnld/CKDT.java | 138 ++--- .../entity/msg/schd/dnld/DNLDMsg.java | 32 + .../entity/msg/schd/dnld/DnldMsg.java | 19 - .../entity/msg/schd/dnld/DnldMsgBody.java | 21 - .../entity/msg/schd/dnld/ERUT.java | 69 ++- .../entity/msg/schd/dnld/FLTR.java | 546 +++++++++--------- .../entity/msg/schd/dnld/GTDT.java | 120 ++-- .../entity/msg/schd/dnld/PSDT.java | 86 +-- .../entity/msg/schd/dnld/ROUT.java | 84 +-- .../entity/msg/schd/dnld/SCHD.java | 31 + .../msghandler/flop/ACFTHandler.java | 2 +- .../omms/msgexchangeapi/runner/AppRunner.java | 7 +- .../flightInfo/FlightInfoServiceImpl.java | 11 +- .../msgexchangeapi/task/ExchangeTask.java | 13 +- .../utils/RedisServiceTest.java | 6 +- 17 files changed, 691 insertions(+), 631 deletions(-) create mode 100644 src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java create mode 100644 src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DNLDMsg.java delete mode 100644 src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsg.java delete mode 100644 src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java create mode 100644 src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/SCHD.java diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java new file mode 100644 index 00000000..add444f4 --- /dev/null +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java @@ -0,0 +1,17 @@ +package com.gzzn.omms.msgexchangeapi.controller; + +import java.io.IOException; + +import javax.servlet.http.HttpServletResponse; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class TestController { + + @GetMapping("/test") + public void test(HttpServletResponse response) throws IOException { + response.getWriter().write("hello"); + } +} 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 881d8b69..7f01c830 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 @@ -1,58 +1,62 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -public class CHDT -{ - private String chno; - - private String chut; - - private String ccls; - - private String pcbt; - - private String pcet; - - private String ctyp; - - public String getChno(){ - return this.chno; - } - public void setChno(String chno){ - this.chno = chno; - } - - public String getChut(){ - return this.chut; - } - public void setChut(String chut){ - this.chut = chut; - } - - public String getCcls(){ - return this.ccls; - } - public void setCcls(String ccls){ - this.ccls = ccls; - } - - public String getPcbt(){ - return this.pcbt; - } - public void setPcbt(String pcbt){ - this.pcbt = pcbt; - } - - public String getPcet(){ - return this.pcet; - } - public void setPcet(String pcet){ - this.pcet = pcet; - } - - public String getCtyp(){ - return this.ctyp; - } - public void setCtyp(String ctyp){ - this.ctyp = ctyp; - } -} +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class CHDT { + + private String CHNO; + private String CHUT; + private String CCLS; + private String PCBT; + private String PCET; + private String CTYP; + public void setCHNO(String CHNO) { + this.CHNO = CHNO; + } + public String getCHNO() { + return CHNO; + } + + public void setCHUT(String CHUT) { + this.CHUT = CHUT; + } + public String getCHUT() { + return CHUT; + } + + public void setCCLS(String CCLS) { + this.CCLS = CCLS; + } + public String getCCLS() { + return CCLS; + } + + public void setPCBT(String PCBT) { + this.PCBT = PCBT; + } + public String getPCBT() { + return PCBT; + } + + public void setPCET(String PCET) { + this.PCET = PCET; + } + public String getPCET() { + return PCET; + } + + public void setCTYP(String CTYP) { + this.CTYP = CTYP; + } + public String getCTYP() { + return CTYP; + } + +} \ No newline at end of file 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 54294ba6..3c2b9bc0 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 @@ -1,68 +1,70 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -public class CKDT -{ - private String ckno; - - private String chkc; - - private String ccls; - - private String pcot; - - private String pcct; - - private String cctm; - - private String ctyp; - - public String getCkno(){ - return this.ckno; - } - public void setCkno(String ckno){ - this.ckno = ckno; - } - - public String getChkc(){ - return this.chkc; - } - public void setChkc(String chkc){ - this.chkc = chkc; - } - - public String getCcls(){ - return this.ccls; - } - public void setCcls(String ccls){ - this.ccls = ccls; - } - - public String getPcot(){ - return this.pcot; - } - public void setPcot(String pcot){ - this.pcot = pcot; - } - - public String getPcct(){ - return this.pcct; - } - public void setPcct(String pcct){ - this.pcct = pcct; - } - - public String getCctm(){ - return this.cctm; - } - public void setCctm(String cctm){ - this.cctm = cctm; - } - - public String getCtyp(){ - return this.ctyp; - } - public void setCtyp(String ctyp){ - this.ctyp = ctyp; - } -} - +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class CKDT { + + private String CKNO; + private String CHKC; + private String CCLS; + private String PCOT; + private String PCCT; + private String CCTM; + private String CTYP; + public void setCKNO(String CKNO) { + this.CKNO = CKNO; + } + public String getCKNO() { + return CKNO; + } + + public void setCHKC(String CHKC) { + this.CHKC = CHKC; + } + public String getCHKC() { + return CHKC; + } + + public void setCCLS(String CCLS) { + this.CCLS = CCLS; + } + public String getCCLS() { + return CCLS; + } + + public void setPCOT(String PCOT) { + this.PCOT = PCOT; + } + public String getPCOT() { + return PCOT; + } + + public void setPCCT(String PCCT) { + this.PCCT = PCCT; + } + public String getPCCT() { + return PCCT; + } + + public void setCCTM(String CCTM) { + this.CCTM = CCTM; + } + public String getCCTM() { + return CCTM; + } + + public void setCTYP(String CTYP) { + this.CTYP = CTYP; + } + public String getCTYP() { + return CTYP; + } + +} \ No newline at end of file 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 new file mode 100644 index 00000000..5b5beb3f --- /dev/null +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DNLDMsg.java @@ -0,0 +1,32 @@ +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +import com.gzzn.omms.msgexchangeapi.entity.msg.META; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class DNLDMsg { + + private META META; + private SCHD SCHD; + public void setMETA(META META) { + this.META = META; + } + public META getMETA() { + return META; + } + + public void setSCHD(SCHD SCHD) { + this.SCHD = SCHD; + } + public SCHD getSCHD() { + return SCHD; + } + +} \ No newline at end of file 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 deleted file mode 100644 index 84167731..00000000 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsg.java +++ /dev/null @@ -1,19 +0,0 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -import com.gzzn.omms.msgexchangeapi.entity.msg.Msg; - -public class DnldMsg extends Msg { - public static final String TYPE = "SCHD"; - public static final String SUBTYPE = "DNLD"; - - private DnldMsgBody schd; - - public DnldMsgBody getSchd() { - return schd; - } - - public void setSchd(DnldMsgBody schd) { - this.schd = schd; - } - -} diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java deleted file mode 100644 index 60f2dbd9..00000000 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -import java.util.List; - -public class DnldMsgBody { - private String Recs;//记录数 - private List fltr;//航班动态消息记录列表 - - public String getRecs() { - return Recs; - } - public void setRecs(String recs) { - Recs = recs; - } - public List getFltr() { - return fltr; - } - public void setFltr(List fltr) { - this.fltr = fltr; - } -} 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 c4eff4fd..231edc3a 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 @@ -1,31 +1,38 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -public class ERUT -{ - private String rtno; - - private String apcd; - - private String scdt; - - public String getRtno(){ - return this.rtno; - } - public void setRtno(String rtno){ - this.rtno = rtno; - } - - public String getApcd(){ - return this.apcd; - } - public void setApcd(String apcd){ - this.apcd = apcd; - } - - public String getScdt(){ - return this.scdt; - } - public void setScdt(String scdt){ - this.scdt = scdt; - } -} +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class ERUT { + + private String RTNO; + private String APCD; + private String SCDT; + public void setRTNO(String RTNO) { + this.RTNO = RTNO; + } + public String getRTNO() { + return RTNO; + } + + public void setAPCD(String APCD) { + this.APCD = APCD; + } + public String getAPCD() { + return APCD; + } + + public void setSCDT(String SCDT) { + this.SCDT = SCDT; + } + public String getSCDT() { + return SCDT; + } + +} \ No newline at end of file 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 00889f87..ad53a138 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 @@ -1,285 +1,263 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -import java.util.List; - -public class FLTR -{ - private String flid; - - private String alcd; - - private String flno; - - private String mvin; - - private String sodt; - - private String flty; - - private String flin; - - private List rout; - - private String acft; - - private String reno; - - private String taop; - - private String tafl; - - private String taid; - - private String trml; - - private String estt; - - private String actt; - - private CHDT chdt; - - private List gtdt; - - private String stnd; - - private PSDT psdt; - - private List ckdt; - - private String phag; - - private String botm; - - private String lacl; - - private String fhag; - - private String mhag; - - private List erut; - - private String exsc; - - private String ftss; - - private String neat; - - private String naat; - - public String getFlid(){ - return this.flid; - } - public void setFlid(String flid){ - this.flid = flid; - } - - public String getAlcd(){ - return this.alcd; - } - public void setAlcd(String alcd){ - this.alcd = alcd; - } - - public String getFlno(){ - return this.flno; - } - public void setFlno(String flno){ - this.flno = flno; - } - - public String getMvin(){ - return this.mvin; - } - public void setMvin(String mvin){ - this.mvin = mvin; - } - - public String getSodt(){ - return this.sodt; - } - public void setSodt(String sodt){ - this.sodt = sodt; - } - - public String getFlty(){ - return this.flty; - } - public void setFlty(String flty){ - this.flty = flty; - } - - public String getFlin(){ - return this.flin; - } - public void setFlin(String flin){ - this.flin = flin; - } - - public List getRout(){ - return this.rout; - } - public void setRout(List rout){ - this.rout = rout; - } - - public String getAcft(){ - return this.acft; - } - public void setAcft(String acft){ - this.acft = acft; - } - - public String getReno(){ - return this.reno; - } - public void setReno(String reno){ - this.reno = reno; - } - - public String getTaop(){ - return this.taop; - } - public void setTaop(String taop){ - this.taop = taop; - } - - public String getTafl(){ - return this.tafl; - } - public void setTafl(String tafl){ - this.tafl = tafl; - } - - public String getTaid(){ - return this.taid; - } - public void setTaid(String taid){ - this.taid = taid; - } - - public String getTrml(){ - return this.trml; - } - public void setTrml(String trml){ - this.trml = trml; - } - - public String getEstt(){ - return this.estt; - } - public void setEstt(String estt){ - this.estt = estt; - } - - public String getActt(){ - return this.actt; - } - public void setActt(String actt){ - this.actt = actt; - } - - public CHDT getChdt(){ - return this.chdt; - } - public void setChdt(CHDT chdt){ - this.chdt = chdt; - } - - public List getGtdt(){ - return this.gtdt; - } - public void setGtdt(List gtdt){ - this.gtdt = gtdt; - } - - public String getStnd(){ - return this.stnd; - } - public void setStnd(String stnd){ - this.stnd = stnd; - } - - public PSDT getPsdt(){ - return this.psdt; - } - public void setPsdt(PSDT psdt){ - this.psdt = psdt; - } - - public List getCkdt(){ - return this.ckdt; - } - public void setCkdt(List ckdt){ - this.ckdt = ckdt; - } - - public String getPhag(){ - return this.phag; - } - public void setPhag(String phag){ - this.phag = phag; - } - - public String getBotm(){ - return this.botm; - } - public void setBotm(String botm){ - this.botm = botm; - } - - public String getLacl(){ - return this.lacl; - } - public void setLacl(String lacl){ - this.lacl = lacl; - } - - public String getFhag(){ - return this.fhag; - } - public void setFhag(String fhag){ - this.fhag = fhag; - } - - public String getMhag(){ - return this.mhag; - } - public void setMhag(String mhag){ - this.mhag = mhag; - } - - public List getErut(){ - return this.erut; - } - public void setErut(List erut){ - this.erut = erut; - } - - public String getExsc(){ - return this.exsc; - } - public void setExsc(String exsc){ - this.exsc = exsc; - } - - public String getFtss(){ - return this.ftss; - } - public void setFtss(String ftss){ - this.ftss = ftss; - } - - public String getNeat(){ - return this.neat; - } - public void setNeat(String neat){ - this.neat = neat; - } - - public String getNaat(){ - return this.naat; - } - public void setNaat(String naat){ - this.naat = naat; - } +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; +import java.util.List; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class FLTR { + + private String FLID; + private String ALCD; + private String FLNO; + private String MVIN; + private String SODT; + private String FLTY; + private String FLIN; + private List ROUT; + private String ACFT; + private String RENO; + private String TAOP; + private String TAFL; + private String TAID; + private String TRML; + private String ESTT; + private String ACTT; + private CHDT CHDT; + private List GTDT; + private String STND; + private PSDT PSDT; + private List CKDT; + private String PHAG; + private String BOTM; + private String LACL; + private String FHAG; + private String MHAG; + private List ERUT; + private String EXSC; + private String FTSS; + private String NEAT; + private String NAAT; + public void setFLID(String FLID) { + this.FLID = FLID; + } + public String getFLID() { + return FLID; + } + + public void setALCD(String ALCD) { + this.ALCD = ALCD; + } + public String getALCD() { + return ALCD; + } + + public void setFLNO(String FLNO) { + this.FLNO = FLNO; + } + public String getFLNO() { + return FLNO; + } + + public void setMVIN(String MVIN) { + this.MVIN = MVIN; + } + public String getMVIN() { + return MVIN; + } + + public void setSODT(String SODT) { + this.SODT = SODT; + } + public String getSODT() { + return SODT; + } + + public void setFLTY(String FLTY) { + this.FLTY = FLTY; + } + public String getFLTY() { + return FLTY; + } + + public void setFLIN(String FLIN) { + this.FLIN = FLIN; + } + public String getFLIN() { + return FLIN; + } + + public void setROUT(List ROUT) { + this.ROUT = ROUT; + } + public List getROUT() { + return ROUT; + } + + public void setACFT(String ACFT) { + this.ACFT = ACFT; + } + public String getACFT() { + return ACFT; + } + + public void setRENO(String RENO) { + this.RENO = RENO; + } + public String getRENO() { + return RENO; + } + + public void setTAOP(String TAOP) { + this.TAOP = TAOP; + } + public String getTAOP() { + return TAOP; + } + + public void setTAFL(String TAFL) { + this.TAFL = TAFL; + } + public String getTAFL() { + return TAFL; + } + + public void setTAID(String TAID) { + this.TAID = TAID; + } + public String getTAID() { + return TAID; + } + + public void setTRML(String TRML) { + this.TRML = TRML; + } + public String getTRML() { + return TRML; + } + + public void setESTT(String ESTT) { + this.ESTT = ESTT; + } + public String getESTT() { + return ESTT; + } + + public void setACTT(String ACTT) { + this.ACTT = ACTT; + } + public String getACTT() { + return ACTT; + } + + public void setCHDT(CHDT CHDT) { + this.CHDT = CHDT; + } + public CHDT getCHDT() { + return CHDT; + } + + public void setGTDT(List GTDT) { + this.GTDT = GTDT; + } + public List getGTDT() { + return GTDT; + } + + public void setSTND(String STND) { + this.STND = STND; + } + public String getSTND() { + return STND; + } + + public void setPSDT(PSDT PSDT) { + this.PSDT = PSDT; + } + public PSDT getPSDT() { + return PSDT; + } + + public void setCKDT(List CKDT) { + this.CKDT = CKDT; + } + public List getCKDT() { + return CKDT; + } + + public void setPHAG(String PHAG) { + this.PHAG = PHAG; + } + public String getPHAG() { + return PHAG; + } + + public void setBOTM(String BOTM) { + this.BOTM = BOTM; + } + public String getBOTM() { + return BOTM; + } + + public void setLACL(String LACL) { + this.LACL = LACL; + } + public String getLACL() { + return LACL; + } + + public void setFHAG(String FHAG) { + this.FHAG = FHAG; + } + public String getFHAG() { + return FHAG; + } + + public void setMHAG(String MHAG) { + this.MHAG = MHAG; + } + public String getMHAG() { + return MHAG; + } + + public void setERUT(List ERUT) { + this.ERUT = ERUT; + } + public List getERUT() { + return ERUT; + } + + public void setEXSC(String EXSC) { + this.EXSC = EXSC; + } + public String getEXSC() { + return EXSC; + } + + public void setFTSS(String FTSS) { + this.FTSS = FTSS; + } + public String getFTSS() { + return FTSS; + } + + public void setNEAT(String NEAT) { + this.NEAT = NEAT; + } + public String getNEAT() { + return NEAT; + } + + public void setNAAT(String NAAT) { + this.NAAT = NAAT; + } + public String getNAAT() { + return NAAT; + } + } \ 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 ffb679f0..6132aa45 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 @@ -1,58 +1,62 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -public class GTDT -{ - private String gtno; - - private String gate; - - private String pgot; - - private String pgct; - - private String gctm; - - private String gtyp; - - public String getGtno(){ - return this.gtno; - } - public void setGtno(String gtno){ - this.gtno = gtno; - } - - public String getGate(){ - return this.gate; - } - public void setGate(String gate){ - this.gate = gate; - } - - public String getPgot(){ - return this.pgot; - } - public void setPgot(String pgot){ - this.pgot = pgot; - } - - public String getPgct(){ - return this.pgct; - } - public void setPgct(String pgct){ - this.pgct = pgct; - } - - public String getGctm(){ - return this.gctm; - } - public void setGctm(String gctm){ - this.gctm = gctm; - } - - public String getGtyp(){ - return this.gtyp; - } - public void setGtyp(String gtyp){ - this.gtyp = gtyp; - } -} +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class GTDT { + + private String GTNO; + private String GATE; + private String PGOT; + private String PGCT; + private String GCTM; + private String GTYP; + public void setGTNO(String GTNO) { + this.GTNO = GTNO; + } + public String getGTNO() { + return GTNO; + } + + public void setGATE(String GATE) { + this.GATE = GATE; + } + public String getGATE() { + return GATE; + } + + public void setPGOT(String PGOT) { + this.PGOT = PGOT; + } + public String getPGOT() { + return PGOT; + } + + public void setPGCT(String PGCT) { + this.PGCT = PGCT; + } + public String getPGCT() { + return PGCT; + } + + public void setGCTM(String GCTM) { + this.GCTM = GCTM; + } + public String getGCTM() { + return GCTM; + } + + public void setGTYP(String GTYP) { + this.GTYP = GTYP; + } + public String getGTYP() { + return GTYP; + } + +} \ No newline at end of file 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 cd00b493..205e9001 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 @@ -1,40 +1,46 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -public class PSDT -{ - private String psno; - - private String psst; - - private String stst; - - private String stet; - - public String getPsno(){ - return this.psno; - } - public void setPsno(String psno){ - this.psno = psno; - } - - public String getPsst(){ - return this.psst; - } - public void setPsst(String psst){ - this.psst = psst; - } - - public String getStst(){ - return this.stst; - } - public void setStst(String stst){ - this.stst = stst; - } - - public String getStet(){ - return this.stet; - } - public void setStet(String stet){ - this.stet = stet; - } -} +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class PSDT { + + private String PSNO; + private String PSST; + private String STST; + private String STET; + public void setPSNO(String PSNO) { + this.PSNO = PSNO; + } + public String getPSNO() { + return PSNO; + } + + public void setPSST(String PSST) { + this.PSST = PSST; + } + public String getPSST() { + return PSST; + } + + public void setSTST(String STST) { + this.STST = STST; + } + public String getSTST() { + return STST; + } + + public void setSTET(String STET) { + this.STET = STET; + } + public String getSTET() { + return STET; + } + +} \ No newline at end of file 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 57a0ca14..5066952c 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 @@ -1,40 +1,46 @@ -package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; - -public class ROUT -{ - private String rtno; - - private String apcd; - - private String scat; - - private String scdt; - - public String getRtno(){ - return this.rtno; - } - public void setRtno(String rtno){ - this.rtno = rtno; - } - - public String getApcd(){ - return this.apcd; - } - public void setApcd(String apcd){ - this.apcd = apcd; - } - - public String getScat(){ - return this.scat; - } - public void setScat(String scat){ - this.scat = scat; - } - - public String getScdt(){ - return this.scdt; - } - public void setScdt(String scdt){ - this.scdt = scdt; - } +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class ROUT { + + private String RTNO; + private String APCD; + private String SCAT; + private String SCDT; + public void setRTNO(String RTNO) { + this.RTNO = RTNO; + } + public String getRTNO() { + return RTNO; + } + + public void setAPCD(String APCD) { + this.APCD = APCD; + } + public String getAPCD() { + return APCD; + } + + public void setSCAT(String SCAT) { + this.SCAT = SCAT; + } + public String getSCAT() { + return SCAT; + } + + public void setSCDT(String SCDT) { + this.SCDT = SCDT; + } + public String getSCDT() { + return SCDT; + } + } \ No newline at end of file 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 new file mode 100644 index 00000000..4ece0989 --- /dev/null +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/SCHD.java @@ -0,0 +1,31 @@ +/** + * Copyright 2018 bejson.com + */ +package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; + +import java.util.List; + +/** + * Auto-generated: 2018-12-05 11:38:31 + * + * @author bejson.com (i@bejson.com) + * @website http://www.bejson.com/java2pojo/ + */ +public class SCHD { + + private String RECS; + private List FLTRS; + + 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/msghandler/flop/ACFTHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ACFTHandler.java index 4a511ade..db6b9b19 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 @@ -30,7 +30,7 @@ public class ACFTHandler implements IBaseHandler { FLTR fltr = flightInfoService.getByFlid(acftMsg.getFLOP().getFLID()); if(null != fltr) { - fltr.setAcft(acftMsg.getFLOP().getACFT()); + fltr.setACFT(acftMsg.getFLOP().getACFT()); flightInfoService.saveFltr(fltr); return HandlerResult.success(fltr); } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java index 256d3039..007a33d2 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java @@ -7,6 +7,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.CommandLineRunner; +import org.springframework.stereotype.Component; import com.gzzn.omms.msgexchangeapi.dao.CmoutmsgDao; import com.gzzn.omms.msgexchangeapi.entity.Cmoutmsg; @@ -17,7 +18,7 @@ import com.gzzn.omms.msgexchangeapi.redis.RedisService; import com.gzzn.omms.msgexchangeapi.service.IExchangeService; import com.gzzn.omms.msgexchangeapi.utils.DateTimeUtil; - +@Component public class AppRunner implements CommandLineRunner { private static Logger logger = LoggerFactory.getLogger(AppRunner.class); @@ -35,6 +36,8 @@ public class AppRunner implements CommandLineRunner { @Override public void run(String... args) throws Exception { + logger.info("发送获取动态航班日计划的消息"); + //构造消息 Date nowDate = new Date(); Cmoutmsg cmoutmsg = new Cmoutmsg(); @@ -56,5 +59,7 @@ public class AppRunner implements CommandLineRunner { // redisService.set(RedisKeyConstant.KEY_ISWAITSCHD, true); //等待返回日计划状态 redisService.set(RedisKeyConstant.KEY_WAITSCHDDATE,nowDate); //初始化消息进度 + + logger.info("发送获取动态航班日计划的消息完成"); }//end function run } 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 87394b3b..1c485976 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 @@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; -import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.DnldMsg; +import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.DNLDMsg; import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.FLTR; import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; import com.gzzn.omms.msgexchangeapi.msghandler.MsgHandlerDispatcher; @@ -31,14 +31,15 @@ public class FlightInfoServiceImpl implements IFlightInfoService { @Override public Boolean updateByDaySchd(Cminmsg cminmsg) { String clobMsg = cminmsg.getCminmsgsClobMsg(); - DnldMsg dnldMsg = exchangeService.xmlstrToObject(clobMsg, DnldMsg.class); + DNLDMsg dnldMsg = exchangeService.xmlstrToObject(clobMsg, DNLDMsg.class); this.removeAll(); // List lsFltr = dnldMsg - .getSchd() - .getFltr(); + .getSCHD() + .getFLTRS(); + for(FLTR fltr : lsFltr) { Boolean result = redisSet(fltr); @@ -95,7 +96,7 @@ public class FlightInfoServiceImpl implements IFlightInfoService { */ private boolean redisSet(FLTR fltr) { - return redisService.set(redisKey + fltr.getFlid(), fltr); + return redisService.set(redisKey + fltr.getFLID(), fltr); } /** 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 ccadd550..9c0ebfb7 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java @@ -8,6 +8,7 @@ import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; @@ -45,10 +46,10 @@ public class ExchangeTask { @Autowired private IFlightInfoService flightInfoService; - //@Scheduled(cron="0 0/1 * * * ?") + @Scheduled(cron="0 0/1 * * * ?") public void corn() { - logger.info("定时任务启动...."); + logger.info("进入获取动态航班消息..."); Boolean isWaitSchd = (Boolean)redisService.get(RedisKeyConstant.KEY_ISWAITSCHD); @@ -56,6 +57,8 @@ public class ExchangeTask { Long beginId = null; Integer tryTimes = 0; while (isWaitSchd && tryTimes < 10) { + logger.info("正在第{}次获取返回的动态航班日计划消息",tryTimes); + tryTimes++; //查找回复的日计划消息 @@ -64,6 +67,7 @@ public class ExchangeTask { if(opCminmsg.isPresent()) { //如果找到，添加到内存数据库动态航班信息表 + logger.info("找到返回的动态航班计划,开始更新动态航班信息..."); flightInfoService.updateByDaySchd(opCminmsg.get()); // @@ -96,6 +100,7 @@ public class ExchangeTask { { //获取上次的beginId beginId = (Long)redisService.get(RedisKeyConstant.KEY_LASTBEGINID); + logger.info("从上次获取的消息位置{}开始",beginId); } //获取航班动态消息 @@ -103,6 +108,7 @@ public class ExchangeTask { List lsUpdatedFlightInfo = flightInfoService.updateByCminmsgs(lsCminmsgs); //新增或变更 航班动态信息 发送 到kafka的SCHD topic + logger.info("开始发送schd信息..."); for (UpdateByCminmsgsResult updateResult : lsUpdatedFlightInfo) { if(updateResult.getIsSuccess()) { @@ -114,6 +120,7 @@ public class ExchangeTask { }//end for //发送动态消息到kafka + logger.info("开始发送动态航班信息..."); for (UpdateByCminmsgsResult updateResult : lsUpdatedFlightInfo) { if(updateResult.getIsSuccess()) { @@ -145,6 +152,6 @@ public class ExchangeTask { redisService.set(RedisKeyConstant.KEY_LASTBEGINID,newBeginId); - logger.info("同步完成"); + logger.info("本次定时获取新消息完成..."); } //end function } diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/utils/RedisServiceTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/utils/RedisServiceTest.java index f7e8d435..ef40946d 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/utils/RedisServiceTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/utils/RedisServiceTest.java @@ -21,9 +21,9 @@ public class RedisServiceTest { { //准备数据 FLTR flightInfo = new FLTR(); - flightInfo.setFlid("12333"); - flightInfo.setAcft("acft"); + flightInfo.setFLID("12333"); + flightInfo.setACFT("acft"); - redisService.set(flightInfo.getFlid(), flightInfo); + redisService.set(flightInfo.getFLID(), flightInfo); } }