windy/admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改接口名称

Browse Source
This commit is contained in:
fanghongchao
2018-12-14 18:19:18 +08:00
parent b8864d515f
commit 69f9c308d0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/gzzn/omms/adminapi/controller/history/HistoryFlightDataController.java
+4 -3
View File
@@ -38,7 +38,7 @@ public class HistoryFlightDataController {
@ApiOperation(value="获取历史航班数据(只提供计划时间的出发/到达时间段查询)",tags="历史航班数据") @ApiOperation(value="获取历史航班数据(只提供计划时间的出发/到达时间段查询)",tags="历史航班数据")
@PostMapping(value="/hitFlightData/list") @PostMapping(value="/hitFlightData/list")
public ResponseDto<Object> findAllByGroupCode(@RequestBody HistoryFilghtConditionDto conditions) { public ResponseDto<Object> findByTimeAndMvin(@RequestBody HistoryFilghtConditionDto conditions) {
String startTime = StringUtils.isEmpty(conditions.getStartSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getStartSODT()); String startTime = StringUtils.isEmpty(conditions.getStartSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getStartSODT());
String endTime = StringUtils.isEmpty(conditions.getEndSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getEndSODT()); String endTime = StringUtils.isEmpty(conditions.getEndSODT())?null:DateUtils.swichTimeToEn_ddMMMyyHHmm(conditions.getEndSODT());
@@ -46,10 +46,11 @@ public class HistoryFlightDataController {
String MVIN = conditions.getMVIN();//到达/离港 String MVIN = conditions.getMVIN();//到达/离港
BoolQueryBuilder boolQuery = QueryBuilders.boolQuery(); BoolQueryBuilder boolQuery = QueryBuilders.boolQuery();
//获取前一天的历史数据 //获取前一天的历史数据 根据实际时间
String hitStartTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MIN"); String hitStartTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MIN");
String hitEndTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MAX"); String hitEndTime = DateUtils.getNewDateOfDayMixOrMaxTime(new Date(), "Day", -1, "MAX");
boolQuery.must(QueryBuilders.rangeQuery("SODT")
boolQuery.must(QueryBuilders.rangeQuery("ACTT")
.gte(hitStartTime).lte(hitEndTime)); .gte(hitStartTime).lte(hitEndTime));
if(!StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)){ if(!StringUtils.isEmpty(startTime) && !StringUtils.isEmpty(endTime)){