From 653c1c554ab45a861bc28ba34964dbf9e1343a24 Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Wed, 19 Dec 2018 13:47:05 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=88=AA=E7=8F=AD=E6=97=A5?=
 =?UTF-8?q?=E8=AE=A1=E5=88=92=E8=8E=B7=E5=8F=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../omms/msgexchangeapi/runner/AppRunner.java |  2 +-
 .../service/CmoutmsgServiceImpl.java          | 27 +++++++++++++------
 .../service/ICmoutmsgService.java             |  6 +++--
 3 files changed, 24 insertions(+), 11 deletions(-)

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 33d5ea26..464ac356 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/runner/AppRunner.java
@@ -32,7 +32,7 @@ public class AppRunner implements CommandLineRunner  {
 		
 		
 		Date nowDate = new Date();
-		cmoutmsgService.sendSchdGetMsg(nowDate);
+		cmoutmsgService.sendSchdGetMsg(null,null);//发送获取当天日计划的申请
 		
 		//
 		redisService.set(RedisKeyConstant.KEY_ISWAITSCHD, true);  //等待返回日计划状态
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/CmoutmsgServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/CmoutmsgServiceImpl.java
index 56f1115d..4ed3a548 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/CmoutmsgServiceImpl.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/CmoutmsgServiceImpl.java
@@ -26,7 +26,7 @@ public class CmoutmsgServiceImpl implements ICmoutmsgService {
 	@Autowired
 	private CmoutmsgDao cmoutmsgDao;
 	
-	public Boolean sendSchdGetMsg(Date date)
+	public Boolean sendSchdGetMsg(Date startDate,Date endDate)
 	{
 		//构造消息
 		MSG rqfdMsg = new MSGBuilder().
@@ -40,13 +40,15 @@ public class CmoutmsgServiceImpl implements ICmoutmsgService {
 				      .build();
 		
 		RQFD rqfd = new RQFD();
-		rqfd.setSTDB(
-			      DateTimeUtil.gtFormatStr(
-			    		  date, 
-			      "ddMMMyyHHmm",
-			      Locale.ENGLISH)
-			      .toUpperCase()
-			      );
+		if(null != startDate)
+		{
+			rqfd.setSTDB(getDateStr(startDate));
+		}
+		if(null != endDate)
+		{
+		   rqfd.setSTDE(getDateStr(endDate));
+		}
+		
 		rqfdMsg.setRQFD(rqfd);
 		
 		//发送消息到数据库
@@ -59,4 +61,13 @@ public class CmoutmsgServiceImpl implements ICmoutmsgService {
 		return rtCmoutmsg != null;
 	}
 	
+	
+	private String getDateStr(Date date)
+	{
+	   return	DateTimeUtil.gtFormatStr(
+	    		  date, 
+	      "ddMMMyyHHmm",
+	      Locale.ENGLISH)
+	      .toUpperCase();
+	}//end function
 }
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICmoutmsgService.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICmoutmsgService.java
index 4c41a70f..3464a2b9 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICmoutmsgService.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/ICmoutmsgService.java
@@ -11,8 +11,10 @@ public interface ICmoutmsgService {
 	
 	/**
 	 * 向Cmoutmsgs发送日航班计划获取消息
-	 * @param date 发送获取指定时间后的日航班计划
+	 * 参数均为null 时，代表当天
+	 * @param startDate 开始日期时间 ,航班计划到达，航班计划离港
+	 * @param endDate 结束日期时间，航班计划到达，航班计划离港
 	 * @return 成功或失败
 	 */
-	public Boolean sendSchdGetMsg(Date date);
+	public Boolean sendSchdGetMsg(Date startDate,Date endDate);
 }