Tank 추가
This commit is contained in:
parent
8c5b1ce437
commit
78c18da733
|
|
@ -37,8 +37,9 @@ public class HcmEmployeeClient {
|
||||||
+ "&externalId=" + externalId;
|
+ "&externalId=" + externalId;
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
log.info("[HcmEmployeeClient][getEmpIdFromExternalId] url: " + url);
|
||||||
HttpEntity<Void> entity = new HttpEntity<>(systemHeaders());
|
HttpEntity<Void> entity = new HttpEntity<>(systemHeaders());
|
||||||
|
log.info("[HcmEmployeeClient][getEmpIdFromExternalId] entity: " + entity);
|
||||||
ResponseEntity<Map<String, Object>> response =
|
ResponseEntity<Map<String, Object>> response =
|
||||||
restTemplate.exchange(
|
restTemplate.exchange(
|
||||||
url,
|
url,
|
||||||
|
|
@ -46,7 +47,7 @@ public class HcmEmployeeClient {
|
||||||
entity,
|
entity,
|
||||||
new ParameterizedTypeReference<>() {}
|
new ParameterizedTypeReference<>() {}
|
||||||
);
|
);
|
||||||
|
log.info("[HcmEmployeeClient][getEmpIdFromExternalId] response: " + response.getBody());
|
||||||
Map<String, Object> body = response.getBody();
|
Map<String, Object> body = response.getBody();
|
||||||
if (body != null && body.get("eexEmpId") instanceof Number n) {
|
if (body != null && body.get("eexEmpId") instanceof Number n) {
|
||||||
return n.longValue();
|
return n.longValue();
|
||||||
|
|
|
||||||
|
|
@ -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;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
@ -19,7 +19,7 @@ import lombok.Data;
|
||||||
import lombok.NoArgsConstructor;
|
import lombok.NoArgsConstructor;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "entity_change_log")
|
@Table(schema="sys", name = "entity_change_log")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ import org.hibernate.type.SqlTypes;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "ext_samsara_raw_engine_seconds")
|
@Table(schema="opr", name = "ext_samsara_raw_engine_seconds")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "ext_samsara_raw_inspection",
|
name = "ext_samsara_raw_inspection",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(
|
@UniqueConstraint(
|
||||||
|
|
|
||||||
|
|
@ -24,6 +24,7 @@ import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "ext_samsara_raw_odometer",
|
name = "ext_samsara_raw_odometer",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(
|
@UniqueConstraint(
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ import org.hibernate.type.SqlTypes;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "ext_samsara_raw_safety_event")
|
@Table(schema="opr", name = "ext_samsara_raw_safety_event")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "tank",
|
name = "tank",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(name = "uk_tank_code", columnNames = {"tnk_code"})
|
@UniqueConstraint(name = "uk_tank_code", columnNames = {"tnk_code"})
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "tank_inventory",
|
name = "tank_inventory",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(name = "uk_tank_inventory_tank", columnNames = {"tni_tank_id"})
|
@UniqueConstraint(name = "uk_tank_inventory_tank", columnNames = {"tni_tank_id"})
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "tank_inventory_composition",
|
name = "tank_inventory_composition",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(
|
@UniqueConstraint(
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "tank_inventory_snapshot",
|
name = "tank_inventory_snapshot",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(
|
@UniqueConstraint(
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ import java.time.LocalDateTime;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "tank_transaction_line")
|
@Table(schema="opr", name = "tank_transaction_line")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -22,7 +22,7 @@ import java.time.LocalDateTime;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "vehicle")
|
@Table(schema="opr", name = "vehicle")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "vehicle_dispatch",
|
name = "vehicle_dispatch",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(
|
@UniqueConstraint(
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@ import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "vehicle_dispatch_daily_stat",
|
name = "vehicle_dispatch_daily_stat",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(
|
@UniqueConstraint(
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ import jakarta.persistence.EntityListeners;
|
||||||
import jakarta.persistence.GeneratedValue;
|
import jakarta.persistence.GeneratedValue;
|
||||||
import jakarta.persistence.GenerationType;
|
import jakarta.persistence.GenerationType;
|
||||||
import jakarta.persistence.Id;
|
import jakarta.persistence.Id;
|
||||||
|
import jakarta.persistence.Table;
|
||||||
import lombok.AllArgsConstructor;
|
import lombok.AllArgsConstructor;
|
||||||
import lombok.Builder;
|
import lombok.Builder;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
@ -22,6 +23,7 @@ import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Data
|
@Data
|
||||||
|
@Table(schema="opr", name = "vehicle_external_map")
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
@Builder
|
@Builder
|
||||||
|
|
|
||||||
|
|
@ -21,6 +21,7 @@ import java.util.UUID;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(
|
@Table(
|
||||||
|
schema="opr",
|
||||||
name = "vehicle_inspection",
|
name = "vehicle_inspection",
|
||||||
uniqueConstraints = {
|
uniqueConstraints = {
|
||||||
@UniqueConstraint(
|
@UniqueConstraint(
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,7 @@ import org.springframework.data.jpa.domain.support.AuditingEntityListener;
|
||||||
import java.time.LocalDateTime;
|
import java.time.LocalDateTime;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "vehicle_inspection_defect")
|
@Table(schema="opr", name = "vehicle_inspection_defect")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -23,7 +23,7 @@ import org.hibernate.type.SqlTypes;
|
||||||
import com.fasterxml.jackson.databind.JsonNode;
|
import com.fasterxml.jackson.databind.JsonNode;
|
||||||
|
|
||||||
@Entity
|
@Entity
|
||||||
@Table(name = "vehicle_safety_event")
|
@Table(schema="opr", name = "vehicle_safety_event")
|
||||||
@Data
|
@Data
|
||||||
@NoArgsConstructor
|
@NoArgsConstructor
|
||||||
@AllArgsConstructor
|
@AllArgsConstructor
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,7 @@
|
||||||
package com.goi.erp.token;
|
package com.goi.erp.token;
|
||||||
|
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
|
|
||||||
import org.springframework.beans.factory.annotation.Value;
|
import org.springframework.beans.factory.annotation.Value;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
@ -8,6 +9,7 @@ import org.springframework.web.client.RestTemplate;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@Slf4j
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
public class SystemTokenProvider {
|
public class SystemTokenProvider {
|
||||||
|
|
@ -37,7 +39,9 @@ public class SystemTokenProvider {
|
||||||
if (cachedToken != null && now < expiresAt - 30_000) {
|
if (cachedToken != null && now < expiresAt - 30_000) {
|
||||||
return cachedToken;
|
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(
|
Map<String, String> body = Map.of(
|
||||||
"clientId", clientId,
|
"clientId", clientId,
|
||||||
"clientSecret", clientSecret
|
"clientSecret", clientSecret
|
||||||
|
|
@ -46,7 +50,7 @@ public class SystemTokenProvider {
|
||||||
@SuppressWarnings("unchecked")
|
@SuppressWarnings("unchecked")
|
||||||
Map<String, Object> response =
|
Map<String, Object> response =
|
||||||
restTemplate.postForObject(
|
restTemplate.postForObject(
|
||||||
authBaseUrl + "/auth/authenticate/system",
|
authBaseUrl + "/auth/login/system",
|
||||||
body,
|
body,
|
||||||
Map.class
|
Map.class
|
||||||
);
|
);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue