对接航班号

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/IotFeignClient.java

@@ -4,7 +4,10 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -21,8 +24,9 @@ public interface IotFeignClient {
      **/
     @RequestMapping(value = "/v1/iot/DynamicFlightInfo/{flightNo}", method = RequestMethod.GET)
     ResponseModel<Map<String, Object>> getDynamicFlightInfo(@PathVariable String flightNo);
-    
-    
-    
+
+
+    @RequestMapping(value = "/v1/iot/DynamicFlightInfo/list", method = RequestMethod.GET)
+    ResponseModel<List<Map<String, Object>>> findImgByFileCategory();
     
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/controller/AircraftController.java

@@ -161,14 +161,9 @@ public class AircraftController extends BaseController {
     @GetMapping(value = "/getAircraftNum")
     @ApiOperation(httpMethod = "GET", value = "获取24小时内的航班号", notes = "获取24小时内的航班号")
     public ResponseModel<List<Map<String, Object>>> getAircraftNum() {
-      	List<Map<String, Object>> list= new ArrayList<>();   	
-    	Map<String, Object> map=new HashedMap();
-    	Map<String, Object> map1=new HashedMap();   	
-    	map.put("id", "1");map.put("name", "测试");
-    	map1.put("id", "12");map1.put("name", "测试2");
-    	list.add(map1);
-    	list.add(map);
-        return ResponseHelper.buildResponse(list);
+      	List<Map<String, Object>> list= new ArrayList<>();
+        ResponseModel<List<Map<String, Object>>> dataModel=   iotFeignClient.findImgByFileCategory();
+        return ResponseHelper.buildResponse(dataModel!=null?dataModel.getResult():null);
     } 
     
     /**
@@ -181,9 +176,7 @@ public class AircraftController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "通过航班号，查询最新的航班信息", notes = "通过航班号，查询最新的航班信息")
     public ResponseModel<Map<String, Object>> getAircraftDetails(@PathVariable String num) {
     	
-    	  Map<String, Object> map1=new HashedMap();    	
-            	
-    	
+        Map<String, Object> map1=new HashedMap();
     	ResponseModel<Map<String, Object>>  dataModel=   iotFeignClient.getDynamicFlightInfo(num);
     	if(dataModel!=null) {
     		Map<String, Object> map= dataModel.getResult();