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
+52 -48
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 PCBT;
private String PCET;
private String CTYP;
public void setCHNO(String CHNO) {
this.CHNO = CHNO;
}
public String getCHNO() {
return CHNO;
}
private String ccls; public void setCHUT(String CHUT) {
this.CHUT = CHUT;
}
public String getCHUT() {
return CHUT;
}
private String pcbt; public void setCCLS(String CCLS) {
this.CCLS = CCLS;
}
public String getCCLS() {
return CCLS;
}
private String pcet; public void setPCBT(String PCBT) {
this.PCBT = PCBT;
}
public String getPCBT() {
return PCBT;
}
private String ctyp; public void setPCET(String PCET) {
this.PCET = PCET;
}
public String getPCET() {
return PCET;
}
public String getChno(){ public void setCTYP(String CTYP) {
return this.chno; this.CTYP = CTYP;
} }
public void setChno(String chno){ public String getCTYP() {
this.chno = chno; return CTYP;
} }
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;
}
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/CKDT.java
+59 -57
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 PCOT;
private String PCCT;
private String CCTM;
private String CTYP;
public void setCKNO(String CKNO) {
this.CKNO = CKNO;
}
public String getCKNO() {
return CKNO;
}
private String ccls; public void setCHKC(String CHKC) {
this.CHKC = CHKC;
}
public String getCHKC() {
return CHKC;
}
private String pcot; public void setCCLS(String CCLS) {
this.CCLS = CCLS;
}
public String getCCLS() {
return CCLS;
}
private String pcct; public void setPCOT(String PCOT) {
this.PCOT = PCOT;
}
public String getPCOT() {
return PCOT;
}
private String cctm; public void setPCCT(String PCCT) {
this.PCCT = PCCT;
}
public String getPCCT() {
return PCCT;
}
private String ctyp; public void setCCTM(String CCTM) {
this.CCTM = CCTM;
}
public String getCCTM() {
return CCTM;
}
public String getCkno(){ public void setCTYP(String CTYP) {
return this.ckno; this.CTYP = CTYP;
} }
public void setCkno(String ckno){ public String getCTYP() {
this.ckno = ckno; return CTYP;
} }
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;
}
} }
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
+31 -24
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;
public void setRTNO(String RTNO) {
this.RTNO = RTNO;
}
public String getRTNO() {
return RTNO;
}
private String scdt; public void setAPCD(String APCD) {
this.APCD = APCD;
}
public String getAPCD() {
return APCD;
}
public String getRtno(){ public void setSCDT(String SCDT) {
return this.rtno; this.SCDT = SCDT;
} }
public void setRtno(String rtno){ public String getSCDT() {
this.rtno = rtno; return SCDT;
} }
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;
}
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/FLTR.java
+227 -249
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 MVIN;
private String SODT;
private String FLTY;
private String FLIN;
private List<ROUT> 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> GTDT;
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 void setFLID(String FLID) {
this.FLID = FLID;
}
public String getFLID() {
return FLID;
}
private String flno; public void setALCD(String ALCD) {
this.ALCD = ALCD;
}
public String getALCD() {
return ALCD;
}
private String mvin; public void setFLNO(String FLNO) {
this.FLNO = FLNO;
}
public String getFLNO() {
return FLNO;
}
private String sodt; public void setMVIN(String MVIN) {
this.MVIN = MVIN;
}
public String getMVIN() {
return MVIN;
}
private String flty; public void setSODT(String SODT) {
this.SODT = SODT;
}
public String getSODT() {
return SODT;
}
private String flin; public void setFLTY(String FLTY) {
this.FLTY = FLTY;
}
public String getFLTY() {
return FLTY;
}
private List<ROUT> rout; public void setFLIN(String FLIN) {
this.FLIN = FLIN;
}
public String getFLIN() {
return FLIN;
}
private String acft; public void setROUT(List<ROUT> ROUT) {
this.ROUT = ROUT;
}
public List<ROUT> getROUT() {
return ROUT;
}
private String reno; public void setACFT(String ACFT) {
this.ACFT = ACFT;
}
public String getACFT() {
return ACFT;
}
private String taop; public void setRENO(String RENO) {
this.RENO = RENO;
}
public String getRENO() {
return RENO;
}
private String tafl; public void setTAOP(String TAOP) {
this.TAOP = TAOP;
}
public String getTAOP() {
return TAOP;
}
private String taid; public void setTAFL(String TAFL) {
this.TAFL = TAFL;
}
public String getTAFL() {
return TAFL;
}
private String trml; public void setTAID(String TAID) {
this.TAID = TAID;
}
public String getTAID() {
return TAID;
}
private String estt; public void setTRML(String TRML) {
this.TRML = TRML;
}
public String getTRML() {
return TRML;
}
private String actt; public void setESTT(String ESTT) {
this.ESTT = ESTT;
}
public String getESTT() {
return ESTT;
}
private CHDT chdt; public void setACTT(String ACTT) {
this.ACTT = ACTT;
}
public String getACTT() {
return ACTT;
}
private List<GTDT> gtdt; public void setCHDT(CHDT CHDT) {
this.CHDT = CHDT;
}
public CHDT getCHDT() {
return CHDT;
}
private String stnd; public void setGTDT(List<GTDT> GTDT) {
this.GTDT = GTDT;
}
public List<GTDT> getGTDT() {
return GTDT;
}
private PSDT psdt; public void setSTND(String STND) {
this.STND = STND;
}
public String getSTND() {
return STND;
}
private List<CKDT> ckdt; public void setPSDT(PSDT PSDT) {
this.PSDT = PSDT;
}
public PSDT getPSDT() {
return PSDT;
}
private String phag; public void setCKDT(List<CKDT> CKDT) {
this.CKDT = CKDT;
}
public List<CKDT> getCKDT() {
return CKDT;
}
private String botm; public void setPHAG(String PHAG) {
this.PHAG = PHAG;
}
public String getPHAG() {
return PHAG;
}
private String lacl; public void setBOTM(String BOTM) {
this.BOTM = BOTM;
}
public String getBOTM() {
return BOTM;
}
private String fhag; public void setLACL(String LACL) {
this.LACL = LACL;
}
public String getLACL() {
return LACL;
}
private String mhag; public void setFHAG(String FHAG) {
this.FHAG = FHAG;
}
public String getFHAG() {
return FHAG;
}
private List<ERUT> erut; public void setMHAG(String MHAG) {
this.MHAG = MHAG;
}
public String getMHAG() {
return MHAG;
}
private String exsc; public void setERUT(List<ERUT> ERUT) {
this.ERUT = ERUT;
}
public List<ERUT> getERUT() {
return ERUT;
}
private String ftss; public void setEXSC(String EXSC) {
this.EXSC = EXSC;
}
public String getEXSC() {
return EXSC;
}
private String neat; public void setFTSS(String FTSS) {
this.FTSS = FTSS;
}
public String getFTSS() {
return FTSS;
}
private String naat; public void setNEAT(String NEAT) {
this.NEAT = NEAT;
}
public String getNEAT() {
return NEAT;
}
public String getFlid(){ public void setNAAT(String NAAT) {
return this.flid; this.NAAT = NAAT;
} }
public void setFlid(String flid){ public String getNAAT() {
this.flid = flid; return NAAT;
} }
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<ROUT> getRout(){
return this.rout;
}
public void setRout(List<ROUT> 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<GTDT> getGtdt(){
return this.gtdt;
}
public void setGtdt(List<GTDT> 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<CKDT> getCkdt(){
return this.ckdt;
}
public void setCkdt(List<CKDT> 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<ERUT> getErut(){
return this.erut;
}
public void setErut(List<ERUT> 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;
}
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/GTDT.java
+52 -48
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 PGCT;
private String GCTM;
private String GTYP;
public void setGTNO(String GTNO) {
this.GTNO = GTNO;
}
public String getGTNO() {
return GTNO;
}
private String pgot; public void setGATE(String GATE) {
this.GATE = GATE;
}
public String getGATE() {
return GATE;
}
private String pgct; public void setPGOT(String PGOT) {
this.PGOT = PGOT;
}
public String getPGOT() {
return PGOT;
}
private String gctm; public void setPGCT(String PGCT) {
this.PGCT = PGCT;
}
public String getPGCT() {
return PGCT;
}
private String gtyp; public void setGCTM(String GCTM) {
this.GCTM = GCTM;
}
public String getGCTM() {
return GCTM;
}
public String getGtno(){ public void setGTYP(String GTYP) {
return this.gtno; this.GTYP = GTYP;
} }
public void setGtno(String gtno){ public String getGTYP() {
this.gtno = gtno; return GTYP;
} }
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;
}
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/PSDT.java
+38 -32
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 STET;
public void setPSNO(String PSNO) {
this.PSNO = PSNO;
}
public String getPSNO() {
return PSNO;
}
private String stst; public void setPSST(String PSST) {
this.PSST = PSST;
}
public String getPSST() {
return PSST;
}
private String stet; public void setSTST(String STST) {
this.STST = STST;
}
public String getSTST() {
return STST;
}
public String getPsno(){ public void setSTET(String STET) {
return this.psno; this.STET = STET;
} }
public void setPsno(String psno){ public String getSTET() {
this.psno = psno; return STET;
} }
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;
}
} }
src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/schd/dnld/ROUT.java
+38 -32
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 SCDT;
public void setRTNO(String RTNO) {
this.RTNO = RTNO;
}
public String getRTNO() {
return RTNO;
}
private String scat; public void setAPCD(String APCD) {
this.APCD = APCD;
}
public String getAPCD() {
return APCD;
}
private String scdt; public void setSCAT(String SCAT) {
this.SCAT = SCAT;
}
public String getSCAT() {
return SCAT;
}
public String getRtno(){ public void setSCDT(String SCDT) {
return this.rtno; this.SCDT = SCDT;
} }
public void setRtno(String rtno){ public String getSCDT() {
this.rtno = rtno; return SCDT;
} }
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;
}
} }
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);
} }
} }