cdia/msgexchange-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

重新生成dnld 消息

Browse Source
This commit is contained in:
zhouxiunai
2018-12-05 11:47:43 +08:00
parent e920e67695
commit 1b1207b07a
17 changed files with 691 additions and 631 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java
+17
View File
@@ -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");
}
}
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CHDT.java
+41 -37
View File
@@ -1,58 +1,62 @@
/**
* Copyright 2018 bejson.com
*/
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
public class CHDT /**
{ * Auto-generated: 2018-12-05 11:38:31
private String chno; *
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
public class CHDT {
private String chut; private String CHNO;
private String CHUT;
private String ccls; private String CCLS;
private String PCBT;
private String pcbt; private String PCET;
private String CTYP;
private String pcet; public void setCHNO(String CHNO) {
this.CHNO = CHNO;
private String ctyp;
public String getChno(){
return this.chno;
} }
public void setChno(String chno){ public String getCHNO() {
this.chno = chno; return CHNO;
} }
public String getChut(){ public void setCHUT(String CHUT) {
return this.chut; this.CHUT = CHUT;
} }
public void setChut(String chut){ public String getCHUT() {
this.chut = chut; return CHUT;
} }
public String getCcls(){ public void setCCLS(String CCLS) {
return this.ccls; this.CCLS = CCLS;
} }
public void setCcls(String ccls){ public String getCCLS() {
this.ccls = ccls; return CCLS;
} }
public String getPcbt(){ public void setPCBT(String PCBT) {
return this.pcbt; this.PCBT = PCBT;
} }
public void setPcbt(String pcbt){ public String getPCBT() {
this.pcbt = pcbt; return PCBT;
} }
public String getPcet(){ public void setPCET(String PCET) {
return this.pcet; this.PCET = PCET;
} }
public void setPcet(String pcet){ public String getPCET() {
this.pcet = pcet; return PCET;
} }
public String getCtyp(){ public void setCTYP(String CTYP) {
return this.ctyp; this.CTYP = CTYP;
} }
public void setCtyp(String ctyp){ public String getCTYP() {
this.ctyp = ctyp; return CTYP;
} }
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java
+46 -44
View File
@@ -1,68 +1,70 @@
/**
* Copyright 2018 bejson.com
*/
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
public class CKDT /**
{ * Auto-generated: 2018-12-05 11:38:31
private String ckno; *
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
public class CKDT {
private String chkc; private String CKNO;
private String CHKC;
private String ccls; private String CCLS;
private String PCOT;
private String pcot; private String PCCT;
private String CCTM;
private String pcct; private String CTYP;
public void setCKNO(String CKNO) {
private String cctm; this.CKNO = CKNO;
private String ctyp;
public String getCkno(){
return this.ckno;
} }
public void setCkno(String ckno){ public String getCKNO() {
this.ckno = ckno; return CKNO;
} }
public String getChkc(){ public void setCHKC(String CHKC) {
return this.chkc; this.CHKC = CHKC;
} }
public void setChkc(String chkc){ public String getCHKC() {
this.chkc = chkc; return CHKC;
} }
public String getCcls(){ public void setCCLS(String CCLS) {
return this.ccls; this.CCLS = CCLS;
} }
public void setCcls(String ccls){ public String getCCLS() {
this.ccls = ccls; return CCLS;
} }
public String getPcot(){ public void setPCOT(String PCOT) {
return this.pcot; this.PCOT = PCOT;
} }
public void setPcot(String pcot){ public String getPCOT() {
this.pcot = pcot; return PCOT;
} }
public String getPcct(){ public void setPCCT(String PCCT) {
return this.pcct; this.PCCT = PCCT;
} }
public void setPcct(String pcct){ public String getPCCT() {
this.pcct = pcct; return PCCT;
} }
public String getCctm(){ public void setCCTM(String CCTM) {
return this.cctm; this.CCTM = CCTM;
} }
public void setCctm(String cctm){ public String getCCTM() {
this.cctm = cctm; return CCTM;
} }
public String getCtyp(){ public void setCTYP(String CTYP) {
return this.ctyp; this.CTYP = CTYP;
} }
public void setCtyp(String ctyp){ public String getCTYP() {
this.ctyp = ctyp; return CTYP;
} }
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DNLDMsg.java
+32
View File
@@ -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;
}
}
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsg.java
-19
View File
@@ -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;
}
}
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/DnldMsgBody.java
-21
View File
@@ -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> fltr;//航班动态消息记录列表
public String getRecs() {
return Recs;
}
public void setRecs(String recs) {
Recs = recs;
}
public List<FLTR> getFltr() {
return fltr;
}
public void setFltr(List<FLTR> fltr) {
this.fltr = fltr;
}
}
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ERUT.java
+26 -19
View File
@@ -1,31 +1,38 @@
/**
* Copyright 2018 bejson.com
*/
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
public class ERUT /**
{ * Auto-generated: 2018-12-05 11:38:31
private String rtno; *
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
public class ERUT {
private String apcd; private String RTNO;
private String APCD;
private String scdt; private String SCDT;
public void setRTNO(String RTNO) {
public String getRtno(){ this.RTNO = RTNO;
return this.rtno;
} }
public void setRtno(String rtno){ public String getRTNO() {
this.rtno = rtno; return RTNO;
} }
public String getApcd(){ public void setAPCD(String APCD) {
return this.apcd; this.APCD = APCD;
} }
public void setApcd(String apcd){ public String getAPCD() {
this.apcd = apcd; return APCD;
} }
public String getScdt(){ public void setSCDT(String SCDT) {
return this.scdt; this.SCDT = SCDT;
} }
public void setScdt(String scdt){ public String getSCDT() {
this.scdt = scdt; return SCDT;
} }
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java
+166 -188
View File
@@ -1,285 +1,263 @@
/**
* Copyright 2018 bejson.com
*/
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
import java.util.List; import java.util.List;
public class FLTR /**
{ * Auto-generated: 2018-12-05 11:38:31
private String flid; *
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
public class FLTR {
private String alcd; private String FLID;
private String ALCD;
private String flno; private String FLNO;
private String MVIN;
private String mvin; private String SODT;
private String FLTY;
private String sodt; private String FLIN;
private List<ROUT> ROUT;
private String flty; private String ACFT;
private String RENO;
private String flin; private String TAOP;
private String TAFL;
private List<ROUT> rout; private String TAID;
private String TRML;
private String acft; private String ESTT;
private String ACTT;
private String reno; private CHDT CHDT;
private List<GTDT> GTDT;
private String taop; private String STND;
private PSDT PSDT;
private String tafl; private List<CKDT> CKDT;
private String PHAG;
private String taid; private String BOTM;
private String LACL;
private String trml; private String FHAG;
private String MHAG;
private String estt; private List<ERUT> ERUT;
private String EXSC;
private String actt; private String FTSS;
private String NEAT;
private CHDT chdt; private String NAAT;
public void setFLID(String FLID) {
private List<GTDT> gtdt; this.FLID = FLID;
private String stnd;
private PSDT psdt;
private List<CKDT> ckdt;
private String phag;
private String botm;
private String lacl;
private String fhag;
private String mhag;
private List<ERUT> erut;
private String exsc;
private String ftss;
private String neat;
private String naat;
public String getFlid(){
return this.flid;
} }
public void setFlid(String flid){ public String getFLID() {
this.flid = flid; return FLID;
} }
public String getAlcd(){ public void setALCD(String ALCD) {
return this.alcd; this.ALCD = ALCD;
} }
public void setAlcd(String alcd){ public String getALCD() {
this.alcd = alcd; return ALCD;
} }
public String getFlno(){ public void setFLNO(String FLNO) {
return this.flno; this.FLNO = FLNO;
} }
public void setFlno(String flno){ public String getFLNO() {
this.flno = flno; return FLNO;
} }
public String getMvin(){ public void setMVIN(String MVIN) {
return this.mvin; this.MVIN = MVIN;
} }
public void setMvin(String mvin){ public String getMVIN() {
this.mvin = mvin; return MVIN;
} }
public String getSodt(){ public void setSODT(String SODT) {
return this.sodt; this.SODT = SODT;
} }
public void setSodt(String sodt){ public String getSODT() {
this.sodt = sodt; return SODT;
} }
public String getFlty(){ public void setFLTY(String FLTY) {
return this.flty; this.FLTY = FLTY;
} }
public void setFlty(String flty){ public String getFLTY() {
this.flty = flty; return FLTY;
} }
public String getFlin(){ public void setFLIN(String FLIN) {
return this.flin; this.FLIN = FLIN;
} }
public void setFlin(String flin){ public String getFLIN() {
this.flin = flin; return FLIN;
} }
public List<ROUT> getRout(){ public void setROUT(List<ROUT> ROUT) {
return this.rout; this.ROUT = ROUT;
} }
public void setRout(List<ROUT> rout){ public List<ROUT> getROUT() {
this.rout = rout; return ROUT;
} }
public String getAcft(){ public void setACFT(String ACFT) {
return this.acft; this.ACFT = ACFT;
} }
public void setAcft(String acft){ public String getACFT() {
this.acft = acft; return ACFT;
} }
public String getReno(){ public void setRENO(String RENO) {
return this.reno; this.RENO = RENO;
} }
public void setReno(String reno){ public String getRENO() {
this.reno = reno; return RENO;
} }
public String getTaop(){ public void setTAOP(String TAOP) {
return this.taop; this.TAOP = TAOP;
} }
public void setTaop(String taop){ public String getTAOP() {
this.taop = taop; return TAOP;
} }
public String getTafl(){ public void setTAFL(String TAFL) {
return this.tafl; this.TAFL = TAFL;
} }
public void setTafl(String tafl){ public String getTAFL() {
this.tafl = tafl; return TAFL;
} }
public String getTaid(){ public void setTAID(String TAID) {
return this.taid; this.TAID = TAID;
} }
public void setTaid(String taid){ public String getTAID() {
this.taid = taid; return TAID;
} }
public String getTrml(){ public void setTRML(String TRML) {
return this.trml; this.TRML = TRML;
} }
public void setTrml(String trml){ public String getTRML() {
this.trml = trml; return TRML;
} }
public String getEstt(){ public void setESTT(String ESTT) {
return this.estt; this.ESTT = ESTT;
} }
public void setEstt(String estt){ public String getESTT() {
this.estt = estt; return ESTT;
} }
public String getActt(){ public void setACTT(String ACTT) {
return this.actt; this.ACTT = ACTT;
} }
public void setActt(String actt){ public String getACTT() {
this.actt = actt; return ACTT;
} }
public CHDT getChdt(){ public void setCHDT(CHDT CHDT) {
return this.chdt; this.CHDT = CHDT;
} }
public void setChdt(CHDT chdt){ public CHDT getCHDT() {
this.chdt = chdt; return CHDT;
} }
public List<GTDT> getGtdt(){ public void setGTDT(List<GTDT> GTDT) {
return this.gtdt; this.GTDT = GTDT;
} }
public void setGtdt(List<GTDT> gtdt){ public List<GTDT> getGTDT() {
this.gtdt = gtdt; return GTDT;
} }
public String getStnd(){ public void setSTND(String STND) {
return this.stnd; this.STND = STND;
} }
public void setStnd(String stnd){ public String getSTND() {
this.stnd = stnd; return STND;
} }
public PSDT getPsdt(){ public void setPSDT(PSDT PSDT) {
return this.psdt; this.PSDT = PSDT;
} }
public void setPsdt(PSDT psdt){ public PSDT getPSDT() {
this.psdt = psdt; return PSDT;
} }
public List<CKDT> getCkdt(){ public void setCKDT(List<CKDT> CKDT) {
return this.ckdt; this.CKDT = CKDT;
} }
public void setCkdt(List<CKDT> ckdt){ public List<CKDT> getCKDT() {
this.ckdt = ckdt; return CKDT;
} }
public String getPhag(){ public void setPHAG(String PHAG) {
return this.phag; this.PHAG = PHAG;
} }
public void setPhag(String phag){ public String getPHAG() {
this.phag = phag; return PHAG;
} }
public String getBotm(){ public void setBOTM(String BOTM) {
return this.botm; this.BOTM = BOTM;
} }
public void setBotm(String botm){ public String getBOTM() {
this.botm = botm; return BOTM;
} }
public String getLacl(){ public void setLACL(String LACL) {
return this.lacl; this.LACL = LACL;
} }
public void setLacl(String lacl){ public String getLACL() {
this.lacl = lacl; return LACL;
} }
public String getFhag(){ public void setFHAG(String FHAG) {
return this.fhag; this.FHAG = FHAG;
} }
public void setFhag(String fhag){ public String getFHAG() {
this.fhag = fhag; return FHAG;
} }
public String getMhag(){ public void setMHAG(String MHAG) {
return this.mhag; this.MHAG = MHAG;
} }
public void setMhag(String mhag){ public String getMHAG() {
this.mhag = mhag; return MHAG;
} }
public List<ERUT> getErut(){ public void setERUT(List<ERUT> ERUT) {
return this.erut; this.ERUT = ERUT;
} }
public void setErut(List<ERUT> erut){ public List<ERUT> getERUT() {
this.erut = erut; return ERUT;
} }
public String getExsc(){ public void setEXSC(String EXSC) {
return this.exsc; this.EXSC = EXSC;
} }
public void setExsc(String exsc){ public String getEXSC() {
this.exsc = exsc; return EXSC;
} }
public String getFtss(){ public void setFTSS(String FTSS) {
return this.ftss; this.FTSS = FTSS;
} }
public void setFtss(String ftss){ public String getFTSS() {
this.ftss = ftss; return FTSS;
} }
public String getNeat(){ public void setNEAT(String NEAT) {
return this.neat; this.NEAT = NEAT;
} }
public void setNeat(String neat){ public String getNEAT() {
this.neat = neat; return NEAT;
} }
public String getNaat(){ public void setNAAT(String NAAT) {
return this.naat; this.NAAT = NAAT;
} }
public void setNaat(String naat){ public String getNAAT() {
this.naat = naat; return NAAT;
} }
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java
+41 -37
View File
@@ -1,58 +1,62 @@
/**
* Copyright 2018 bejson.com
*/
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
public class GTDT /**
{ * Auto-generated: 2018-12-05 11:38:31
private String gtno; *
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
public class GTDT {
private String gate; private String GTNO;
private String GATE;
private String pgot; private String PGOT;
private String PGCT;
private String pgct; private String GCTM;
private String GTYP;
private String gctm; public void setGTNO(String GTNO) {
this.GTNO = GTNO;
private String gtyp;
public String getGtno(){
return this.gtno;
} }
public void setGtno(String gtno){ public String getGTNO() {
this.gtno = gtno; return GTNO;
} }
public String getGate(){ public void setGATE(String GATE) {
return this.gate; this.GATE = GATE;
} }
public void setGate(String gate){ public String getGATE() {
this.gate = gate; return GATE;
} }
public String getPgot(){ public void setPGOT(String PGOT) {
return this.pgot; this.PGOT = PGOT;
} }
public void setPgot(String pgot){ public String getPGOT() {
this.pgot = pgot; return PGOT;
} }
public String getPgct(){ public void setPGCT(String PGCT) {
return this.pgct; this.PGCT = PGCT;
} }
public void setPgct(String pgct){ public String getPGCT() {
this.pgct = pgct; return PGCT;
} }
public String getGctm(){ public void setGCTM(String GCTM) {
return this.gctm; this.GCTM = GCTM;
} }
public void setGctm(String gctm){ public String getGCTM() {
this.gctm = gctm; return GCTM;
} }
public String getGtyp(){ public void setGTYP(String GTYP) {
return this.gtyp; this.GTYP = GTYP;
} }
public void setGtyp(String gtyp){ public String getGTYP() {
this.gtyp = gtyp; return GTYP;
} }
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java
+31 -25
View File
@@ -1,40 +1,46 @@
/**
* Copyright 2018 bejson.com
*/
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
public class PSDT /**
{ * Auto-generated: 2018-12-05 11:38:31
private String psno; *
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
public class PSDT {
private String psst; private String PSNO;
private String PSST;
private String stst; private String STST;
private String STET;
private String stet; public void setPSNO(String PSNO) {
this.PSNO = PSNO;
public String getPsno(){
return this.psno;
} }
public void setPsno(String psno){ public String getPSNO() {
this.psno = psno; return PSNO;
} }
public String getPsst(){ public void setPSST(String PSST) {
return this.psst; this.PSST = PSST;
} }
public void setPsst(String psst){ public String getPSST() {
this.psst = psst; return PSST;
} }
public String getStst(){ public void setSTST(String STST) {
return this.stst; this.STST = STST;
} }
public void setStst(String stst){ public String getSTST() {
this.stst = stst; return STST;
} }
public String getStet(){ public void setSTET(String STET) {
return this.stet; this.STET = STET;
} }
public void setStet(String stet){ public String getSTET() {
this.stet = stet; return STET;
} }
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java
+31 -25
View File
@@ -1,40 +1,46 @@
/**
* Copyright 2018 bejson.com
*/
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
public class ROUT /**
{ * Auto-generated: 2018-12-05 11:38:31
private String rtno; *
* @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
*/
public class ROUT {
private String apcd; private String RTNO;
private String APCD;
private String scat; private String SCAT;
private String SCDT;
private String scdt; public void setRTNO(String RTNO) {
this.RTNO = RTNO;
public String getRtno(){
return this.rtno;
} }
public void setRtno(String rtno){ public String getRTNO() {
this.rtno = rtno; return RTNO;
} }
public String getApcd(){ public void setAPCD(String APCD) {
return this.apcd; this.APCD = APCD;
} }
public void setApcd(String apcd){ public String getAPCD() {
this.apcd = apcd; return APCD;
} }
public String getScat(){ public void setSCAT(String SCAT) {
return this.scat; this.SCAT = SCAT;
} }
public void setScat(String scat){ public String getSCAT() {
this.scat = scat; return SCAT;
} }
public String getScdt(){ public void setSCDT(String SCDT) {
return this.scdt; this.SCDT = SCDT;
} }
public void setScdt(String scdt){ public String getSCDT() {
this.scdt = scdt; return SCDT;
} }
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/SCHD.java
+31
View File
@@ -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<FLTR> FLTRS;
public void setRECS(String RECS) {
this.RECS = RECS;
}
public String getRECS() {
return RECS;
}
public List<FLTR> getFLTRS() {
return FLTRS;
}
public void setFLTRS(List<FLTR> fLTRS) {
FLTRS = fLTRS;
}
}
src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ACFTHandler.java
+1 -1
View File
@@ -30,7 +30,7 @@ public class ACFTHandler implements IBaseHandler {
FLTR fltr = flightInfoService.getByFlid(acftMsg.getFLOP().getFLID()); FLTR fltr = flightInfoService.getByFlid(acftMsg.getFLOP().getFLID());
if(null != fltr) if(null != fltr)
{ {
fltr.setAcft(acftMsg.getFLOP().getACFT()); fltr.setACFT(acftMsg.getFLOP().getACFT());
flightInfoService.saveFltr(fltr); flightInfoService.saveFltr(fltr);
return HandlerResult.success(fltr); return HandlerResult.success(fltr);
} }
src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java
+6 -1
View File
@@ -7,6 +7,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner; import org.springframework.boot.CommandLineRunner;
import org.springframework.stereotype.Component;
import com.gzzn.omms.msgexchangeapi.dao.CmoutmsgDao; import com.gzzn.omms.msgexchangeapi.dao.CmoutmsgDao;
import com.gzzn.omms.msgexchangeapi.entity.Cmoutmsg; 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.service.IExchangeService;
import com.gzzn.omms.msgexchangeapi.utils.DateTimeUtil; import com.gzzn.omms.msgexchangeapi.utils.DateTimeUtil;
@Component
public class AppRunner implements CommandLineRunner { public class AppRunner implements CommandLineRunner {
private static Logger logger = LoggerFactory.getLogger(AppRunner.class); private static Logger logger = LoggerFactory.getLogger(AppRunner.class);
@@ -35,6 +36,8 @@ public class AppRunner implements CommandLineRunner {
@Override @Override
public void run(String... args) throws Exception { public void run(String... args) throws Exception {
logger.info("发送获取动态航班日计划的消息");
//构造消息 //构造消息
Date nowDate = new Date(); Date nowDate = new Date();
Cmoutmsg cmoutmsg = new Cmoutmsg(); Cmoutmsg cmoutmsg = new Cmoutmsg();
@@ -56,5 +59,7 @@ public class AppRunner implements CommandLineRunner {
// //
redisService.set(RedisKeyConstant.KEY_ISWAITSCHD, true); //等待返回日计划状态 redisService.set(RedisKeyConstant.KEY_ISWAITSCHD, true); //等待返回日计划状态
redisService.set(RedisKeyConstant.KEY_WAITSCHDDATE,nowDate); //初始化消息进度 redisService.set(RedisKeyConstant.KEY_WAITSCHDDATE,nowDate); //初始化消息进度
logger.info("发送获取动态航班日计划的消息完成");
}//end function run }//end function run
} }
src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java
+6 -5
View File
@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; 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.entity.msg.schd.dnld.FLTR;
import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult;
import com.gzzn.omms.msgexchangeapi.msghandler.MsgHandlerDispatcher; import com.gzzn.omms.msgexchangeapi.msghandler.MsgHandlerDispatcher;
@@ -31,14 +31,15 @@ public class FlightInfoServiceImpl implements IFlightInfoService {
@Override @Override
public Boolean updateByDaySchd(Cminmsg cminmsg) { public Boolean updateByDaySchd(Cminmsg cminmsg) {
String clobMsg = cminmsg.getCminmsgsClobMsg(); String clobMsg = cminmsg.getCminmsgsClobMsg();
DnldMsg dnldMsg = exchangeService.xmlstrToObject(clobMsg, DnldMsg.class); DNLDMsg dnldMsg = exchangeService.xmlstrToObject(clobMsg, DNLDMsg.class);
this.removeAll(); this.removeAll();
// //
List<FLTR> lsFltr = dnldMsg List<FLTR> lsFltr = dnldMsg
.getSchd() .getSCHD()
.getFltr(); .getFLTRS();
for(FLTR fltr : lsFltr) for(FLTR fltr : lsFltr)
{ {
Boolean result = redisSet(fltr); Boolean result = redisSet(fltr);
@@ -95,7 +96,7 @@ public class FlightInfoServiceImpl implements IFlightInfoService {
*/ */
private boolean redisSet(FLTR fltr) private boolean redisSet(FLTR fltr)
{ {
return redisService.set(redisKey + fltr.getFlid(), fltr); return redisService.set(redisKey + fltr.getFLID(), fltr);
} }
/** /**
src/main/java/com/gzzn/omms/msgexchangeapi/task/ExchangeTask.java
+10 -3
View File
@@ -8,6 +8,7 @@ import java.util.stream.Collectors;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; import com.gzzn.omms.msgexchangeapi.entity.Cminmsg;
@@ -45,10 +46,10 @@ public class ExchangeTask {
@Autowired @Autowired
private IFlightInfoService flightInfoService; private IFlightInfoService flightInfoService;
//@Scheduled(cron="0 0/1 * * * ?") @Scheduled(cron="0 0/1 * * * ?")
public void corn() public void corn()
{ {
logger.info("定时任务启动...."); logger.info("进入获取动态航班消息...");
Boolean isWaitSchd = (Boolean)redisService.get(RedisKeyConstant.KEY_ISWAITSCHD); Boolean isWaitSchd = (Boolean)redisService.get(RedisKeyConstant.KEY_ISWAITSCHD);
@@ -56,6 +57,8 @@ public class ExchangeTask {
Long beginId = null; Long beginId = null;
Integer tryTimes = 0; Integer tryTimes = 0;
while (isWaitSchd && tryTimes < 10) { while (isWaitSchd && tryTimes < 10) {
logger.info("正在第{}次获取返回的动态航班日计划消息",tryTimes);
tryTimes++; tryTimes++;
//查找回复的日计划消息 //查找回复的日计划消息
@@ -64,6 +67,7 @@ public class ExchangeTask {
if(opCminmsg.isPresent()) if(opCminmsg.isPresent())
{ {
//如果找到，添加到内存数据库动态航班信息表 //如果找到，添加到内存数据库动态航班信息表
logger.info("找到返回的动态航班计划,开始更新动态航班信息...");
flightInfoService.updateByDaySchd(opCminmsg.get()); flightInfoService.updateByDaySchd(opCminmsg.get());
// //
@@ -96,6 +100,7 @@ public class ExchangeTask {
{ {
//获取上次的beginId //获取上次的beginId
beginId = (Long)redisService.get(RedisKeyConstant.KEY_LASTBEGINID); beginId = (Long)redisService.get(RedisKeyConstant.KEY_LASTBEGINID);
logger.info("从上次获取的消息位置{}开始",beginId);
} }
//获取航班动态消息 //获取航班动态消息
@@ -103,6 +108,7 @@ public class ExchangeTask {
List<UpdateByCminmsgsResult> lsUpdatedFlightInfo = flightInfoService.updateByCminmsgs(lsCminmsgs); List<UpdateByCminmsgsResult> lsUpdatedFlightInfo = flightInfoService.updateByCminmsgs(lsCminmsgs);
//新增或变更 航班动态信息 发送 到kafka的SCHD topic //新增或变更 航班动态信息 发送 到kafka的SCHD topic
logger.info("开始发送schd信息...");
for (UpdateByCminmsgsResult updateResult : lsUpdatedFlightInfo) { for (UpdateByCminmsgsResult updateResult : lsUpdatedFlightInfo) {
if(updateResult.getIsSuccess()) if(updateResult.getIsSuccess())
{ {
@@ -114,6 +120,7 @@ public class ExchangeTask {
}//end for }//end for
//发送动态消息到kafka //发送动态消息到kafka
logger.info("开始发送动态航班信息...");
for (UpdateByCminmsgsResult updateResult : lsUpdatedFlightInfo) { for (UpdateByCminmsgsResult updateResult : lsUpdatedFlightInfo) {
if(updateResult.getIsSuccess()) if(updateResult.getIsSuccess())
{ {
@@ -145,6 +152,6 @@ public class ExchangeTask {
redisService.set(RedisKeyConstant.KEY_LASTBEGINID,newBeginId); redisService.set(RedisKeyConstant.KEY_LASTBEGINID,newBeginId);
logger.info("同步完成"); logger.info("本次定时获取新消息完成...");
} //end function } //end function
} }
src/test/java/com/gzzn/omms/msgexchangeapi/utils/RedisServiceTest.java
+3 -3
View File
@@ -21,9 +21,9 @@ public class RedisServiceTest {
{ {
//准备数据 //准备数据
FLTR flightInfo = new FLTR(); FLTR flightInfo = new FLTR();
flightInfo.setFlid("12333"); flightInfo.setFLID("12333");
flightInfo.setAcft("acft"); flightInfo.setACFT("acft");
redisService.set(flightInfo.getFlid(), flightInfo); redisService.set(flightInfo.getFLID(), flightInfo);
} }
} }