|
|
@ -1,6 +1,5 @@ |
|
|
|
package com.palnet.biz.api.main.dash.controller; |
|
|
|
package com.palnet.biz.api.main.dash.controller; |
|
|
|
|
|
|
|
|
|
|
|
import java.time.LocalDate; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.List; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
@ -24,7 +23,6 @@ import com.palnet.biz.api.main.dash.model.MainDashListModel; |
|
|
|
import com.palnet.biz.api.main.dash.model.MainDashStcsModel; |
|
|
|
import com.palnet.biz.api.main.dash.model.MainDashStcsModel; |
|
|
|
import com.palnet.biz.api.main.dash.service.MainDashService; |
|
|
|
import com.palnet.biz.api.main.dash.service.MainDashService; |
|
|
|
import com.palnet.comn.code.RSErrorCode; |
|
|
|
import com.palnet.comn.code.RSErrorCode; |
|
|
|
import com.querydsl.core.Tuple; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
@ -308,12 +306,12 @@ public class MainDashController { |
|
|
|
@GetMapping(value = "/stcs/dron-flight/") |
|
|
|
@GetMapping(value = "/stcs/dron-flight/") |
|
|
|
@ApiOperation(value = "드론 비행 현황") |
|
|
|
@ApiOperation(value = "드론 비행 현황") |
|
|
|
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") |
|
|
|
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") |
|
|
|
public ResponseEntity<? extends BasicResponse> dronFlightStcs(@RequestParam String groupId){ |
|
|
|
public ResponseEntity<? extends BasicResponse> dronFlightStcs(){ |
|
|
|
|
|
|
|
|
|
|
|
Map<String, String> result = null; |
|
|
|
Map<String, String> result = null; |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
try { |
|
|
|
result = service.mainDashDronFlightStcs(groupId); |
|
|
|
result = service.mainDashDronFlightStcs(); |
|
|
|
}catch (Exception e) { |
|
|
|
}catch (Exception e) { |
|
|
|
log.error("IGNORE : {}", e); |
|
|
|
log.error("IGNORE : {}", e); |
|
|
|
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) |
|
|
|
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) |
|
|
@ -341,17 +339,33 @@ public class MainDashController { |
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<List<MainDashFlightListModel>>(result)); |
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<List<MainDashFlightListModel>>(result)); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/current/flight-warn") |
|
|
|
|
|
|
|
public ResponseEntity<? extends BasicResponse> currentFlightWarn(@RequestParam(required = false) String groupId){ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
List<MainCurrentStcsModel> result = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
|
|
|
result = service.currentFlightWarn(groupId); |
|
|
|
|
|
|
|
}catch (Exception e) { |
|
|
|
|
|
|
|
log.error("IGNORE : {}", e); |
|
|
|
|
|
|
|
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) |
|
|
|
|
|
|
|
.body(new ErrorResponse("Server Error", "-1")); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<List<MainCurrentStcsModel>>(result)); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("/current/flight-plan") |
|
|
|
@GetMapping("/current/flight-plan") |
|
|
|
@ApiOperation(value = "일일 비행통계") |
|
|
|
@ApiOperation(value = "김포공항, 비정상상황 비행 통계") |
|
|
|
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") |
|
|
|
@Tag(name = "메인화면 컨트롤러", description = "메인화면 관련 API") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "groupId",value = "그룹아이디", dataTypeClass = String.class) |
|
|
|
@ApiImplicitParam(name = "date",value = "날짜", dataTypeClass = String.class), |
|
|
|
|
|
|
|
@ApiImplicitParam(name = "type",value = "날짜형식", dataTypeClass = String.class) |
|
|
|
}) |
|
|
|
}) |
|
|
|
public ResponseEntity<? extends BasicResponse> currentFlightPlan(@RequestParam(required = false) String groupId){ |
|
|
|
public ResponseEntity<? extends BasicResponse> currentFlightPlan(@RequestParam(required = false) String groupId){ |
|
|
|
log.warn("groupId => {}", groupId); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
log.warn("groupId => {}", groupId); |
|
|
|
List<MainCurrentStcsModel> result = new ArrayList<>(); |
|
|
|
List<MainCurrentStcsModel> result = new ArrayList<>(); |
|
|
|
|
|
|
|
|
|
|
|
try { |
|
|
|
try { |
|
|
|
result = service.currentFlightPlan(groupId); |
|
|
|
result = service.currentFlightPlan(groupId); |
|
|
|
} catch (Exception e){ |
|
|
|
} catch (Exception e){ |
|
|
@ -360,6 +374,8 @@ public class MainDashController { |
|
|
|
.body(new ErrorResponse("Server Error", "-1")); |
|
|
|
.body(new ErrorResponse("Server Error", "-1")); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<List<MainCurrentStcsModel>>(result)); |
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<List<MainCurrentStcsModel>>(result)); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|