Merge remote-tracking branch 'origin/feat/demo-20251205' into feat/demo-20251205
# Conflicts: # src/main/java/com/kamco/cd/kamcoback/postgres/entity/MapSheetAnalDataGeomEntity.java
This commit is contained in:
@@ -16,7 +16,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@Tag(name = "감사 로그", description = "감사 로그 관리 API")
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping({"/api/log/audit", "/v1/api/log/audit"})
|
||||
@RequestMapping("/api/log/audit")
|
||||
public class AuditLogApiController {
|
||||
|
||||
private final AuditLogCoreService auditLogCoreService;
|
||||
|
||||
@@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController;
|
||||
@Tag(name = "에러 로그", description = "에러 로그 관리 API")
|
||||
@RequiredArgsConstructor
|
||||
@RestController
|
||||
@RequestMapping({"/api/log/error", "/v1/api/log/error"})
|
||||
@RequestMapping("/api/log/error")
|
||||
public class ErrorLogApiController {
|
||||
|
||||
private final ErrorLogCoreService errorLogCoreService;
|
||||
|
||||
@@ -31,7 +31,10 @@ public class ErrorLogEntity extends CommonCreateEntity {
|
||||
|
||||
private String errorCode;
|
||||
private String errorMessage;
|
||||
|
||||
@Column(columnDefinition = "TEXT")
|
||||
private String stackTrace;
|
||||
|
||||
private Long handlerUid;
|
||||
private ZonedDateTime handledDttm;
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import jakarta.persistence.SequenceGenerator;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import java.time.Instant;
|
||||
import java.time.ZonedDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
|
||||
@@ -60,14 +61,14 @@ public class MapSheetAnalDataGeomEntity {
|
||||
@Column(name = "data_uid")
|
||||
private Long dataUid;
|
||||
|
||||
@Column(name = "created_dttm", columnDefinition = "TIMESTAMP WITH TIME ZONE")
|
||||
private Instant createdDttm;
|
||||
@Column(name = "created_dttm")
|
||||
private ZonedDateTime createdDttm;
|
||||
|
||||
@Column(name = "created_uid")
|
||||
private Long createdUid;
|
||||
|
||||
@Column(name = "updated_dttm", columnDefinition = "TIMESTAMP WITH TIME ZONE")
|
||||
private Instant updatedDttm;
|
||||
@Column(name = "updated_dttm")
|
||||
private ZonedDateTime updatedDttm;
|
||||
@Column(name = "updated_uid")
|
||||
private Long updatedUid;
|
||||
|
||||
|
||||
@@ -9,6 +9,7 @@ import jakarta.persistence.SequenceGenerator;
|
||||
import jakarta.persistence.Table;
|
||||
import jakarta.validation.constraints.Size;
|
||||
import java.time.Instant;
|
||||
import java.time.ZonedDateTime;
|
||||
import lombok.Getter;
|
||||
import lombok.Setter;
|
||||
import org.hibernate.annotations.ColumnDefault;
|
||||
@@ -42,10 +43,10 @@ public class MapSheetAnalEntity {
|
||||
private String analMapSheet;
|
||||
|
||||
@Column(name = "anal_strt_dttm")
|
||||
private Instant analStrtDttm;
|
||||
private ZonedDateTime analStrtDttm;
|
||||
|
||||
@Column(name = "anal_end_dttm")
|
||||
private Instant analEndDttm;
|
||||
private ZonedDateTime analEndDttm;
|
||||
|
||||
@Column(name = "anal_ss")
|
||||
private Integer analSs;
|
||||
@@ -67,14 +68,14 @@ public class MapSheetAnalEntity {
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "created_dttm")
|
||||
private Instant createdDttm;
|
||||
private ZonedDateTime createdDttm;
|
||||
|
||||
@Column(name = "created_uid")
|
||||
private Long createdUid;
|
||||
|
||||
@ColumnDefault("now()")
|
||||
@Column(name = "updated_dttm")
|
||||
private Instant updatedDttm;
|
||||
private ZonedDateTime updatedDttm;
|
||||
|
||||
@Column(name = "updated_uid")
|
||||
private Long updatedUid;
|
||||
|
||||
Reference in New Issue
Block a user