diff --git a/frontend/src/api/batchApi.ts b/frontend/src/api/batchApi.ts index 07a133c..fb9e6b2 100644 --- a/frontend/src/api/batchApi.ts +++ b/frontend/src/api/batchApi.ts @@ -432,14 +432,6 @@ export const batchApi = { resetCollectionPeriod: (apiKey: string) => postJson<{ success: boolean; message: string }>(`${BASE}/collection-periods/${apiKey}/reset`), - updateCollectionPeriod: (apiKey: string, body: { rangeFromDate: string; rangeToDate: string }) => { - return fetch(`${BASE}/collection-periods/${apiKey}`, { - method: 'PUT', - headers: { 'Content-Type': 'application/json' }, - body: JSON.stringify(body), - }).then(async (res) => { - if (!res.ok) throw new Error(`API Error: ${res.status} ${res.statusText}`); - return res.json() as Promise<{ success: boolean; message: string }>; - }); - }, + updateCollectionPeriod: (apiKey: string, body: { rangeFromDate: string; rangeToDate: string }) => + postJson<{ success: boolean; message: string }>(`${BASE}/collection-periods/${apiKey}/update`, body), }; diff --git a/src/main/java/com/snp/batch/global/controller/BatchController.java b/src/main/java/com/snp/batch/global/controller/BatchController.java index e112227..52cb2a6 100644 --- a/src/main/java/com/snp/batch/global/controller/BatchController.java +++ b/src/main/java/com/snp/batch/global/controller/BatchController.java @@ -523,7 +523,7 @@ public class BatchController { } @Operation(summary = "수집 기간 수정", description = "특정 API의 수집 기간을 수정합니다") - @PutMapping("/collection-periods/{apiKey}") + @PostMapping("/collection-periods/{apiKey}/update") public ResponseEntity> updateCollectionPeriod( @Parameter(description = "API Key") @PathVariable String apiKey, @RequestBody Map request) { diff --git a/src/main/java/com/snp/batch/global/controller/WebViewController.java b/src/main/java/com/snp/batch/global/controller/WebViewController.java index 2d427f3..9edcf90 100644 --- a/src/main/java/com/snp/batch/global/controller/WebViewController.java +++ b/src/main/java/com/snp/batch/global/controller/WebViewController.java @@ -13,7 +13,8 @@ import org.springframework.web.bind.annotation.GetMapping; public class WebViewController { @GetMapping({"/", "/jobs", "/executions", "/executions/{id:\\d+}", - "/execution-detail", "/schedules", "/schedule-timeline"}) + "/recollects", "/recollects/{id:\\d+}", + "/schedules", "/schedule-timeline"}) public String forward() { return "forward:/index.html"; } diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipLastPositionUpdateJobConfig.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipLastPositionUpdateJobConfig.java index 5c41930..4136ed3 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipLastPositionUpdateJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/config/ShipLastPositionUpdateJobConfig.java @@ -31,7 +31,7 @@ public class ShipLastPositionUpdateJobConfig extends BaseJobConfig } private String getTargetTable(){ - return targetSchema + ".core20"; + return targetSchema + ".tb_ship_main_info"; } private String getImoQuery() { - return "SELECT lrno FROM " + getTargetTable() + " ORDER BY lrno"; + return "SELECT imo_no FROM " + getTargetTable() + " ORDER BY imo_no"; } @Override diff --git a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java index 83ba09f..6c8673e 100644 --- a/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/shipdetail/batch/repository/ShipLastPositionRepositoryImpl.java @@ -17,10 +17,10 @@ import java.util.List; @Repository("shipLastPositionRepository") public class ShipLastPositionRepositoryImpl extends BaseJdbcRepository implements ShipLastPositionRepository { - @Value("${app.batch.target-schema.name}") + @Value("${app.batch.service-schema.name}") private String targetSchema; - @Value("${app.batch.target-schema.tables.ship-027}") + @Value("${app.batch.service-schema.tables.service-001}") private String tableName; public ShipLastPositionRepositoryImpl(JdbcTemplate jdbcTemplate) { @@ -56,21 +56,21 @@ public class ShipLastPositionRepositoryImpl extends BaseJdbcRepository