goi
/
opr-rest-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tank 추가

This commit is contained in:
Hyojin Ahn 2026-06-08 11:01:08 -04:00
parent 8c5b1ce437
commit 78c18da733
20 changed files with 28 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/goi/erp/client/HcmEmployeeClient.java
View File

@ -37,8 +37,9 @@ public class HcmEmployeeClient {
+ "&externalId=" + externalId;
try {
log.info("[HcmEmployeeClient][getEmpIdFromExternalId] url: " + url);
HttpEntity<Void> entity = new HttpEntity<>(systemHeaders());
log.info("[HcmEmployeeClient][getEmpIdFromExternalId] entity: " + entity);
ResponseEntity<Map<String, Object>> response =
restTemplate.exchange(
url,
@ -46,7 +47,7 @@ public class HcmEmployeeClient {
entity,
new ParameterizedTypeReference<>() {}
);
log.info("[HcmEmployeeClient][getEmpIdFromExternalId] response: " + response.getBody());
Map<String, Object> body = response.getBody();
if (body != null && body.get("eexEmpId") instanceof Number n) {
return n.longValue();

37
src/main/java/com/goi/erp/entity/Employee.java
View File

@ -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;
}

2
src/main/java/com/goi/erp/entity/EntityChangeLog.java
View File

@ -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

2
src/main/java/com/goi/erp/entity/ExtSamsaraRawEngineSeconds.java
View File

@ -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

1
src/main/java/com/goi/erp/entity/ExtSamsaraRawInspection.java
View File

@ -26,6 +26,7 @@ import java.time.LocalDateTime;
@Entity
@Table(
schema="opr",
name = "ext_samsara_raw_inspection",
uniqueConstraints = {
@UniqueConstraint(

1
src/main/java/com/goi/erp/entity/ExtSamsaraRawOdometer.java
View File

@ -24,6 +24,7 @@ import java.time.LocalDateTime;
@Entity
@Table(
schema="opr",
name = "ext_samsara_raw_odometer",
uniqueConstraints = {
@UniqueConstraint(

2
src/main/java/com/goi/erp/entity/ExtSamsaraRawSafetyEvent.java
View File

@ -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

1
src/main/java/com/goi/erp/entity/Tank.java
View File

@ -21,6 +21,7 @@ import java.util.UUID;
@Entity
@Table(
schema="opr",
name = "tank",
uniqueConstraints = {
@UniqueConstraint(name = "uk_tank_code", columnNames = {"tnk_code"})

1
src/main/java/com/goi/erp/entity/TankInventory.java
View File

@ -21,6 +21,7 @@ import java.util.UUID;
@Entity
@Table(
schema="opr",
name = "tank_inventory",
uniqueConstraints = {
@UniqueConstraint(name = "uk_tank_inventory_tank", columnNames = {"tni_tank_id"})

1
src/main/java/com/goi/erp/entity/TankInventoryComposition.java
View File

@ -21,6 +21,7 @@ import java.util.UUID;
@Entity
@Table(
schema="opr",
name = "tank_inventory_composition",
uniqueConstraints = {
@UniqueConstraint(

1
src/main/java/com/goi/erp/entity/TankInventorySnapshot.java
View File

@ -21,6 +21,7 @@ import java.util.UUID;
@Entity
@Table(
schema="opr",
name = "tank_inventory_snapshot",
uniqueConstraints = {
@UniqueConstraint(

2
src/main/java/com/goi/erp/entity/TankTransactionLine.java
View File

@ -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

2
src/main/java/com/goi/erp/entity/Vehicle.java
View File

@ -22,7 +22,7 @@ import java.time.LocalDateTime;
import java.util.UUID;
@Entity
@Table(name = "vehicle")
@Table(schema="opr", name = "vehicle")
@Data
@NoArgsConstructor
@AllArgsConstructor

1
src/main/java/com/goi/erp/entity/VehicleDispatch.java
View File

@ -22,6 +22,7 @@ import java.util.UUID;
@Entity
@Table(
schema="opr",
name = "vehicle_dispatch",
uniqueConstraints = {
@UniqueConstraint(

1
src/main/java/com/goi/erp/entity/VehicleDispatchDailyStat.java
View File

@ -22,6 +22,7 @@ import java.time.LocalDateTime;
@Entity
@Table(
schema="opr",
name = "vehicle_dispatch_daily_stat",
uniqueConstraints = {
@UniqueConstraint(

2
src/main/java/com/goi/erp/entity/VehicleExternalMap.java
View File

@ -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

1
src/main/java/com/goi/erp/entity/VehicleInspection.java
View File

@ -21,6 +21,7 @@ import java.util.UUID;
@Entity
@Table(
schema="opr",
name = "vehicle_inspection",
uniqueConstraints = {
@UniqueConstraint(

2
src/main/java/com/goi/erp/entity/VehicleInspectionDefect.java
View File

@ -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

2
src/main/java/com/goi/erp/entity/VehicleSafetyEvent.java
View File

@ -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

8
src/main/java/com/goi/erp/token/SystemTokenProvider.java
View File

@ -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<String, String> body = Map.of(
"clientId", clientId,
"clientSecret", clientSecret
@ -46,7 +50,7 @@ public class SystemTokenProvider {
@SuppressWarnings("unchecked")
Map<String, Object> response =
restTemplate.postForObject(
authBaseUrl + "/auth/authenticate/system",
authBaseUrl + "/auth/login/system",
body,
Map.class
);