From 78c18da73383d53facbdb09d54710a6a02d46f0b Mon Sep 17 00:00:00 2001 From: Hyojin Ahn Date: Mon, 8 Jun 2026 11:01:08 -0400 Subject: [PATCH] =?UTF-8?q?Tank=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/goi/erp/client/HcmEmployeeClient.java | 5 ++- .../java/com/goi/erp/entity/Employee.java | 37 ------------------- .../com/goi/erp/entity/EntityChangeLog.java | 2 +- .../entity/ExtSamsaraRawEngineSeconds.java | 2 +- .../erp/entity/ExtSamsaraRawInspection.java | 1 + .../goi/erp/entity/ExtSamsaraRawOdometer.java | 1 + .../erp/entity/ExtSamsaraRawSafetyEvent.java | 2 +- src/main/java/com/goi/erp/entity/Tank.java | 1 + .../com/goi/erp/entity/TankInventory.java | 3 +- .../erp/entity/TankInventoryComposition.java | 1 + .../goi/erp/entity/TankInventorySnapshot.java | 1 + .../goi/erp/entity/TankTransactionLine.java | 2 +- src/main/java/com/goi/erp/entity/Vehicle.java | 2 +- .../com/goi/erp/entity/VehicleDispatch.java | 1 + .../erp/entity/VehicleDispatchDailyStat.java | 1 + .../goi/erp/entity/VehicleExternalMap.java | 2 + .../com/goi/erp/entity/VehicleInspection.java | 1 + .../erp/entity/VehicleInspectionDefect.java | 2 +- .../goi/erp/entity/VehicleSafetyEvent.java | 2 +- .../goi/erp/token/SystemTokenProvider.java | 8 +++- 20 files changed, 28 insertions(+), 49 deletions(-) delete mode 100644 src/main/java/com/goi/erp/entity/Employee.java diff --git a/src/main/java/com/goi/erp/client/HcmEmployeeClient.java b/src/main/java/com/goi/erp/client/HcmEmployeeClient.java index d6d078a..39bf502 100644 --- a/src/main/java/com/goi/erp/client/HcmEmployeeClient.java +++ b/src/main/java/com/goi/erp/client/HcmEmployeeClient.java @@ -37,8 +37,9 @@ public class HcmEmployeeClient { + "&externalId=" + externalId; try { + log.info("[HcmEmployeeClient][getEmpIdFromExternalId] url: " + url); HttpEntity entity = new HttpEntity<>(systemHeaders()); - + log.info("[HcmEmployeeClient][getEmpIdFromExternalId] entity: " + entity); ResponseEntity> response = restTemplate.exchange( url, @@ -46,7 +47,7 @@ public class HcmEmployeeClient { entity, new ParameterizedTypeReference<>() {} ); - + log.info("[HcmEmployeeClient][getEmpIdFromExternalId] response: " + response.getBody()); Map body = response.getBody(); if (body != null && body.get("eexEmpId") instanceof Number n) { return n.longValue(); diff --git a/src/main/java/com/goi/erp/entity/Employee.java b/src/main/java/com/goi/erp/entity/Employee.java deleted file mode 100644 index 0d0c7d4..0000000 --- a/src/main/java/com/goi/erp/entity/Employee.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.goi.erp.entity; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import java.util.UUID; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Entity -@Table(name = "employee") -@Data -@NoArgsConstructor -@AllArgsConstructor -@Builder -public class Employee { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "emp_id") - private Long empId; // 내부 PK, 외부 노출 X - - @Column(name = "emp_uuid", unique = true, nullable = false) - private UUID empUuid; // 외부 키로 사용 - - @Column(name = "emp_first_name") - private String empFirstName; - - @Column(name = "emp_last_name") - private String empLastName; -} - diff --git a/src/main/java/com/goi/erp/entity/EntityChangeLog.java b/src/main/java/com/goi/erp/entity/EntityChangeLog.java index f7239bd..ba89570 100644 --- a/src/main/java/com/goi/erp/entity/EntityChangeLog.java +++ b/src/main/java/com/goi/erp/entity/EntityChangeLog.java @@ -19,7 +19,7 @@ import lombok.Data; import lombok.NoArgsConstructor; @Entity -@Table(name = "entity_change_log") +@Table(schema="sys", name = "entity_change_log") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/goi/erp/entity/ExtSamsaraRawEngineSeconds.java b/src/main/java/com/goi/erp/entity/ExtSamsaraRawEngineSeconds.java index 8b7707c..87f437b 100644 --- a/src/main/java/com/goi/erp/entity/ExtSamsaraRawEngineSeconds.java +++ b/src/main/java/com/goi/erp/entity/ExtSamsaraRawEngineSeconds.java @@ -22,7 +22,7 @@ import org.hibernate.type.SqlTypes; import com.fasterxml.jackson.databind.JsonNode; @Entity -@Table(name = "ext_samsara_raw_engine_seconds") +@Table(schema="opr", name = "ext_samsara_raw_engine_seconds") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/goi/erp/entity/ExtSamsaraRawInspection.java b/src/main/java/com/goi/erp/entity/ExtSamsaraRawInspection.java index ae4884f..9ff4ec9 100644 --- a/src/main/java/com/goi/erp/entity/ExtSamsaraRawInspection.java +++ b/src/main/java/com/goi/erp/entity/ExtSamsaraRawInspection.java @@ -26,6 +26,7 @@ import java.time.LocalDateTime; @Entity @Table( + schema="opr", name = "ext_samsara_raw_inspection", uniqueConstraints = { @UniqueConstraint( diff --git a/src/main/java/com/goi/erp/entity/ExtSamsaraRawOdometer.java b/src/main/java/com/goi/erp/entity/ExtSamsaraRawOdometer.java index 5d1c357..d8eb068 100644 --- a/src/main/java/com/goi/erp/entity/ExtSamsaraRawOdometer.java +++ b/src/main/java/com/goi/erp/entity/ExtSamsaraRawOdometer.java @@ -24,6 +24,7 @@ import java.time.LocalDateTime; @Entity @Table( + schema="opr", name = "ext_samsara_raw_odometer", uniqueConstraints = { @UniqueConstraint( diff --git a/src/main/java/com/goi/erp/entity/ExtSamsaraRawSafetyEvent.java b/src/main/java/com/goi/erp/entity/ExtSamsaraRawSafetyEvent.java index 3240741..c5845b5 100644 --- a/src/main/java/com/goi/erp/entity/ExtSamsaraRawSafetyEvent.java +++ b/src/main/java/com/goi/erp/entity/ExtSamsaraRawSafetyEvent.java @@ -23,7 +23,7 @@ import org.hibernate.type.SqlTypes; import com.fasterxml.jackson.databind.JsonNode; @Entity -@Table(name = "ext_samsara_raw_safety_event") +@Table(schema="opr", name = "ext_samsara_raw_safety_event") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/goi/erp/entity/Tank.java b/src/main/java/com/goi/erp/entity/Tank.java index f223267..80b8d21 100644 --- a/src/main/java/com/goi/erp/entity/Tank.java +++ b/src/main/java/com/goi/erp/entity/Tank.java @@ -21,6 +21,7 @@ import java.util.UUID; @Entity @Table( + schema="opr", name = "tank", uniqueConstraints = { @UniqueConstraint(name = "uk_tank_code", columnNames = {"tnk_code"}) diff --git a/src/main/java/com/goi/erp/entity/TankInventory.java b/src/main/java/com/goi/erp/entity/TankInventory.java index 2758e16..2f61687 100644 --- a/src/main/java/com/goi/erp/entity/TankInventory.java +++ b/src/main/java/com/goi/erp/entity/TankInventory.java @@ -21,7 +21,8 @@ import java.util.UUID; @Entity @Table( - name = "tank_inventory", + schema="opr", + name = "tank_inventory", uniqueConstraints = { @UniqueConstraint(name = "uk_tank_inventory_tank", columnNames = {"tni_tank_id"}) } diff --git a/src/main/java/com/goi/erp/entity/TankInventoryComposition.java b/src/main/java/com/goi/erp/entity/TankInventoryComposition.java index 919081a..75cf0c7 100644 --- a/src/main/java/com/goi/erp/entity/TankInventoryComposition.java +++ b/src/main/java/com/goi/erp/entity/TankInventoryComposition.java @@ -21,6 +21,7 @@ import java.util.UUID; @Entity @Table( + schema="opr", name = "tank_inventory_composition", uniqueConstraints = { @UniqueConstraint( diff --git a/src/main/java/com/goi/erp/entity/TankInventorySnapshot.java b/src/main/java/com/goi/erp/entity/TankInventorySnapshot.java index e0afe48..99827a9 100644 --- a/src/main/java/com/goi/erp/entity/TankInventorySnapshot.java +++ b/src/main/java/com/goi/erp/entity/TankInventorySnapshot.java @@ -21,6 +21,7 @@ import java.util.UUID; @Entity @Table( + schema="opr", name = "tank_inventory_snapshot", uniqueConstraints = { @UniqueConstraint( diff --git a/src/main/java/com/goi/erp/entity/TankTransactionLine.java b/src/main/java/com/goi/erp/entity/TankTransactionLine.java index 77ea8ed..60fa3f3 100644 --- a/src/main/java/com/goi/erp/entity/TankTransactionLine.java +++ b/src/main/java/com/goi/erp/entity/TankTransactionLine.java @@ -19,7 +19,7 @@ import java.time.LocalDateTime; import java.util.UUID; @Entity -@Table(name = "tank_transaction_line") +@Table(schema="opr", name = "tank_transaction_line") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/goi/erp/entity/Vehicle.java b/src/main/java/com/goi/erp/entity/Vehicle.java index 4484065..99e420e 100644 --- a/src/main/java/com/goi/erp/entity/Vehicle.java +++ b/src/main/java/com/goi/erp/entity/Vehicle.java @@ -22,7 +22,7 @@ import java.time.LocalDateTime; import java.util.UUID; @Entity -@Table(name = "vehicle") +@Table(schema="opr", name = "vehicle") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/goi/erp/entity/VehicleDispatch.java b/src/main/java/com/goi/erp/entity/VehicleDispatch.java index 2ea5153..cbfeca4 100644 --- a/src/main/java/com/goi/erp/entity/VehicleDispatch.java +++ b/src/main/java/com/goi/erp/entity/VehicleDispatch.java @@ -22,6 +22,7 @@ import java.util.UUID; @Entity @Table( + schema="opr", name = "vehicle_dispatch", uniqueConstraints = { @UniqueConstraint( diff --git a/src/main/java/com/goi/erp/entity/VehicleDispatchDailyStat.java b/src/main/java/com/goi/erp/entity/VehicleDispatchDailyStat.java index 93de42f..22c2163 100644 --- a/src/main/java/com/goi/erp/entity/VehicleDispatchDailyStat.java +++ b/src/main/java/com/goi/erp/entity/VehicleDispatchDailyStat.java @@ -22,6 +22,7 @@ import java.time.LocalDateTime; @Entity @Table( + schema="opr", name = "vehicle_dispatch_daily_stat", uniqueConstraints = { @UniqueConstraint( diff --git a/src/main/java/com/goi/erp/entity/VehicleExternalMap.java b/src/main/java/com/goi/erp/entity/VehicleExternalMap.java index 3638249..253cb72 100644 --- a/src/main/java/com/goi/erp/entity/VehicleExternalMap.java +++ b/src/main/java/com/goi/erp/entity/VehicleExternalMap.java @@ -12,6 +12,7 @@ import jakarta.persistence.EntityListeners; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -22,6 +23,7 @@ import java.util.UUID; @Entity @Data +@Table(schema="opr", name = "vehicle_external_map") @NoArgsConstructor @AllArgsConstructor @Builder diff --git a/src/main/java/com/goi/erp/entity/VehicleInspection.java b/src/main/java/com/goi/erp/entity/VehicleInspection.java index f5a329f..b940ea5 100644 --- a/src/main/java/com/goi/erp/entity/VehicleInspection.java +++ b/src/main/java/com/goi/erp/entity/VehicleInspection.java @@ -21,6 +21,7 @@ import java.util.UUID; @Entity @Table( + schema="opr", name = "vehicle_inspection", uniqueConstraints = { @UniqueConstraint( diff --git a/src/main/java/com/goi/erp/entity/VehicleInspectionDefect.java b/src/main/java/com/goi/erp/entity/VehicleInspectionDefect.java index 445dc85..1157eec 100644 --- a/src/main/java/com/goi/erp/entity/VehicleInspectionDefect.java +++ b/src/main/java/com/goi/erp/entity/VehicleInspectionDefect.java @@ -17,7 +17,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener; import java.time.LocalDateTime; @Entity -@Table(name = "vehicle_inspection_defect") +@Table(schema="opr", name = "vehicle_inspection_defect") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/goi/erp/entity/VehicleSafetyEvent.java b/src/main/java/com/goi/erp/entity/VehicleSafetyEvent.java index 8a6129e..59c721d 100644 --- a/src/main/java/com/goi/erp/entity/VehicleSafetyEvent.java +++ b/src/main/java/com/goi/erp/entity/VehicleSafetyEvent.java @@ -23,7 +23,7 @@ import org.hibernate.type.SqlTypes; import com.fasterxml.jackson.databind.JsonNode; @Entity -@Table(name = "vehicle_safety_event") +@Table(schema="opr", name = "vehicle_safety_event") @Data @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/goi/erp/token/SystemTokenProvider.java b/src/main/java/com/goi/erp/token/SystemTokenProvider.java index 810d2ae..f00a6fd 100644 --- a/src/main/java/com/goi/erp/token/SystemTokenProvider.java +++ b/src/main/java/com/goi/erp/token/SystemTokenProvider.java @@ -1,6 +1,7 @@ package com.goi.erp.token; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; @@ -8,6 +9,7 @@ import org.springframework.web.client.RestTemplate; import java.util.Map; +@Slf4j @Service @RequiredArgsConstructor public class SystemTokenProvider { @@ -37,7 +39,9 @@ public class SystemTokenProvider { if (cachedToken != null && now < expiresAt - 30_000) { return cachedToken; } - + log.info("[SystemTokenProvider][getToken] clientId: " + clientId); + log.info("[SystemTokenProvider][getToken] clientSecret: " + clientSecret); + log.info("[SystemTokenProvider][getToken] url: " + authBaseUrl + "/auth/login/system"); Map body = Map.of( "clientId", clientId, "clientSecret", clientSecret @@ -46,7 +50,7 @@ public class SystemTokenProvider { @SuppressWarnings("unchecked") Map response = restTemplate.postForObject( - authBaseUrl + "/auth/authenticate/system", + authBaseUrl + "/auth/login/system", body, Map.class );