正在显示
1 个修改的文件
包含
28 行增加
和
27 行删除
| @@ -34,37 +34,38 @@ public class TransportController { | @@ -34,37 +34,38 @@ public class TransportController { | ||
| 34 | * 根据承运人二字码、航班号、航班日期,获取,运输工具服务中的相关数据 | 34 | * 根据承运人二字码、航班号、航班日期,获取,运输工具服务中的相关数据 |
| 35 | * 航空公司、机型、机号、实际起飞时间、计划起飞时间 | 35 | * 航空公司、机型、机号、实际起飞时间、计划起飞时间 |
| 36 | * | 36 | * |
| 37 | - * @param resultList {@link ResultExitData} | 37 | + * @param flightNo 航班号 |
| 38 | + * @param flightDate 航班日期 | ||
| 38 | * @return | 39 | * @return |
| 39 | */ | 40 | */ |
| 40 | - @PutMapping("/getInfo") | ||
| 41 | - public List<ResultExitData> getInfo(@RequestBody List<ResultExitData> resultList) { | 41 | + @GetMapping("/getInfo") |
| 42 | + public ResultExitData getInfo(@RequestParam(value = "flightNo", required = false) String flightNo, | ||
| 43 | + @RequestParam(value = "flightDate", required = false) Date flightDate) { | ||
| 44 | + ResultExitData result = new ResultExitData(); | ||
| 42 | 45 | ||
| 43 | - System.out.println("开始调用:运输工具服务"); | ||
| 44 | - System.out.println("长度为" + resultList.size()); | ||
| 45 | - for (int i = 0, resultSize = resultList.size(); i < resultSize; i++) { | ||
| 46 | - ResultExitData result = resultList.get(i); | ||
| 47 | - System.out.println(i + "运单号" + result.getWaybillNoMaster()); | ||
| 48 | - List<FlightDfDl> fd = flightDfDlService.getFlightDfDlInfo(result); | ||
| 49 | - if (fd != null && fd.size() > 0) { | ||
| 50 | - //机型 | ||
| 51 | - result.setCfTp(fd.get(0).getCfTp()); | ||
| 52 | - //机号 | ||
| 53 | - result.setCfNo(fd.get(0).getCfNo()); | ||
| 54 | - //航班计划日期,直接设置为航班日期的值 | ||
| 55 | - result.setFlightPlanDate(result.getFlightDate()); | ||
| 56 | - List<DePeAir> dePeAirs = dePeAirService.getDePeAirInfo(fd.get(0).getFlId()); | ||
| 57 | - if (dePeAirs != null && dePeAirs.size() > 0) { | ||
| 58 | - //航班公司 | ||
| 59 | - result.setAirCompany(dePeAirs.get(0).getFfId().substring(0, 2)); | ||
| 60 | - //航班实际起飞时间(航班时间) | ||
| 61 | - result.setFlightTime(dePeAirs.get(0).getFrTt()); | ||
| 62 | - //航班计划时间,直接设置为航班时间 | ||
| 63 | - result.setFlightPlanTime(dePeAirs.get(0).getFrTt()); | ||
| 64 | - } | 46 | + ResultExitData params = new ResultExitData(); |
| 47 | + params.setCarrier(flightNo.substring(0, 2)); | ||
| 48 | + params.setFlightDate(flightDate); | ||
| 49 | + params.setFlightNo(flightNo); | ||
| 50 | + List<FlightDfDl> fd = flightDfDlService.getFlightDfDlInfo(params); | ||
| 51 | + | ||
| 52 | + if (fd != null && fd.size() > 0) { | ||
| 53 | + //机型 | ||
| 54 | + result.setCfTp(fd.get(0).getCfTp()); | ||
| 55 | + //机号 | ||
| 56 | + result.setCfNo(fd.get(0).getCfNo()); | ||
| 57 | + //航班计划日期,直接设置为航班日期的值 | ||
| 58 | + result.setFlightPlanDate(flightDate); | ||
| 59 | + List<DePeAir> dePeAirs = dePeAirService.getDePeAirInfo(fd.get(0).getFlId()); | ||
| 60 | + if (dePeAirs != null && dePeAirs.size() > 0) { | ||
| 61 | + //航班公司 | ||
| 62 | + result.setAirCompany(dePeAirs.get(0).getFfId().substring(0, 2)); | ||
| 63 | + //航班实际起飞时间(航班时间) | ||
| 64 | + result.setFlightTime(dePeAirs.get(0).getFrTt()); | ||
| 65 | + //航班计划时间,直接设置为航班时间 | ||
| 66 | + result.setFlightPlanTime(dePeAirs.get(0).getFrTt()); | ||
| 65 | } | 67 | } |
| 66 | } | 68 | } |
| 67 | - System.out.println("完成调用:运输工具服务"); | ||
| 68 | - return resultList; | 69 | + return result; |
| 69 | } | 70 | } |
| 70 | } | 71 | } |
-
请 注册 或 登录 后发表评论