重构消息处理框架ExchangeTask 只做新消息获取和分发

src/main/java/com/gzzn/omms/msgexchangeapi/service/CminmsgServiceImpl.java

@@ -6,6 +6,8 @@ import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -13,8 +15,10 @@ import com.gzzn.omms.msgexchangeapi.dao.CminmsgDao;
 import com.gzzn.omms.msgexchangeapi.entity.Cminmsg;
 import com.gzzn.omms.msgexchangeapi.entity.msg.Msg;
 
-@Service
+@Service("cminmsgService")
 public class CminmsgServiceImpl implements ICminmsgService {
+  private static Logger logger = LoggerFactory.getLogger(CminmsgServiceImpl.class);
+	
    @Autowired
    private CminmsgDao cminmsgDao;
    
@@ -46,7 +50,7 @@ public class CminmsgServiceImpl implements ICminmsgService {
 
 	@Override
 	public List<Cminmsg> getNewMsgsAfterId(Long id) {
-		   List<Cminmsg> lsCminmsgs = cminmsgDao.findByCminmsgsIdGreaterThanOrderByCminmsgsDateReceived(id);
+		   List<Cminmsg> lsCminmsgs = cminmsgDao.findByCminmsgsIdGreaterThanAndCminmsgsDateProcessedIsNull(id);
 		   if(null == lsCminmsgs)
 		   {
 			   return Collections.emptyList();
@@ -57,18 +61,37 @@ public class CminmsgServiceImpl implements ICminmsgService {
 
 
 	@Override
-	public Optional<Cminmsg> getRespSchdCminmsg(Date date) {
-		List<Cminmsg> lsCminmsgs = getNewMsgsAfterDate(date);
-	    Optional<Cminmsg>  opCminmsg = lsCminmsgs
-	    		                       .stream()
-	    		                       .filter(x->{
-	    		                    	   String msgBlob = x.getCminmsgsClobMsg();
-	    		                    	   Msg msg = exchangeService.xmlstrToObject(msgBlob, Msg.class);
-	    		                    	   String type = msg.getMeta().getType();
-	    		                    	   String subType = msg.getMeta().getStyp();
-	    		                    	   return type.equals("SCHD") && subType.equals("RESP");
-	    		                       })
-	    		                       .findFirst();
+	public Optional<Cminmsg> getRespSchdCminmsg(Date date,Integer tryTimes,Long intervalMs) {
+		Optional<Cminmsg>  opCminmsg = Optional.empty();
+		Integer currentTimes=0;//当前尝试次数
+		
+		while (currentTimes < tryTimes) {
+			currentTimes++;
+			
+			List<Cminmsg> lsCminmsgs = getNewMsgsAfterDate(date);
+		    opCminmsg = lsCminmsgs
+		                       .stream()
+		                       .filter(x->{
+		                    	   String msgBlob = x.getCminmsgsClobMsg();
+		                    	   Msg msg = exchangeService.xmlstrToObject(msgBlob, Msg.class);
+		                    	   String type = msg.getMeta().getType();
+		                    	   String subType = msg.getMeta().getStyp();
+		                    	   return type.equals("SCHD") && subType.equals("RESP");
+		                       })
+		                       .findFirst();
+		    //
+		    if(opCminmsg.isPresent())
+		    {
+		    	break;
+		    }
+		    
+			//等待xx秒继续循环过程
+	    	try {
+				Thread.sleep(intervalMs);
+			} catch (InterruptedException e) {
+				logger.warn("Thread.sleep:暂停线程异常");
+			}
+		}//end while
 	    return opCminmsg;
 	}//end function
 
@@ -82,7 +105,7 @@ public class CminmsgServiceImpl implements ICminmsgService {
 		
 		List<Cminmsg>  lsCmins = (List<Cminmsg>) cminmsgDao.findAll(ids);
 		List<Cminmsg>  lsCminsProcessed = lsCmins.stream().map(node->{
-			node.setCminmsgsDateReceived(new Date());
+			node.setCminmsgsDateProcessed(new Date());
 			return node;
 		}).collect(Collectors.toList());
 		

src/main/java/com/gzzn/omms/msgexchangeapi/service/ICminmsgService.java

@@ -24,10 +24,12 @@ public interface ICminmsgService {
    
   /**
    * 获取回复的航班计划信息
-   * @param date
+   * @param date 大于当前日期
+   * @param 失败后尝试次数
+   * @param 每次尝试间隔毫秒数
    * @return
    */
-   public Optional<Cminmsg>  getRespSchdCminmsg(Date date);
+   public Optional<Cminmsg>  getRespSchdCminmsg(Date date,Integer tryTimes,Long intervalMs);
    
    
    /**

src/main/java/com/gzzn/omms/msgexchangeapi/service/KafkaServiceImpl.java

@@ -4,7 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.kafka.core.KafkaTemplate;
 import org.springframework.stereotype.Service;
 
-@Service
+@Service("kafkaservice")
 public class KafkaServiceImpl implements IKafkaService{
 	 
     @Autowired

src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java

@@ -10,7 +10,6 @@ import org.springframework.stereotype.Service;
 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.FLTR;
-import com.gzzn.omms.msgexchangeapi.msghandler.HandlerResult;
 import com.gzzn.omms.msgexchangeapi.msghandler.MsgHandlerDispatcher;
 import com.gzzn.omms.msgexchangeapi.redis.RedisService;
 import com.gzzn.omms.msgexchangeapi.service.IExchangeService;
@@ -51,29 +50,6 @@ public class FlightInfoServiceImpl implements IFlightInfoService {
         
         return true;
 	} //end function
-
-	
-	@Override
-	public  List<UpdateByCminmsgsResult>  updateByCminmsgs(List<Cminmsg> lsCminmsgs) {
-		List<UpdateByCminmsgsResult> resultUpdated = new ArrayList();//更新结果
-		
-		for (Cminmsg cminmsg : lsCminmsgs) {
-			//更新动态航班消息
-			String  strClobMsg = cminmsg.getCminmsgsClobMsg();
-			HandlerResult handlerResult = msgHandlerDispatcher.dispatch(strClobMsg);
-			UpdateByCminmsgsResult	updateResult = null;
-			if(handlerResult.getIsSuccess()) 
-			{
-				updateResult = UpdateByCminmsgsResult.success(cminmsg, handlerResult.getFltrs());
-			}
-			else {
-				updateResult = UpdateByCminmsgsResult.failure(cminmsg);
-			}
-			resultUpdated.add(updateResult);
-		}//end for
-		
-		return resultUpdated;
-	}//end function
 	
 	
 	@Override

src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/IFlightInfoService.java

@@ -19,13 +19,6 @@ public interface IFlightInfoService {
  */
   public Boolean updateByDaySchd(Cminmsg  cminmsg);
   
- /**
-  *  根据消息更新航班信息
-  * @param lsCminmsgs
-  * @return 返回被更新了的动态航班信息
-  */
-  public List<UpdateByCminmsgsResult> updateByCminmsgs(List<Cminmsg> lsCminmsgs);
-  
   /**
    * 通过航班id获取航班动态
    * @param flid