From c715a135debb2c9dc4acc5d1cca79efab10be515 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Fri, 25 Jan 2019 10:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=8D=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E5=85=B1=E4=BA=AB=E8=88=AA=E7=8F=AD=E4=BF=A1=E6=81=AF=E5=8F=8A?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msghandler/flop/base/FlopBaseHandler.java        | 12 ++++++++----
 .../msgexchangeapi/msghandler/schd/ADFTHandler.java  |  8 ++++++--
 .../service/FltrSendBufferService.java               |  5 -----
 3 files changed, 14 insertions(+), 11 deletions(-)

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 223d330a..3b23696c 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
@@ -61,11 +61,15 @@ public class FlopBaseHandler implements IBaseHandler {
 			//
 			flightInfoService.saveFltr(fltrResult);
 			
-			//send and update
-			this.addToBuffer(fltrResult);
-			this.sendMsg(cminmsg);      
-			this.updateCminmsgToProcessed(cminmsg);
+			//send and update,,不发送共享航班信息及消息
+			if(fltr.getMAID() == null)
+			{
+				this.addToBuffer(fltrResult);
+				this.sendMsg(cminmsg); 
+			}
+			     
 			
+			this.updateCminmsgToProcessed(cminmsg);
 			return HandlerResult.success(fltrResult);
 		}
 		else {
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/ADFTHandler.java b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/ADFTHandler.java
index ea0a6c6e..60b96a51 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/ADFTHandler.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/schd/ADFTHandler.java
@@ -33,9 +33,13 @@ public class ADFTHandler   extends SchdBaseHandler{
 		FLTR fltr = msg.getSCHD().getFLTR().get(0);  
 		flightInfoService.saveFltr(fltr);
 		
+		//不发送共享航班信息及消息
+		if(fltr.getMAID() == null)
+		{
+			this.addToBuffer(fltr);
+			this.sendMsg(cminmsg); 
+		}
 		
-		this.addToBuffer(fltr);
-		this.sendMsg(cminmsg);
 		this.updateCminmsgToProcessed(cminmsg);
 		
 		
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/FltrSendBufferService.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/FltrSendBufferService.java
index ce7e1612..f4678cca 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/FltrSendBufferService.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/FltrSendBufferService.java
@@ -21,11 +21,6 @@ public class FltrSendBufferService implements IFltrSendBufferService {
 	
 	@Override
 	public void addFltr(SCHD.FLTR  fltr) {
-		//共享航班不进入发送缓存,不发送到前端
-		if (fltr.getMAID() != null) {
-			return ;
-		}
-		
 		synchronized (fltrBuffer) {
 		  fltrBuffer.add(fltr);
 		}