diff --git a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java index 32c6638..6577f51 100644 --- a/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java +++ b/src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java @@ -38,7 +38,7 @@ public class HistoryFlightDataController { @ApiOperation(value="获取历史航班数据(只提供计划时间的出发/到达时间段查询)",tags="历史航班数据") @PostMapping(value="/hitFlightData/list") - public ResponseDto findAllByGroupCode(@RequestBody HistoryFilghtConditionDto conditions) { + public ResponseDto findByTimeAndMvin(@RequestBody HistoryFilghtConditionDto conditions) { String startTime = StringUtils.isEmpty(conditions.getStartSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getStartSODT()); String endTime = StringUtils.isEmpty(conditions.getEndSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getEndSODT()); @@ -46,10 +46,11 @@ public class HistoryFlightDataController { String MVIN = conditions.getMVIN();//到达/离港 BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); - //获取前一天的历史数据 + //获取前一天的历史数据 根据实际时间 String hitStartTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MIN"); String hitEndTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MAX"); - boolQuery.must(QueryBuilders.rangeQuery("SODT") + + boolQuery.must(QueryBuilders.rangeQuery("ACTT") .gte(hitStartTime).lte(hitEndTime)); if(!StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)){