From d425350e399dbb323bfdcca5436f6578b7f3ea75 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Tue, 8 Jan 2019 17:13:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E4=B8=8D=E5=BF=85=E8=A6=81?=
 =?UTF-8?q?=E7=9A=84redis=E7=8A=B6=E6=80=81=E5=8F=8A=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E5=81=8F=E7=A7=BB=E8=8E=B7=E5=8F=96=E3=80=82=E9=BB=98=E8=AE=A4?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89=E6=9C=AA=E5=A4=84=E7=90=86?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E3=80=82=20=E4=BB=8Eid=E4=B8=BA0=E5=BC=80?=
 =?UTF-8?q?=E5=A7=8B=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../redis/RedisKeyConstant.java               |  1 -
 .../omms/msgexchangeapi/runner/AppRunner.java |  5 -----
 .../runner/MsgExchangeRunner.java             | 19 +------------------
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/redis/RedisKeyConstant.java b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/RedisKeyConstant.java
index 56ae3f21..fa95e168 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/redis/RedisKeyConstant.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/redis/RedisKeyConstant.java
@@ -8,5 +8,4 @@ package com.gzzn.omms.msgexchangeapi.redis;
 public class RedisKeyConstant {
   public static String  KEY_ISWAITSCHD="isWaitSchd";
   public static String  KEY_WAITSCHDDATE="waitSchdDate";
-  public static String KEY_LASTBEGINID="lastBeginId";
 }
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java
index 05a3d8ec..a2960e80 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java
@@ -11,7 +11,6 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.CommandLineRunner;
 import org.springframework.stereotype.Component;
 
-import com.gzzn.omms.msgexchangeapi.redis.RedisKeyConstant;
 import com.gzzn.omms.msgexchangeapi.redis.RedisService;
 
 @Component
@@ -33,10 +32,6 @@ public class AppRunner implements CommandLineRunner  {
 	public void run(String... args) throws Exception {
 		
 		logger.info("app runner start");
-	
-		//
-    	redisService.set(RedisKeyConstant.KEY_LASTBEGINID,0L);
-    	
     	
 		//启动消息采集线程
     	ScheduledExecutorService  scheduledExecutorService = Executors.newScheduledThreadPool(1);
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/MsgExchangeRunner.java b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/MsgExchangeRunner.java
index e2b81b2e..247b6709 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/MsgExchangeRunner.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/MsgExchangeRunner.java
@@ -4,12 +4,9 @@ import java.util.List;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.util.CollectionUtils;
 
 import com.gzzn.omms.msgexchangeapi.entity.Cminmsg;
 import com.gzzn.omms.msgexchangeapi.msghandler.MsgHandlerDispatcher;
-import com.gzzn.omms.msgexchangeapi.redis.RedisKeyConstant;
-import com.gzzn.omms.msgexchangeapi.redis.RedisService;
 import com.gzzn.omms.msgexchangeapi.service.ICminmsgService;
 import com.gzzn.omms.msgexchangeapi.utils.SpringUtil;
 
@@ -22,11 +19,9 @@ public class MsgExchangeRunner  implements Runnable{
     private static Logger logger = LoggerFactory.getLogger(MsgExchangeRunner.class);
     
     private MsgHandlerDispatcher msgHandlerDispatcher;
-	private RedisService redisService;
 	private ICminmsgService cminmsgService;
 	
 	public MsgExchangeRunner() {
-		 redisService = (RedisService) SpringUtil.getBean("redisService");
 		 cminmsgService = (ICminmsgService) SpringUtil.getBean("cminmsgService");
 		 msgHandlerDispatcher = (MsgHandlerDispatcher)  SpringUtil.getBean("msgHandlerDispatcher");
 	}
@@ -36,15 +31,8 @@ public class MsgExchangeRunner  implements Runnable{
 	public void run() {
 		logger.info("进入获取动态航班消息...");
 		
-		//获取上次的beginId
-		Integer beginIdInt =  (Integer)redisService.get(RedisKeyConstant.KEY_LASTBEGINID);
-		Long beginId =  beginIdInt.longValue();
-		
-		logger.info("从上次获取的消息位置{}开始",beginId);
-
-		
 		//获取航班动态消息
-		List<Cminmsg> lsCminmsgs = cminmsgService.getNewMsgsAfterId(beginId);
+		List<Cminmsg> lsCminmsgs = cminmsgService.getNewMsgsAfterId(0L);
 		if(null == lsCminmsgs || lsCminmsgs.size() <= 0)
 		{
 			logger.info("本周期没有获取到最新消息，直接退出本次循环");
@@ -59,11 +47,6 @@ public class MsgExchangeRunner  implements Runnable{
 			msgHandlerDispatcher.dispatch(cminmsg);
 		}//end for
 		
-		if(!CollectionUtils.isEmpty(lsCminmsgs))
-		{
-			beginId =  lsCminmsgs.get(lsCminmsgs.size()-1).getCminmsgsId();//偏移到最新位置，等待最新的消息
-			redisService.set(RedisKeyConstant.KEY_LASTBEGINID,beginId);
-		}
 		logger.info("本次定时获取新消息完成...");
 	}//end run
 }