From e6acfea39cd4cae18f0b40bda66533c406a801f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Mon, 4 Dec 2023 10:36:17 +0900 Subject: [PATCH] =?UTF-8?q?=EC=88=9C=ED=99=98=EC=B0=B8=EC=A1=B0=EB=A1=9C?= =?UTF-8?q?=20=EC=9D=B8=ED=95=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bas/laanc/service/BasLaancService.java | 20 +++++++++ .../controller/ExternalLaancController.java | 45 ++++++++++--------- .../biz/api/external/service/TsService.java | 25 ++--------- .../server/service/TaskServerService.java | 2 +- 4 files changed, 48 insertions(+), 44 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java index da933435..ef87f80c 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/bas/laanc/service/BasLaancService.java @@ -13,6 +13,7 @@ import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetCoordRq; import com.palnet.biz.api.comn.sunriseset.model.ComnSunrisesetRs; import com.palnet.biz.api.external.model.PilotValidRq; import com.palnet.biz.api.external.model.PilotValidRs; +import com.palnet.biz.api.external.model.TsPlanRq; import com.palnet.biz.api.external.model.TsQrcodeRq; import com.palnet.biz.api.external.service.TsService; import com.palnet.biz.jpa.entity.*; @@ -693,4 +694,23 @@ public class BasLaancService { return rs; } + // TS 비행계획서 + public void createPlanDos(TsPlanRq tsPlanRq) { + // convert + BasLaancPlanRq rq = tsPlanRq.toBasLaancPlanRq(); + + + // 기존 로직대로 수행 + BasLaancValidatedRs basLaancValidatedRs = this.validationLaanc(rq); + if (!basLaancValidatedRs.isValid()) { + log.info("ts dron one stop validation fail : {}", basLaancValidatedRs); + return; + } + + try { + BasLaancLastRs flightPlan = this.createFlightPlan(rq); + } catch (Exception e) { + log.error("ts dron one stop create flight plan fail", e); + } + } } diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java b/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java index c752a694..78f5d18a 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/controller/ExternalLaancController.java @@ -25,6 +25,7 @@ import java.util.Map; public class ExternalLaancController { private final TsService tsService; + private final BasLaancService basLaancService; /* error code @@ -54,28 +55,28 @@ public class ExternalLaancController { } -// try { -// tsService.createPlanDos(tsPlanRq); -// } catch (CustomException e) { -// log.error("IGNORE: ", e); -// -// ErrorCode errorCode = ErrorCode.fromCode(e.getErrorCode()); -// if (errorCode == null) errorCode = ErrorCode.TS_ETC; -// -// String tsErrorCode = errorCode.code().replaceAll("TS", ""); -// -// Map error = new HashMap<>(); -// error.put("rspCode", tsErrorCode); -// error.put("rspMessage", errorCode.message()); -// -// return ResponseEntity.status(Integer.parseInt(tsErrorCode)).body(error); -// } catch (Exception e) { -// log.error("IGNORE: ", e); -// Map error = new HashMap<>(); -// error.put("rspCode", ErrorCode.TS_ETC.code()); -// error.put("rspMessage", ErrorCode.TS_ETC.message()); -// return ResponseEntity.status(300).body(error); -// } + try { + basLaancService.createPlanDos(tsPlanRq); + } catch (CustomException e) { + log.error("IGNORE: ", e); + + ErrorCode errorCode = ErrorCode.fromCode(e.getErrorCode()); + if (errorCode == null) errorCode = ErrorCode.TS_ETC; + + String tsErrorCode = errorCode.code().replaceAll("TS", ""); + + Map error = new HashMap<>(); + error.put("rspCode", tsErrorCode); + error.put("rspMessage", errorCode.message()); + + return ResponseEntity.status(Integer.parseInt(tsErrorCode)).body(error); + } catch (Exception e) { + log.error("IGNORE: ", e); + Map error = new HashMap<>(); + error.put("rspCode", ErrorCode.TS_ETC.code()); + error.put("rspMessage", ErrorCode.TS_ETC.message()); + return ResponseEntity.status(300).body(error); + } return ResponseEntity.ok().build(); } diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java b/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java index 4c2c7d5e..0caeb110 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/service/TsService.java @@ -10,7 +10,10 @@ import com.palnet.biz.api.bas.laanc.model.BasLaancLastRs; import com.palnet.biz.api.bas.laanc.model.BasLaancPlanRq; import com.palnet.biz.api.bas.laanc.model.BasLaancValidatedRs; import com.palnet.biz.api.bas.laanc.service.BasLaancService; -import com.palnet.biz.api.external.model.*; +import com.palnet.biz.api.external.model.PilotValidRq; +import com.palnet.biz.api.external.model.PilotValidRs; +import com.palnet.biz.api.external.model.TsPlanRq; +import com.palnet.biz.api.external.model.TsQrcodeRs; import com.palnet.biz.jpa.entity.ComConfirmBas; import com.palnet.biz.jpa.repository.com.ComConfirmBasRepository; import com.palnet.comn.utils.JsonUtils; @@ -21,7 +24,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.reactive.function.client.WebClient; import org.springframework.web.reactive.function.client.WebClientResponseException; import org.springframework.web.util.DefaultUriBuilderFactory; @@ -57,7 +59,6 @@ public class TsService { private final String ACCOUNT_VALIDATE_URI = "/api/account/getValidate"; private final ComConfirmBasRepository comConfirmBasRepository; - private final BasLaancService basLaancService; // 이전 TS 연동 @@ -168,24 +169,6 @@ public class TsService { } - // TS 비행계획서 - public void createPlanDos(TsPlanRq tsPlanRq) { - // convert - BasLaancPlanRq rq = tsPlanRq.toBasLaancPlanRq(); - // 기존 로직대로 수행 - BasLaancValidatedRs basLaancValidatedRs = basLaancService.validationLaanc(rq); - if (!basLaancValidatedRs.isValid()) { - log.info("ts dron one stop validation fail : {}", basLaancValidatedRs); - return; - } - - try { - BasLaancLastRs flightPlan = basLaancService.createFlightPlan(rq); - } catch (Exception e) { - log.error("ts dron one stop create flight plan fail", e); - } - } - } diff --git a/pav-socket/src/main/java/com/palnet/server/task/server/service/TaskServerService.java b/pav-socket/src/main/java/com/palnet/server/task/server/service/TaskServerService.java index 3c3f5985..9fff0093 100644 --- a/pav-socket/src/main/java/com/palnet/server/task/server/service/TaskServerService.java +++ b/pav-socket/src/main/java/com/palnet/server/task/server/service/TaskServerService.java @@ -165,7 +165,7 @@ public class TaskServerService { .build(); // 임시 하드코딩 - final String UTM_HOST = "http://localhost:8080"; + final String UTM_HOST = "http://192.168.0.133:9000"; final String UTM_REALTIME_URI = "/api/v1/utm"; WebClient client = WebClient.builder()