From c694c62a00552b3a3a8de5fce71a556140c4bfac Mon Sep 17 00:00:00 2001 From: zhouxiunai <154707516@qq.com> Date: Wed, 9 Jan 2019 19:55:18 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9psdt=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E5=8E=9F=E5=80=BC=E6=9C=BA=E4=BD=8D=E4=BF=A1=E6=81=AF=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E3=80=82=20=E4=BF=AE=E6=94=B9dnld=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E5=88=B0msg?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../omms/msgexchangeapi/entity/msg/SCHD.java | 12 ++++++ .../msghandler/flop/PSDTHandler.java | 13 +++++++ .../msghandler/schd/base/SchdBaseHandler.java | 10 ++++- .../{ => flop}/ABTMHandlerTest.java | 3 +- .../{ => flop}/CHOTHandlerTest.java | 3 +- .../{ => flop}/LACLHandlerTest.java | 3 +- .../msghandler/flop/PSDTHandlerTest.java | 39 +++++++++++++++++++ .../msghandler/schd/DNLDHandlerTest.java | 39 +++++++++++++++++++ 8 files changed, 117 insertions(+), 5 deletions(-) rename src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/{ => flop}/ABTMHandlerTest.java (88%) rename src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/{ => flop}/CHOTHandlerTest.java (88%) rename src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/{ => flop}/LACLHandlerTest.java (88%) create mode 100644 src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandlerTest.java create mode 100644 src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/DNLDHandlerTest.java diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/SCHD.java b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/SCHD.java index 3585e412..8b862315 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/SCHD.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/entity/msg/SCHD.java @@ -421,6 +421,10 @@ public class SCHD @JsonProperty("PSDT") protected List psdt;//航班计划机位数据 plan stand data + @XmlElement(name = "LPSDT") + @JsonProperty("LPSDT") + protected String lpsdt;//上次航班机位数据,机位逗号分隔 + @XmlElement(name = "CKDT") @JsonProperty("CKDT") protected List ckdt;// check in counter data 值机位数据 @@ -2034,6 +2038,14 @@ public class SCHD this.naat = value; } + public String getLpsdt() { + return lpsdt; + } + + public void setLpsdt(String lpsdt) { + this.lpsdt = lpsdt; + } + } } diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java index 131a8677..ee203d3d 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandler.java @@ -22,6 +22,19 @@ public class PSDTHandler extends FlopBaseHandler { @Override protected SCHD.FLTR updateFltr(FLOP flop,SCHD.FLTR fltr) { + //先保存当前航班机位数据 + String lpsdt=""; + for(STANDDATA node : fltr.getPSDT()) + { + lpsdt += node.getPSST(); + lpsdt += ","; + } + if(lpsdt.endsWith(",")) + { + lpsdt = lpsdt.substring(0, lpsdt.length() - 1); + } + fltr.setLpsdt(lpsdt); + fltr.getPSDT().clear(); //清空旧数据 for(OPTSTANDDATA optStandata : flop.getPSDT() ) { diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/base/SchdBaseHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/base/SchdBaseHandler.java index a5623ba3..91a16dcd 100644 --- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/base/SchdBaseHandler.java +++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/base/SchdBaseHandler.java @@ -57,8 +57,14 @@ public class SchdBaseHandler implements IBaseHandler{ int recs = dnldMsg.getSCHD().getRECS(); logger.info("发送日计划到kafka,条数:{}",recs); - ResponseDto resDto = ResponseDto.success(recs); - kafkaservice.msgSend("dschd", JsonUtil.getString(resDto)); + + //去除body部分 + MSG dnldMsgCopy = new MSG(); + dnldMsgCopy.setMETA(dnldMsg.getMETA()); + dnldMsgCopy.setSCHD(null); + + String msg = exchangeService.msgToJson(dnldMsgCopy); + kafkaservice.msgSend("msg", msg); logger.info("发送日计划到kafka完毕"); } diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/ABTMHandlerTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ABTMHandlerTest.java similarity index 88% rename from src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/ABTMHandlerTest.java rename to src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ABTMHandlerTest.java index e3ab0584..c54cbb11 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/ABTMHandlerTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ABTMHandlerTest.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.msghandler; +package com.gzzn.omms.msgexchangeapi.msghandler.flop; import org.junit.Test; import org.junit.runner.RunWith; @@ -9,6 +9,7 @@ import org.springframework.test.context.junit4.SpringRunner; import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; import com.gzzn.omms.msgexchangeapi.entity.CminmsgWapper; +import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; import com.gzzn.omms.msgexchangeapi.msghandler.flop.ABTMHandler; import com.gzzn.omms.msgexchangeapi.service.exchange.IExchangeService; import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/CHOTHandlerTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/CHOTHandlerTest.java similarity index 88% rename from src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/CHOTHandlerTest.java rename to src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/CHOTHandlerTest.java index f9850b15..c892dc1c 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/CHOTHandlerTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/CHOTHandlerTest.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.msghandler; +package com.gzzn.omms.msgexchangeapi.msghandler.flop; import org.junit.Test; import org.junit.runner.RunWith; @@ -9,6 +9,7 @@ import org.springframework.test.context.junit4.SpringRunner; import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; import com.gzzn.omms.msgexchangeapi.entity.CminmsgWapper; +import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; import com.gzzn.omms.msgexchangeapi.msghandler.flop.CHOTHandler; import com.gzzn.omms.msgexchangeapi.service.exchange.IExchangeService; import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/LACLHandlerTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/LACLHandlerTest.java similarity index 88% rename from src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/LACLHandlerTest.java rename to src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/LACLHandlerTest.java index 4786b564..cedc3765 100644 --- a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/LACLHandlerTest.java +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/LACLHandlerTest.java @@ -1,4 +1,4 @@ -package com.gzzn.omms.msgexchangeapi.msghandler; +package com.gzzn.omms.msgexchangeapi.msghandler.flop; import org.junit.Test; import org.junit.runner.RunWith; @@ -9,6 +9,7 @@ import org.springframework.test.context.junit4.SpringRunner; import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; import com.gzzn.omms.msgexchangeapi.entity.CminmsgWapper; +import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; import com.gzzn.omms.msgexchangeapi.msghandler.flop.LACLHandler; import com.gzzn.omms.msgexchangeapi.service.exchange.IExchangeService; import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandlerTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandlerTest.java new file mode 100644 index 00000000..924c5706 --- /dev/null +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/PSDTHandlerTest.java @@ -0,0 +1,39 @@ +package com.gzzn.omms.msgexchangeapi.msghandler.flop; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.entity.CminmsgWapper; +import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; +import com.gzzn.omms.msgexchangeapi.msghandler.flop.PSDTHandler; +import com.gzzn.omms.msgexchangeapi.service.exchange.IExchangeService; +import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class PSDTHandlerTest { + + @Autowired + private CminmsgDao cminmsgDao; + + @Autowired + private IExchangeService exchangeService; + + @Test + public void testRun() + { + Cminmsg cminmsg = cminmsgDao.findOne(33L); + CminmsgWapper cminmsgWapper = new CminmsgWapper(cminmsg); + cminmsgWapper.setMsg(exchangeService.xmlToMsg(cminmsg.getCminmsgsClobMsg())); + + PSDTHandler psdthandler = new PSDTHandler(); + HandlerResult result = psdthandler.run(cminmsgWapper); + + System.out.println(JsonUtil.getString(result)); + } +} diff --git a/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/DNLDHandlerTest.java b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/DNLDHandlerTest.java new file mode 100644 index 00000000..0058b24a --- /dev/null +++ b/src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/DNLDHandlerTest.java @@ -0,0 +1,39 @@ +package com.gzzn.omms.msgexchangeapi.msghandler.schd; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.junit4.SpringRunner; + +import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao; +import com.gzzn.omms.msgexchangeapi.entity.Cminmsg; +import com.gzzn.omms.msgexchangeapi.entity.CminmsgWapper; +import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult; +import com.gzzn.omms.msgexchangeapi.msghandler.flop.LACLHandler; +import com.gzzn.omms.msgexchangeapi.service.exchange.IExchangeService; +import com.gzzn.omms.msgexchangeapi.utils.JsonUtil; + +@RunWith(SpringRunner.class) +@SpringBootTest +public class DNLDHandlerTest { + + @Autowired + private CminmsgDao cminmsgDao; + + @Autowired + private IExchangeService exchangeService; + + @Test + public void testRun() + { + Cminmsg cminmsg = cminmsgDao.findOne(82463L); + CminmsgWapper cminmsgWapper = new CminmsgWapper(cminmsg); + cminmsgWapper.setMsg(exchangeService.xmlToMsg(cminmsg.getCminmsgsClobMsg())); + + DNLDHandler dnldhandler = new DNLDHandler(); + HandlerResult result = dnldhandler.run(cminmsgWapper); + + System.out.println(JsonUtil.getString(result)); + } +}