From c8757c2877862c10831a8f9f7c4609e1e29f610e Mon Sep 17 00:00:00 2001 From: bjkim Date: Fri, 24 Oct 2025 14:51:30 +0900 Subject: [PATCH] =?UTF-8?q?[MODIFY]=20EdgeSW=20=EB=93=B1=EB=A1=9D=20?= =?UTF-8?q?=EB=A1=9C=EC=A7=81=EC=97=90=20sw=5Ftype=20=EB=B6=84=EA=B8=B0=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80,=20=EC=99=B8=EB=B6=80=20API=20URL=20?= =?UTF-8?q?=EA=B5=AC=EB=B6=84=20=EB=B0=8F=20=EB=A9=94=EC=84=9C=EB=93=9C=20?= =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controllers/ExternalAuthController.java | 6 +++++- .../service/DynamicMinioAttachmentService.java | 3 --- .../autoflow/service/EdgeSWUploadService.java | 18 +++++++++++++++--- 3 files changed, 20 insertions(+), 7 deletions(-) diff --git a/src/main/java/kr/re/etri/autoflow/controllers/ExternalAuthController.java b/src/main/java/kr/re/etri/autoflow/controllers/ExternalAuthController.java index b5e6c7e..9b51081 100644 --- a/src/main/java/kr/re/etri/autoflow/controllers/ExternalAuthController.java +++ b/src/main/java/kr/re/etri/autoflow/controllers/ExternalAuthController.java @@ -192,6 +192,10 @@ public class ExternalAuthController { @RequestParam("user_id") @Schema(description = "사용자 ID", example = "admin", required = true) String userId, + @RequestParam("sw_type") + @Schema(description = "0 = sw 1= edge로 db전송", example = "1", required = true) int sw_type, + + @RequestParam("creation_datetime") @Schema( description = "생성 일시 (ISO-8601 형식, UTC)", @@ -227,7 +231,7 @@ public class ExternalAuthController { } // DB 등록 (파일 업로드 성공 후) - String result = edgeSWUploadService.registerMetadata(edgeSWVO); + String result = edgeSWUploadService.registerMetadata(edgeSWVO, sw_type); return ResponseEntity.ok(result); diff --git a/src/main/java/kr/re/etri/autoflow/service/DynamicMinioAttachmentService.java b/src/main/java/kr/re/etri/autoflow/service/DynamicMinioAttachmentService.java index 787a53f..23be7ff 100644 --- a/src/main/java/kr/re/etri/autoflow/service/DynamicMinioAttachmentService.java +++ b/src/main/java/kr/re/etri/autoflow/service/DynamicMinioAttachmentService.java @@ -112,7 +112,6 @@ public class DynamicMinioAttachmentService { )) { return is.readAllBytes(); } catch (io.minio.errors.ErrorResponseException e) { - // statusCode() 제거, 필요한 정보만 출력 throw new RuntimeException( "MinIO 서버가 요청을 거부했습니다: " + objectName + ", 코드=" + e.errorResponse().code() + @@ -132,8 +131,6 @@ public class DynamicMinioAttachmentService { } } - - /** YAML 텍스트 읽기 */ public String readYamlText(String objectName, String type) { MinioClient client = getClientByType(type); diff --git a/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java b/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java index 0a85a56..852a204 100644 --- a/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java +++ b/src/main/java/kr/re/etri/autoflow/service/EdgeSWUploadService.java @@ -27,7 +27,9 @@ public class EdgeSWUploadService { private final S3Client s3Client; private final RestTemplate restTemplate; private final String s3Bucket = "etri-advehicle-s3-bucket"; // S3 버킷 이름 - private final String externalApiUrl = "https://a659120d3e2ff43ff94087b29396fd96-1057696791.ap-northeast-2.elb.amazonaws.com/api/datamanager/edge-sw/add-db"; + private final String externalApiUrl_edge = "https://a659120d3e2ff43ff94087b29396fd96-1057696791.ap-northeast-2.elb.amazonaws.com/api/datamanager/edge-sw/add-db"; + private final String externalApiUrl_sw = "https://a659120d3e2ff43ff94087b29396fd96-1057696791.ap-northeast-2.elb.amazonaws.com/api/datamanager/advehicle-sw/add-db"; + public EdgeSWUploadService(S3Client s3Client, RestTemplate restTemplate) { this.s3Client = s3Client; @@ -64,10 +66,14 @@ public class EdgeSWUploadService { - public String registerMetadata(EdgeSWVO edgeSWVO) { + //sw_type 0 = sw + // sw_type 1 = edge + public String registerMetadata(EdgeSWVO edgeSWVO, int sw_type) { log.info("registerMetadata : " + edgeSWVO.toString()); + String result_url = ""; + // JSON Body 구성 Map jsonBody = new HashMap<>(); jsonBody.put("creation_datetime", edgeSWVO.getCreation_datetime()); @@ -99,7 +105,13 @@ public class EdgeSWUploadService { HttpEntity> requestEntity = new HttpEntity<>(jsonBody, headers); - ResponseEntity response = restTemplate.postForEntity(externalApiUrl, requestEntity, String.class); + if(sw_type ==0) { + result_url = externalApiUrl_sw; + } + else { + result_url = externalApiUrl_edge; + } + ResponseEntity response = restTemplate.postForEntity(result_url, requestEntity, String.class); return response.getBody(); }