完善航班靠桥，撤桥，撤销的消息处理

src/main/java/com/gzzn/omms/msgexchangeapi/msghandler/flop/ABTMHandler.java

@@ -3,6 +3,7 @@ package com.gzzn.omms.msgexchangeapi.msghandler.flop;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.BeanUtils;
+import org.springframework.util.StringUtils;
 
 import com.gzzn.omms.msgexchangeapi.entity.msg.BRIDGEDATA;
 import com.gzzn.omms.msgexchangeapi.entity.msg.FLOP;
@@ -31,16 +32,28 @@ public class ABTMHandler extends FlopBaseHandler{
 		//
 		OPTBRIDGEDATA optbridgedata = flop.getABTM().get(0);
         
-		//更新对应的撤桥或者登桥数据,没有则新增
+		//更新对应的撤桥或者靠桥数据,没有则新增
 		Boolean updated = false;
-		for( BRIDGEDATA  bridgedata: fltr.getABTM())
+		for(int i = 0; i < fltr.getABTM().size(); i++)
 		{
+			BRIDGEDATA  bridgedata = fltr.getABTM().get(i);
+			
 			if(bridgedata.getABOP().equals(optbridgedata.getABOP()))
 			{
-				BeanUtils.copyProperties(optbridgedata, bridgedata);
+				if(StringUtils.isEmpty(optbridgedata.getAOTM()))
+				{
+					//撤销靠桥或撤桥
+					fltr.getABTM().remove(i);
+				}
+				else {
+					BeanUtils.copyProperties(optbridgedata, bridgedata);
+				}
 				updated = true;
+				break;
 			}
-		}
+		}//end for
+		
+		//
 		if(updated == false)
 		{
 			BRIDGEDATA data = new BRIDGEDATA();

src/test/java/com/gzzn/omms/msgexchangeapi/msghandler/ABTMHandlerTest.java

@@ -0,0 +1,38 @@
+package com.gzzn.omms.msgexchangeapi.msghandler;
+
+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.flop.ABTMHandler;
+import com.gzzn.omms.msgexchangeapi.service.exchange.IExchangeService;
+import com.gzzn.omms.msgexchangeapi.utils.JsonUtil;
+
+@RunWith(SpringRunner.class)
+@SpringBootTest
+public class ABTMHandlerTest {
+	
+	@Autowired
+	private CminmsgDao cminmsgDao;
+	
+	@Autowired
+	private IExchangeService exchangeService;
+	
+	@Test
+	public void testRun()
+	{
+		Cminmsg cminmsg = cminmsgDao.findOne(99397L);
+		CminmsgWapper cminmsgWapper = new CminmsgWapper(cminmsg);
+		cminmsgWapper.setMsg(exchangeService.xmlToMsg(cminmsg.getCminmsgsClobMsg()));
+		
+		ABTMHandler abtmHandler = new ABTMHandler();
+		HandlerResult result = abtmHandler.run(cminmsgWapper);
+		
+		System.out.println(JsonUtil.getString(result));
+	}
+}