|
|
|
@ -10,6 +10,7 @@ import java.util.HashMap;
|
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.*; |
|
|
|
|
import org.json.simple.JSONObject; |
|
|
|
|
import org.json.simple.parser.JSONParser; |
|
|
|
|
import org.json.simple.parser.ParseException; |
|
|
|
@ -24,15 +25,6 @@ import org.springframework.http.ResponseEntity;
|
|
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.dto.LanncPdfVO; |
|
|
|
|
|
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightAprovRq; |
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanArcrftModel; |
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanAreaModel; |
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanListRq; |
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanModel; |
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightPlanPilotModel; |
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightScheduleRs; |
|
|
|
|
import com.palnet.biz.api.bas.flight.model.BasFlightWeatherModel; |
|
|
|
|
import com.palnet.biz.api.bas.flight.service.BasFlightService; |
|
|
|
|
import com.palnet.biz.api.comn.model.ComnPagingRs; |
|
|
|
|
import com.palnet.biz.api.comn.response.BasicResponse; |
|
|
|
@ -99,7 +91,7 @@ public class BasFlightController {
|
|
|
|
|
@ApiOperation(value = "비행계획서 조회") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> findPlanList(BasFlightPlanListRq rq) { |
|
|
|
|
ComnPagingRs<BasFlightPlanModel> result = null; |
|
|
|
|
ComnPagingRs<BasFlightPlanModel> result = null; |
|
|
|
|
log.debug(">>> rq : {}", rq); |
|
|
|
|
try { |
|
|
|
|
result = basFlightService.listPlan(rq); |
|
|
|
@ -116,7 +108,7 @@ public class BasFlightController {
|
|
|
|
|
@GetMapping(value = "/plan/detail/{planSno}") |
|
|
|
|
@ApiOperation(value = "비행계획서 상세 조회") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
@ApiImplicitParam(name = "planSno",value = "비행계획서일련번호", dataTypeClass = Integer.class) |
|
|
|
|
@ApiImplicitParam(name = "planSno", value = "비행계획서일련번호", dataTypeClass = Integer.class) |
|
|
|
|
public ResponseEntity<? extends BasicResponse> detailPlan(@PathVariable("planSno") Integer planSno) { |
|
|
|
|
BasFlightPlanModel result = null; |
|
|
|
|
try { |
|
|
|
@ -135,14 +127,14 @@ public class BasFlightController {
|
|
|
|
|
@ApiOperation(value = "비행계획서 등록") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> createPlan(@RequestBody BasFlightPlanModel rq) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
BasFlightPlanLaancRs rs = null; |
|
|
|
|
try { |
|
|
|
|
log.error(">>> rq : {}", rq); |
|
|
|
|
boolean result = basFlightService.createPlan(rq); |
|
|
|
|
resultMap.put("result", result); |
|
|
|
|
log.info(">>> resultMap : " , resultMap); |
|
|
|
|
log.debug(">>> rq : {}", rq); |
|
|
|
|
rs = basFlightService.createPlan(rq); |
|
|
|
|
log.debug(">>> rs : {}", rs); |
|
|
|
|
|
|
|
|
|
} catch (CustomException e) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
log.error("IGNORE : {}", e); |
|
|
|
|
resultMap.put("result", false); |
|
|
|
|
resultMap.put("errorCode", e.getErrorCode()); |
|
|
|
@ -154,7 +146,7 @@ public class BasFlightController {
|
|
|
|
|
.body(new ErrorResponse("Server Error", "-1")); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(rs)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 비행계획서 수정
|
|
|
|
@ -162,12 +154,12 @@ public class BasFlightController {
|
|
|
|
|
@ApiOperation(value = "비행계획서 수정") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> updatePlan(@RequestBody BasFlightPlanModel rq) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
BasFlightPlanLaancRs rs = null; |
|
|
|
|
try { |
|
|
|
|
boolean result = basFlightService.updatePlan(rq); |
|
|
|
|
resultMap.put("result", result); |
|
|
|
|
rs = basFlightService.updatePlan(rq); |
|
|
|
|
|
|
|
|
|
} catch (CustomException e) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
log.error("IGNORE : {}", e); |
|
|
|
|
resultMap.put("result", false); |
|
|
|
|
resultMap.put("errorCode", e.getErrorCode()); |
|
|
|
@ -179,14 +171,14 @@ public class BasFlightController {
|
|
|
|
|
.body(new ErrorResponse("Server Error", "-1")); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(resultMap)); |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(rs)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 비행계획서 삭제
|
|
|
|
|
@DeleteMapping(value = "/plan/delete/{planSno}") |
|
|
|
|
@ApiOperation(value = "비행계획서 삭제") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
@ApiImplicitParam(name = "planSno",value = "비행계획서일련번호", dataTypeClass = Integer.class) |
|
|
|
|
@ApiImplicitParam(name = "planSno", value = "비행계획서일련번호", dataTypeClass = Integer.class) |
|
|
|
|
public ResponseEntity<? extends BasicResponse> deletePlan(@PathVariable("planSno") Integer planSno) { |
|
|
|
|
Map<String, Object> resultMap = new HashMap<String, Object>(); |
|
|
|
|
try { |
|
|
|
@ -211,7 +203,7 @@ public class BasFlightController {
|
|
|
|
|
@GetMapping(value = "/plan/pilot/{groupId}") |
|
|
|
|
@ApiOperation(value = "그룹의 조종사 조회") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
@ApiImplicitParam(name = "groupId",value = "그룹ID", dataTypeClass = String.class) |
|
|
|
|
@ApiImplicitParam(name = "groupId", value = "그룹ID", dataTypeClass = String.class) |
|
|
|
|
public ResponseEntity<? extends BasicResponse> findPilot(@PathVariable("groupId") String groupId) { |
|
|
|
|
List<BasFlightPlanPilotModel> result = null; |
|
|
|
|
try { |
|
|
|
@ -226,11 +218,12 @@ public class BasFlightController {
|
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(result)); |
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 그룹 기체 조회
|
|
|
|
|
@GetMapping(value = "/plan/arcrft/{groupId}") |
|
|
|
|
@ApiOperation(value = "그룹의 기체 조회") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
@ApiImplicitParam(name = "groupId",value = "그룹ID", dataTypeClass = String.class) |
|
|
|
|
@ApiImplicitParam(name = "groupId", value = "그룹ID", dataTypeClass = String.class) |
|
|
|
|
public ResponseEntity<? extends BasicResponse> findArcrft(@PathVariable("groupId") String groupId) { |
|
|
|
|
List<BasFlightPlanArcrftModel> result = null; |
|
|
|
|
try { |
|
|
|
@ -265,26 +258,27 @@ public class BasFlightController {
|
|
|
|
|
@GetMapping("/plan/api/weather") |
|
|
|
|
@ApiOperation(value = "비행계획서 날씨") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> restApiGetWeather(BasFlightWeatherModel rq){ |
|
|
|
|
JSONObject jsonObject = null; |
|
|
|
|
public ResponseEntity<? extends BasicResponse> restApiGetWeather(BasFlightWeatherModel rq) { |
|
|
|
|
JSONObject jsonObject = null; |
|
|
|
|
|
|
|
|
|
try { |
|
|
|
|
jsonObject = basFlightService.getWeather(rq); |
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error("IGNORE : {}", e); |
|
|
|
|
return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) |
|
|
|
|
.body(new ErrorResponse("Server Error", "-1")); |
|
|
|
|
} |
|
|
|
|
try { |
|
|
|
|
jsonObject = basFlightService.getWeather(rq); |
|
|
|
|
} 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<>(jsonObject)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 비행계획서 리스트(승인)
|
|
|
|
|
@GetMapping(value = "/aprv/list") |
|
|
|
|
@ApiOperation(value = "비행계획서 리스트(승인)") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> findAprvList(BasFlightPlanListRq rq) { |
|
|
|
|
ComnPagingRs<BasFlightPlanModel> result = null; |
|
|
|
|
ComnPagingRs<BasFlightPlanModel> result = null; |
|
|
|
|
try { |
|
|
|
|
result = basFlightService.aprvList(rq); |
|
|
|
|
} catch (Exception e) { |
|
|
|
@ -295,6 +289,7 @@ public class BasFlightController {
|
|
|
|
|
} |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(result)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
// 비행계획서 승인/미승인
|
|
|
|
|
@PutMapping(value = "/aprv/proc") |
|
|
|
|
@ApiOperation(value = "비행 계획서 승인/미승인") |
|
|
|
@ -343,24 +338,24 @@ public class BasFlightController {
|
|
|
|
|
@ApiOperation(value = "지역 검색") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
|
public ResponseEntity<? extends BasicResponse> searchArea(String query) throws ParseException { |
|
|
|
|
String text = null; |
|
|
|
|
try { |
|
|
|
|
text = URLEncoder.encode(query, "UTF-8"); |
|
|
|
|
} catch (UnsupportedEncodingException e) { |
|
|
|
|
throw new RuntimeException("검색어 인코딩 실패", e); |
|
|
|
|
} |
|
|
|
|
String text = null; |
|
|
|
|
try { |
|
|
|
|
text = URLEncoder.encode(query, "UTF-8"); |
|
|
|
|
} catch (UnsupportedEncodingException e) { |
|
|
|
|
throw new RuntimeException("검색어 인코딩 실패", e); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
String apiURL = env.getProperty("api.naver.search-url") + "?query=" + text + "&display=5"; |
|
|
|
|
Map<String, String> requestHeaders = new HashMap<>(); |
|
|
|
|
requestHeaders.put("X-Naver-Client-Id", env.getProperty("api.naver.client-id")); |
|
|
|
|
requestHeaders.put("X-Naver-Client-Secret", env.getProperty("api.naver.client-secret-key")); |
|
|
|
|
String responseBody = basFlightService.searchArea(apiURL, requestHeaders); |
|
|
|
|
String apiURL = env.getProperty("api.naver.search-url") + "?query=" + text + "&display=5"; |
|
|
|
|
Map<String, String> requestHeaders = new HashMap<>(); |
|
|
|
|
requestHeaders.put("X-Naver-Client-Id", env.getProperty("api.naver.client-id")); |
|
|
|
|
requestHeaders.put("X-Naver-Client-Secret", env.getProperty("api.naver.client-secret-key")); |
|
|
|
|
String responseBody = basFlightService.searchArea(apiURL, requestHeaders); |
|
|
|
|
|
|
|
|
|
JSONParser parser = new JSONParser(); |
|
|
|
|
Object obj = parser.parse(responseBody); |
|
|
|
|
JSONParser parser = new JSONParser(); |
|
|
|
|
Object obj = parser.parse(responseBody); |
|
|
|
|
|
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(obj)); |
|
|
|
|
} |
|
|
|
|
return ResponseEntity.ok().body(new SuccessResponse<>(obj)); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@GetMapping("/schedule") |
|
|
|
|
@Tag(name = "비행계획서", description = "비행계획서 관련 API") |
|
|
|
@ -385,12 +380,12 @@ public class BasFlightController {
|
|
|
|
|
public void createCircleTest(@RequestParam double getX, @RequestParam double getY, @RequestParam double buffer) { |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
Coordinate circleCoord = new Coordinate(getY, getX); |
|
|
|
|
Coordinate circleCoord = new Coordinate(getY, getX); |
|
|
|
|
|
|
|
|
|
List<Coordinate> coordList = utils.createCircle(circleCoord, buffer); |
|
|
|
|
for(Coordinate a : coordList) { |
|
|
|
|
System.out.println("["+a.getX() + ", " + a.getY()+"],"); |
|
|
|
|
} |
|
|
|
|
List<Coordinate> coordList = utils.createCircle(circleCoord, buffer); |
|
|
|
|
for (Coordinate a : coordList) { |
|
|
|
|
System.out.println("[" + a.getX() + ", " + a.getY() + "],"); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@PostMapping("/lance-pdf/create") |
|
|
|
|