From 9687e735ee6d16a32d18d33acee6e53ae94a1d5a Mon Sep 17 00:00:00 2001
From: zhouxiunai <154707516@qq.com>
Date: Thu, 6 Dec 2018 09:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=8E=B7=E5=8F=96=E5=AE=8C?=
 =?UTF-8?q?=E6=95=B4=E5=8A=A8=E6=80=81=E8=88=AA=E7=8F=AD=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E7=9A=84=E6=8E=A5=E5=8F=A3=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/FlightsController.java         | 26 +++++++++++++++++++
 .../controller/TestController.java            | 17 ------------
 .../flightInfo/FlightInfoServiceImpl.java     | 14 ++++++++++
 .../flightInfo/IFlightInfoService.java        |  8 ++++++
 4 files changed, 48 insertions(+), 17 deletions(-)
 create mode 100644 src/main/java/com/gzzn/omms/msgexchangeapi/controller/FlightsController.java
 delete mode 100644 src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java

diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/FlightsController.java b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/FlightsController.java
new file mode 100644
index 00000000..84898c2a
--- /dev/null
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/FlightsController.java
@@ -0,0 +1,26 @@
+package com.gzzn.omms.msgexchangeapi.controller;
+
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import com.gzzn.omms.msgexchangeapi.dto.ResponseDto;
+import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.FLTR;
+import com.gzzn.omms.msgexchangeapi.service.flightInfo.IFlightInfoService;
+
+@RestController
+public class FlightsController {
+	@Autowired
+	private IFlightInfoService flightInfoService;
+	
+	
+	/**
+	 * 获取最新完整的动态航班信息
+	 */
+	@GetMapping("/all/flights")
+	public ResponseDto<List<FLTR>> findAll( )  {
+		return ResponseDto.success(flightInfoService.findAll());
+	}
+}
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java b/src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java
deleted file mode 100644
index add444f4..00000000
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/controller/TestController.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.gzzn.omms.msgexchangeapi.controller;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletResponse;
-
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-
-@Controller
-public class TestController {
-	
-	@GetMapping("/test")
-	public void test(HttpServletResponse response) throws IOException {
-		response.getWriter().write("hello");
-	}
-}
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java
index 744e814a..8e8fe427 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/FlightInfoServiceImpl.java
@@ -117,4 +117,18 @@ public class FlightInfoServiceImpl implements IFlightInfoService {
 		Set<String> keys = redisService.keys(redisKey + "*");
 		redisService.del(keys);
 	}
+
+
+	@Override
+	public List<FLTR> findAll() {
+		Set<String> keys = redisService.keys(redisKey + "*");
+		
+		List<FLTR> lsResult = new ArrayList();
+		keys.forEach(key->{
+			FLTR fltr = (FLTR) redisService.get(key);
+			lsResult.add(fltr);
+		});
+		
+		return lsResult;
+	}//end method
 }
diff --git a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/IFlightInfoService.java b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/IFlightInfoService.java
index c4c5f1a4..697c0137 100644
--- a/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/IFlightInfoService.java
+++ b/src/main/java/com/gzzn/omms/msgexchangeapi/service/flightInfo/IFlightInfoService.java
@@ -6,6 +6,14 @@ import com.gzzn.omms.msgexchangeapi.entity.Cminmsg;
 import com.gzzn.omms.msgexchangeapi.entity.msg.schd.dnld.FLTR;
 
 public interface IFlightInfoService {
+	
+ /**
+  * 获取所有动态航班信息
+  * @return 所有最新的动态航班信息
+  */
+  public List<FLTR> findAll();
+	
+	
  /**
  * 同步日计划更新航班信息
  */