From 310e3cdfd0d23f4c252225d83281151fac6eeb88 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Tue, 11 Dec 2018 14:13:39 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=A0=E5=85=A5=20=E6=AF=8F=E6=9D=A1?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=9A=E5=8A=A1=E4=B8=8A=E5=8F=AA=E4=BC=9A?=
 =?UTF-8?q?=E5=8C=85=E5=90=AB=E4=B8=80=E6=9D=A1=E5=8A=A8=E6=80=81=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=AE=B0=E5=BD=95=E3=80=82=E7=9A=84=E7=A8=B3=E5=AE=9A?=
 =?UTF-8?q?=E6=80=A7=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msgexchangeapi/msghandler/flop/FDELHandler.java   | 11 +++++++++--
 .../msghandler/flop/base/FlopBaseHandler.java         | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDELHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDELHandler.java
index 5097266c..68272e84 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDELHandler.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/FDELHandler.java
@@ -20,8 +20,15 @@ public class FDELHandler extends FlopBaseHandler {
 	
 	@Override
 	public HandlerResult run(Cminmsg cminmsg) {
-		MSG cldtMsg = exchangeService.xmlstrToObject(cminmsg.getCminmsgsClobMsg(), MSG.class);
-		FLOP flop = cldtMsg.getFLOP().get(0);
+		MSG msg = exchangeService.xmlstrToObject(cminmsg.getCminmsgsClobMsg(), MSG.class);
+		//每条消息业务上只会包含一条动态消息记录。
+		if(msg.getFLOP().size() != 1)
+		{
+			logger.error("预期每条消息只会包含一条动态消息记录,当前{}条",msg.getFLOP().size());
+			return HandlerResult.failure();
+		}
+		
+		FLOP flop = msg.getFLOP().get(0);
 		
 		
 		SCHD.FLTR  fltr =  flightInfoService.getByFlid(flop.getFLID().toString());
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/base/FlopBaseHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/base/FlopBaseHandler.java
index 815b722a..2c627b79 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/base/FlopBaseHandler.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/base/FlopBaseHandler.java
@@ -45,8 +45,15 @@ public class FlopBaseHandler implements IBaseHandler {
 	
 	@Override
 	public HandlerResult run(Cminmsg cminmsg) {
-		MSG cldtMsg = exchangeService.xmlstrToObject(cminmsg.getCminmsgsClobMsg(), MSG.class);
-		FLOP flop = cldtMsg.getFLOP().get(0);
+		MSG msg = exchangeService.xmlstrToObject(cminmsg.getCminmsgsClobMsg(), MSG.class);
+		//每条消息业务上只会包含一条动态消息记录。
+		if(msg.getFLOP().size() != 1)
+		{
+			logger.error("预期每条消息只会包含一条动态消息记录,当前{}条",msg.getFLOP().size());
+			return HandlerResult.failure();
+		}
+		
+		FLOP flop = msg.getFLOP().get(0);
 		
 		
 		SCHD.FLTR  fltr =  flightInfoService.getByFlid(flop.getFLID().toString());