重新生成dnld 消息

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
@@ -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");
}
}
@@ -1,58 +1,62 @@
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; /**
* Copyright 2018 bejson.com
public class CHDT */
{ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
private String chno;
/**
private String chut; * Auto-generated: 2018-12-05 11:38:31
*
private String ccls; * @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
private String pcbt; */
public class CHDT {
private String pcet;
private String CHNO;
private String ctyp; private String CHUT;
private String CCLS;
public String getChno(){ private String PCBT;
return this.chno; private String PCET;
} private String CTYP;
public void setChno(String chno){ public void setCHNO(String CHNO) {
this.chno = chno; this.CHNO = CHNO;
} }
public String getCHNO() {
public String getChut(){ return CHNO;
return this.chut; }
}
public void setChut(String chut){ public void setCHUT(String CHUT) {
this.chut = chut; this.CHUT = CHUT;
} }
public String getCHUT() {
public String getCcls(){ return CHUT;
return this.ccls; }
}
public void setCcls(String ccls){ public void setCCLS(String CCLS) {
this.ccls = ccls; this.CCLS = CCLS;
} }
public String getCCLS() {
public String getPcbt(){ return CCLS;
return this.pcbt; }
}
public void setPcbt(String pcbt){ public void setPCBT(String PCBT) {
this.pcbt = pcbt; this.PCBT = PCBT;
} }
public String getPCBT() {
public String getPcet(){ return PCBT;
return this.pcet; }
}
public void setPcet(String pcet){ public void setPCET(String PCET) {
this.pcet = pcet; this.PCET = PCET;
} }
public String getPCET() {
public String getCtyp(){ return PCET;
return this.ctyp; }
}
public void setCtyp(String ctyp){ public void setCTYP(String CTYP) {
this.ctyp = ctyp; this.CTYP = CTYP;
} }
} public String getCTYP() {
return CTYP;
}
}
@@ -1,68 +1,70 @@
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; /**
* Copyright 2018 bejson.com
public class CKDT */
{ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
private String ckno;
/**
private String chkc; * Auto-generated: 2018-12-05 11:38:31
*
private String ccls; * @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
private String pcot; */
public class CKDT {
private String pcct;
private String CKNO;
private String cctm; private String CHKC;
private String CCLS;
private String ctyp; private String PCOT;
private String PCCT;
public String getCkno(){ private String CCTM;
return this.ckno; private String CTYP;
} public void setCKNO(String CKNO) {
public void setCkno(String ckno){ this.CKNO = CKNO;
this.ckno = ckno; }
} public String getCKNO() {
return CKNO;
public String getChkc(){ }
return this.chkc;
} public void setCHKC(String CHKC) {
public void setChkc(String chkc){ this.CHKC = CHKC;
this.chkc = chkc; }
} public String getCHKC() {
return CHKC;
public String getCcls(){ }
return this.ccls;
} public void setCCLS(String CCLS) {
public void setCcls(String ccls){ this.CCLS = CCLS;
this.ccls = ccls; }
} public String getCCLS() {
return CCLS;
public String getPcot(){ }
return this.pcot;
} public void setPCOT(String PCOT) {
public void setPcot(String pcot){ this.PCOT = PCOT;
this.pcot = pcot; }
} public String getPCOT() {
return PCOT;
public String getPcct(){ }
return this.pcct;
} public void setPCCT(String PCCT) {
public void setPcct(String pcct){ this.PCCT = PCCT;
this.pcct = pcct; }
} public String getPCCT() {
return PCCT;
public String getCctm(){ }
return this.cctm;
} public void setCCTM(String CCTM) {
public void setCctm(String cctm){ this.CCTM = CCTM;
this.cctm = cctm; }
} public String getCCTM() {
return CCTM;
public String getCtyp(){ }
return this.ctyp;
} public void setCTYP(String CTYP) {
public void setCtyp(String ctyp){ this.CTYP = CTYP;
this.ctyp = ctyp; }
} public String getCTYP() {
} return CTYP;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -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;
}
}
@@ -1,31 +1,38 @@
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; /**
* Copyright 2018 bejson.com
public class ERUT */
{ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
private String rtno;
/**
private String apcd; * Auto-generated: 2018-12-05 11:38:31
*
private String scdt; * @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
public String getRtno(){ */
return this.rtno; public class ERUT {
}
public void setRtno(String rtno){ private String RTNO;
this.rtno = rtno; private String APCD;
} private String SCDT;
public void setRTNO(String RTNO) {
public String getApcd(){ this.RTNO = RTNO;
return this.apcd; }
} public String getRTNO() {
public void setApcd(String apcd){ return RTNO;
this.apcd = apcd; }
}
public void setAPCD(String APCD) {
public String getScdt(){ this.APCD = APCD;
return this.scdt; }
} public String getAPCD() {
public void setScdt(String scdt){ return APCD;
this.scdt = scdt; }
}
} public void setSCDT(String SCDT) {
this.SCDT = SCDT;
}
public String getSCDT() {
return SCDT;
}
}
@@ -1,285 +1,263 @@
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; /**
* Copyright 2018 bejson.com
import java.util.List; */
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
public class FLTR import java.util.List;
{
private String flid; /**
* Auto-generated: 2018-12-05 11:38:31
private String alcd; *
* @author bejson.com (i@bejson.com)
private String flno; * @website http://www.bejson.com/java2pojo/
*/
private String mvin; public class FLTR {
private String sodt; private String FLID;
private String ALCD;
private String flty; private String FLNO;
private String MVIN;
private String flin; private String SODT;
private String FLTY;
private List<ROUT> rout; private String FLIN;
private List<ROUT> ROUT;
private String acft; private String ACFT;
private String RENO;
private String reno; private String TAOP;
private String TAFL;
private String taop; private String TAID;
private String TRML;
private String tafl; private String ESTT;
private String ACTT;
private String taid; private CHDT CHDT;
private List<GTDT> GTDT;
private String trml; private String STND;
private PSDT PSDT;
private String estt; private List<CKDT> CKDT;
private String PHAG;
private String actt; private String BOTM;
private String LACL;
private CHDT chdt; private String FHAG;
private String MHAG;
private List<GTDT> gtdt; private List<ERUT> ERUT;
private String EXSC;
private String stnd; private String FTSS;
private String NEAT;
private PSDT psdt; private String NAAT;
public void setFLID(String FLID) {
private List<CKDT> ckdt; this.FLID = FLID;
}
private String phag; public String getFLID() {
return FLID;
private String botm; }
private String lacl; public void setALCD(String ALCD) {
this.ALCD = ALCD;
private String fhag; }
public String getALCD() {
private String mhag; return ALCD;
}
private List<ERUT> erut;
public void setFLNO(String FLNO) {
private String exsc; this.FLNO = FLNO;
}
private String ftss; public String getFLNO() {
return FLNO;
private String neat; }
private String naat; public void setMVIN(String MVIN) {
this.MVIN = MVIN;
public String getFlid(){ }
return this.flid; public String getMVIN() {
} return MVIN;
public void setFlid(String flid){ }
this.flid = flid;
} public void setSODT(String SODT) {
this.SODT = SODT;
public String getAlcd(){ }
return this.alcd; public String getSODT() {
} return SODT;
public void setAlcd(String alcd){ }
this.alcd = alcd;
} public void setFLTY(String FLTY) {
this.FLTY = FLTY;
public String getFlno(){ }
return this.flno; public String getFLTY() {
} return FLTY;
public void setFlno(String flno){ }
this.flno = flno;
} public void setFLIN(String FLIN) {
this.FLIN = FLIN;
public String getMvin(){ }
return this.mvin; public String getFLIN() {
} return FLIN;
public void setMvin(String mvin){ }
this.mvin = mvin;
} public void setROUT(List<ROUT> ROUT) {
this.ROUT = ROUT;
public String getSodt(){ }
return this.sodt; public List<ROUT> getROUT() {
} return ROUT;
public void setSodt(String sodt){ }
this.sodt = sodt;
} public void setACFT(String ACFT) {
this.ACFT = ACFT;
public String getFlty(){ }
return this.flty; public String getACFT() {
} return ACFT;
public void setFlty(String flty){ }
this.flty = flty;
} public void setRENO(String RENO) {
this.RENO = RENO;
public String getFlin(){ }
return this.flin; public String getRENO() {
} return RENO;
public void setFlin(String flin){ }
this.flin = flin;
} public void setTAOP(String TAOP) {
this.TAOP = TAOP;
public List<ROUT> getRout(){ }
return this.rout; public String getTAOP() {
} return TAOP;
public void setRout(List<ROUT> rout){ }
this.rout = rout;
} public void setTAFL(String TAFL) {
this.TAFL = TAFL;
public String getAcft(){ }
return this.acft; public String getTAFL() {
} return TAFL;
public void setAcft(String acft){ }
this.acft = acft;
} public void setTAID(String TAID) {
this.TAID = TAID;
public String getReno(){ }
return this.reno; public String getTAID() {
} return TAID;
public void setReno(String reno){ }
this.reno = reno;
} public void setTRML(String TRML) {
this.TRML = TRML;
public String getTaop(){ }
return this.taop; public String getTRML() {
} return TRML;
public void setTaop(String taop){ }
this.taop = taop;
} public void setESTT(String ESTT) {
this.ESTT = ESTT;
public String getTafl(){ }
return this.tafl; public String getESTT() {
} return ESTT;
public void setTafl(String tafl){ }
this.tafl = tafl;
} public void setACTT(String ACTT) {
this.ACTT = ACTT;
public String getTaid(){ }
return this.taid; public String getACTT() {
} return ACTT;
public void setTaid(String taid){ }
this.taid = taid;
} public void setCHDT(CHDT CHDT) {
this.CHDT = CHDT;
public String getTrml(){ }
return this.trml; public CHDT getCHDT() {
} return CHDT;
public void setTrml(String trml){ }
this.trml = trml;
} public void setGTDT(List<GTDT> GTDT) {
this.GTDT = GTDT;
public String getEstt(){ }
return this.estt; public List<GTDT> getGTDT() {
} return GTDT;
public void setEstt(String estt){ }
this.estt = estt;
} public void setSTND(String STND) {
this.STND = STND;
public String getActt(){ }
return this.actt; public String getSTND() {
} return STND;
public void setActt(String actt){ }
this.actt = actt;
} public void setPSDT(PSDT PSDT) {
this.PSDT = PSDT;
public CHDT getChdt(){ }
return this.chdt; public PSDT getPSDT() {
} return PSDT;
public void setChdt(CHDT chdt){ }
this.chdt = chdt;
} public void setCKDT(List<CKDT> CKDT) {
this.CKDT = CKDT;
public List<GTDT> getGtdt(){ }
return this.gtdt; public List<CKDT> getCKDT() {
} return CKDT;
public void setGtdt(List<GTDT> gtdt){ }
this.gtdt = gtdt;
} public void setPHAG(String PHAG) {
this.PHAG = PHAG;
public String getStnd(){ }
return this.stnd; public String getPHAG() {
} return PHAG;
public void setStnd(String stnd){ }
this.stnd = stnd;
} public void setBOTM(String BOTM) {
this.BOTM = BOTM;
public PSDT getPsdt(){ }
return this.psdt; public String getBOTM() {
} return BOTM;
public void setPsdt(PSDT psdt){ }
this.psdt = psdt;
} public void setLACL(String LACL) {
this.LACL = LACL;
public List<CKDT> getCkdt(){ }
return this.ckdt; public String getLACL() {
} return LACL;
public void setCkdt(List<CKDT> ckdt){ }
this.ckdt = ckdt;
} public void setFHAG(String FHAG) {
this.FHAG = FHAG;
public String getPhag(){ }
return this.phag; public String getFHAG() {
} return FHAG;
public void setPhag(String phag){ }
this.phag = phag;
} public void setMHAG(String MHAG) {
this.MHAG = MHAG;
public String getBotm(){ }
return this.botm; public String getMHAG() {
} return MHAG;
public void setBotm(String botm){ }
this.botm = botm;
} public void setERUT(List<ERUT> ERUT) {
this.ERUT = ERUT;
public String getLacl(){ }
return this.lacl; public List<ERUT> getERUT() {
} return ERUT;
public void setLacl(String lacl){ }
this.lacl = lacl;
} public void setEXSC(String EXSC) {
this.EXSC = EXSC;
public String getFhag(){ }
return this.fhag; public String getEXSC() {
} return EXSC;
public void setFhag(String fhag){ }
this.fhag = fhag;
} public void setFTSS(String FTSS) {
this.FTSS = FTSS;
public String getMhag(){ }
return this.mhag; public String getFTSS() {
} return FTSS;
public void setMhag(String mhag){ }
this.mhag = mhag;
} public void setNEAT(String NEAT) {
this.NEAT = NEAT;
public List<ERUT> getErut(){ }
return this.erut; public String getNEAT() {
} return NEAT;
public void setErut(List<ERUT> erut){ }
this.erut = erut;
} public void setNAAT(String NAAT) {
this.NAAT = NAAT;
public String getExsc(){ }
return this.exsc; public String getNAAT() {
} return NAAT;
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;
}
} }
@@ -1,58 +1,62 @@
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; /**
* Copyright 2018 bejson.com
public class GTDT */
{ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
private String gtno;
/**
private String gate; * Auto-generated: 2018-12-05 11:38:31
*
private String pgot; * @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
private String pgct; */
public class GTDT {
private String gctm;
private String GTNO;
private String gtyp; private String GATE;
private String PGOT;
public String getGtno(){ private String PGCT;
return this.gtno; private String GCTM;
} private String GTYP;
public void setGtno(String gtno){ public void setGTNO(String GTNO) {
this.gtno = gtno; this.GTNO = GTNO;
} }
public String getGTNO() {
public String getGate(){ return GTNO;
return this.gate; }
}
public void setGate(String gate){ public void setGATE(String GATE) {
this.gate = gate; this.GATE = GATE;
} }
public String getGATE() {
public String getPgot(){ return GATE;
return this.pgot; }
}
public void setPgot(String pgot){ public void setPGOT(String PGOT) {
this.pgot = pgot; this.PGOT = PGOT;
} }
public String getPGOT() {
public String getPgct(){ return PGOT;
return this.pgct; }
}
public void setPgct(String pgct){ public void setPGCT(String PGCT) {
this.pgct = pgct; this.PGCT = PGCT;
} }
public String getPGCT() {
public String getGctm(){ return PGCT;
return this.gctm; }
}
public void setGctm(String gctm){ public void setGCTM(String GCTM) {
this.gctm = gctm; this.GCTM = GCTM;
} }
public String getGCTM() {
public String getGtyp(){ return GCTM;
return this.gtyp; }
}
public void setGtyp(String gtyp){ public void setGTYP(String GTYP) {
this.gtyp = gtyp; this.GTYP = GTYP;
} }
} public String getGTYP() {
return GTYP;
}
}
@@ -1,40 +1,46 @@
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; /**
* Copyright 2018 bejson.com
public class PSDT */
{ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
private String psno;
/**
private String psst; * Auto-generated: 2018-12-05 11:38:31
*
private String stst; * @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
private String stet; */
public class PSDT {
public String getPsno(){
return this.psno; private String PSNO;
} private String PSST;
public void setPsno(String psno){ private String STST;
this.psno = psno; private String STET;
} public void setPSNO(String PSNO) {
this.PSNO = PSNO;
public String getPsst(){ }
return this.psst; public String getPSNO() {
} return PSNO;
public void setPsst(String psst){ }
this.psst = psst;
} public void setPSST(String PSST) {
this.PSST = PSST;
public String getStst(){ }
return this.stst; public String getPSST() {
} return PSST;
public void setStst(String stst){ }
this.stst = stst;
} public void setSTST(String STST) {
this.STST = STST;
public String getStet(){ }
return this.stet; public String getSTST() {
} return STST;
public void setStet(String stet){ }
this.stet = stet;
} public void setSTET(String STET) {
} this.STET = STET;
}
public String getSTET() {
return STET;
}
}
@@ -1,40 +1,46 @@
package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld; /**
* Copyright 2018 bejson.com
public class ROUT */
{ package com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld;
private String rtno;
/**
private String apcd; * Auto-generated: 2018-12-05 11:38:31
*
private String scat; * @author bejson.com (i@bejson.com)
* @website http://www.bejson.com/java2pojo/
private String scdt; */
public class ROUT {
public String getRtno(){
return this.rtno; private String RTNO;
} private String APCD;
public void setRtno(String rtno){ private String SCAT;
this.rtno = rtno; private String SCDT;
} public void setRTNO(String RTNO) {
this.RTNO = RTNO;
public String getApcd(){ }
return this.apcd; public String getRTNO() {
} return RTNO;
public void setApcd(String apcd){ }
this.apcd = apcd;
} public void setAPCD(String APCD) {
this.APCD = APCD;
public String getScat(){ }
return this.scat; public String getAPCD() {
} return APCD;
public void setScat(String scat){ }
this.scat = scat;
} public void setSCAT(String SCAT) {
this.SCAT = SCAT;
public String getScdt(){ }
return this.scdt; public String getSCAT() {
} return SCAT;
public void setScdt(String scdt){ }
this.scdt = scdt;
} public void setSCDT(String SCDT) {
this.SCDT = SCDT;
}
public String getSCDT() {
return SCDT;
}
} }
@@ -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;
}
}
@@ -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);
} }
@@ -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
} }
@@ -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);
} }
/** /**
@@ -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
} }
@@ -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);
} }
} }