diff --git a/.gitignore b/.gitignore index 30c4fea..3c3e1a0 100644 --- a/.gitignore +++ b/.gitignore @@ -71,3 +71,4 @@ application-local.yml frontend/node/ frontend/node_modules/ src/main/resources/static/ +logs/ diff --git a/docs/RELEASE-NOTES.md b/docs/RELEASE-NOTES.md new file mode 100644 index 0000000..7cc8034 --- /dev/null +++ b/docs/RELEASE-NOTES.md @@ -0,0 +1,24 @@ +# Release Notes + +이 문서는 [Keep a Changelog](https://keepachangelog.com/ko/1.0.0/) 형식을 따릅니다. + +## [Unreleased] + +### 추가 +- 동기화 현황 메뉴 추가: 도메인 탭 + 테이블 아코디언 + 인라인 데이터 조회 (#1) +- SyncStatusService: batch_flag 기반 테이블별 N/P/S 집계 (병렬 조회) +- P 상태 고착 레코드 조회 및 P→N 리셋 기능 + +### 변경 +- BaseSyncReader 추출: 49개 Reader 공통 로직 통합, 1 chunk = 1 job_execution_id 보장 +- chunk 경계 제어를 GroupByExecutionIdPolicy에서 Reader 자체 제어로 변경 +- BatchWriteListener: SQL을 실행 시점에 생성하여 SOURCE_SCHEMA null 문제 해결 + +### 수정 +- batch_flag P 상태 고착 버그 수정 (Reader의 N→P 전환 시점 분리) +- BatchWriteListener SQL null 참조 수정 (빈 생성 시 → 실행 시 지연 생성) + +### 기타 +- .gitignore에 logs/ 추가 +- application-dev.yml chunk-size, sub-chunk-size 설정 추가 +- Repository 배치 삽입 로그 주석처리 diff --git a/frontend/src/App.tsx b/frontend/src/App.tsx index 276ee30..aad83e0 100644 --- a/frontend/src/App.tsx +++ b/frontend/src/App.tsx @@ -12,6 +12,7 @@ const Executions = lazy(() => import('./pages/Executions')); const ExecutionDetail = lazy(() => import('./pages/ExecutionDetail')); const Schedules = lazy(() => import('./pages/Schedules')); const Timeline = lazy(() => import('./pages/Timeline')); +const SyncStatus = lazy(() => import('./pages/SyncStatus')); function AppLayout() { const { toasts, removeToast } = useToastContext(); @@ -28,6 +29,7 @@ function AppLayout() { } /> } /> } /> + } /> diff --git a/frontend/src/api/batchApi.ts b/frontend/src/api/batchApi.ts index 869b470..03b247e 100644 --- a/frontend/src/api/batchApi.ts +++ b/frontend/src/api/batchApi.ts @@ -273,6 +273,48 @@ export interface ExecutionStatisticsDto { avgDurationMs: number; } +// ── Sync Status ───────────────────────────────────────────── + +export interface SyncStatusSummary { + totalTables: number; + pendingCount: number; + processingCount: number; + completedCount: number; + stuckTables: number; +} + +export interface SyncTableStatus { + tableKey: string; + sourceTable: string; + targetTable: string; + domain: string; + pendingCount: number; + processingCount: number; + completedCount: number; + lastSyncTime: string | null; + stuck: boolean; +} + +export interface SyncDomainGroup { + domain: string; + domainLabel: string; + tables: SyncTableStatus[]; +} + +export interface SyncStatusResponse { + summary: SyncStatusSummary; + domains: SyncDomainGroup[]; +} + +export interface SyncDataPreviewResponse { + tableKey: string; + targetTable: string; + targetSchema: string; + columns: string[]; + rows: Record[]; + totalCount: number; +} + // ── API Functions ──────────────────────────────────────────── export const batchApi = { @@ -399,4 +441,18 @@ export const batchApi = { resetRetryCount: (ids: number[]) => postJson<{ success: boolean; message: string; resetCount?: number }>( `${BASE}/failed-records/reset-retry`, { ids }), + + // Sync Status + getSyncStatus: () => + fetchJson(`${BASE}/sync-status`), + + getSyncDataPreview: (tableKey: string, limit = 10) => + fetchJson(`${BASE}/sync-status/${tableKey}/preview?limit=${limit}`), + + getStuckRecords: (tableKey: string, limit = 50) => + fetchJson(`${BASE}/sync-status/${tableKey}/stuck?limit=${limit}`), + + resetStuckRecords: (tableKey: string) => + postJson<{ success: boolean; message: string; resetCount?: number }>( + `${BASE}/sync-status/${tableKey}/reset`), }; diff --git a/frontend/src/components/Navbar.tsx b/frontend/src/components/Navbar.tsx index 663baca..d1007cf 100644 --- a/frontend/src/components/Navbar.tsx +++ b/frontend/src/components/Navbar.tsx @@ -7,6 +7,7 @@ const navItems = [ { path: '/jobs', label: '작업', icon: '⚙️' }, { path: '/schedules', label: '스케줄', icon: '🕐' }, { path: '/schedule-timeline', label: '타임라인', icon: '📅' }, + { path: '/sync-status', label: '동기화 현황', icon: '🔄' }, ]; export default function Navbar() { diff --git a/frontend/src/components/StuckRecordsModal.tsx b/frontend/src/components/StuckRecordsModal.tsx new file mode 100644 index 0000000..5e9f0cb --- /dev/null +++ b/frontend/src/components/StuckRecordsModal.tsx @@ -0,0 +1,127 @@ +import { useState, useEffect } from 'react'; +import { batchApi, type SyncDataPreviewResponse } from '../api/batchApi'; +import LoadingSpinner from './LoadingSpinner'; + +interface Props { + open: boolean; + tableKey: string; + tableName: string; + onClose: () => void; + onReset: () => void; +} + +export default function StuckRecordsModal({ open, tableKey, tableName, onClose, onReset }: Props) { + const [data, setData] = useState(null); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(null); + + useEffect(() => { + if (!open || !tableKey) return; + setLoading(true); + setError(null); + batchApi.getStuckRecords(tableKey, 50) + .then(setData) + .catch((e) => setError(e.message)) + .finally(() => setLoading(false)); + }, [open, tableKey]); + + if (!open) return null; + + return ( +
+
e.stopPropagation()} + > + {/* Header */} +
+
+
+ ⚠️ +

P 상태 고착 레코드

+
+

+ {tableName} + {data ? ` | ${data.targetSchema}.${data.targetTable} | 총 ${data.totalCount.toLocaleString()}건 고착` : ''} +

+
+
+ {data && data.totalCount > 0 && ( + + )} + +
+
+ + {/* Body */} +
+ {loading && } + {error && ( +
조회 실패: {error}
+ )} + {!loading && !error && data && data.rows.length === 0 && ( +
P 상태 레코드가 없습니다
+ )} + {!loading && !error && data && data.rows.length > 0 && ( +
+ + + + {data.columns.map((col) => ( + + ))} + + + + {data.rows.map((row, idx) => ( + + {data.columns.map((col) => ( + + ))} + + ))} + +
+ {col} +
+ {formatCellValue(row[col])} +
+
+ )} +
+ + {/* Footer */} + {data && data.rows.length > 0 && ( +
+ {data.rows.length}건 표시 (전체 {data.totalCount.toLocaleString()}건) + 리셋 시 batch_flag가 P→N으로 변경되어 다음 동기화에 재처리됩니다 +
+ )} +
+
+ ); +} + +function formatCellValue(value: unknown): string { + if (value === null || value === undefined) return '-'; + if (typeof value === 'object') return JSON.stringify(value); + return String(value); +} diff --git a/frontend/src/components/SyncDataPreviewModal.tsx b/frontend/src/components/SyncDataPreviewModal.tsx new file mode 100644 index 0000000..9e0d9ee --- /dev/null +++ b/frontend/src/components/SyncDataPreviewModal.tsx @@ -0,0 +1,108 @@ +import { useState, useEffect } from 'react'; +import { batchApi, type SyncDataPreviewResponse } from '../api/batchApi'; +import LoadingSpinner from './LoadingSpinner'; + +interface Props { + open: boolean; + tableKey: string; + tableName: string; + onClose: () => void; +} + +export default function SyncDataPreviewModal({ open, tableKey, tableName, onClose }: Props) { + const [data, setData] = useState(null); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(null); + + useEffect(() => { + if (!open || !tableKey) return; + setLoading(true); + setError(null); + batchApi.getSyncDataPreview(tableKey, 10) + .then(setData) + .catch((e) => setError(e.message)) + .finally(() => setLoading(false)); + }, [open, tableKey]); + + if (!open) return null; + + return ( +
+
e.stopPropagation()} + > + {/* Header */} +
+
+

{tableName}

+

+ {data ? `${data.targetSchema}.${data.targetTable} | 총 ${data.totalCount.toLocaleString()}건` : ''} +

+
+ +
+ + {/* Body */} +
+ {loading && } + {error && ( +
+

조회 실패: {error}

+
+ )} + {!loading && !error && data && data.rows.length === 0 && ( +
데이터가 없습니다
+ )} + {!loading && !error && data && data.rows.length > 0 && ( +
+ + + + {data.columns.map((col) => ( + + ))} + + + + {data.rows.map((row, idx) => ( + + {data.columns.map((col) => ( + + ))} + + ))} + +
+ {col} +
+ {formatCellValue(row[col])} +
+
+ )} +
+ + {/* Footer */} + {data && data.rows.length > 0 && ( +
+ 최근 {data.rows.length}건 표시 (전체 {data.totalCount.toLocaleString()}건) +
+ )} +
+
+ ); +} + +function formatCellValue(value: unknown): string { + if (value === null || value === undefined) return '-'; + if (typeof value === 'object') return JSON.stringify(value); + return String(value); +} diff --git a/frontend/src/pages/SyncStatus.tsx b/frontend/src/pages/SyncStatus.tsx new file mode 100644 index 0000000..4c016c1 --- /dev/null +++ b/frontend/src/pages/SyncStatus.tsx @@ -0,0 +1,393 @@ +import { useState, useCallback, useEffect } from 'react'; +import { + batchApi, + type SyncStatusResponse, + type SyncTableStatus, + type SyncDataPreviewResponse, +} from '../api/batchApi'; +import { usePoller } from '../hooks/usePoller'; +import { useToastContext } from '../contexts/ToastContext'; +import LoadingSpinner from '../components/LoadingSpinner'; +import EmptyState from '../components/EmptyState'; +import ConfirmModal from '../components/ConfirmModal'; +import GuideModal, { HelpButton } from '../components/GuideModal'; + +const POLLING_INTERVAL = 30000; + +const DOMAIN_ICONS: Record = { + ship: '🚢', + company: '🏢', + event: '⚠️', + facility: '🏭', + psc: '🔍', + movements: '📍', + code: '🏷️', + 'risk-compliance': '🛡️', +}; + +const GUIDE_ITEMS = [ + { + title: '도메인 탭', + content: 'Ship, PSC 등 도메인별로 테이블을 그룹핑하여 조회합니다.\nP 고착 테이블이 있는 도메인에는 경고 뱃지가 표시됩니다.', + }, + { + title: '테이블 아코디언', + content: '각 테이블을 펼치면 대기(N)/진행(P)/완료(S) 건수와 상세 데이터를 확인할 수 있습니다.\n⚠️ 표시는 P 상태에 고착된 레코드가 있음을 의미합니다.', + }, + { + title: '동기화 데이터 / P 상태 레코드', + content: '동기화 데이터 탭: 타겟 스키마(std_snp_svc)의 최근 동기화 데이터를 보여줍니다.\nP 상태 레코드 탭: Writer 실패로 P 상태에 멈춘 레코드를 확인하고 리셋할 수 있습니다.', + }, +]; + +export default function SyncStatus() { + const { showToast } = useToastContext(); + const [data, setData] = useState(null); + const [loading, setLoading] = useState(true); + const [guideOpen, setGuideOpen] = useState(false); + + // Tab & accordion state + const [activeDomain, setActiveDomain] = useState('ship'); + const [expandedTable, setExpandedTable] = useState('ship-001'); + const [detailTabs, setDetailTabs] = useState>({}); + + // Reset confirm + const [resetTableKey, setResetTableKey] = useState(''); + const [resetConfirmOpen, setResetConfirmOpen] = useState(false); + const [resetting, setResetting] = useState(false); + + const loadData = useCallback(async () => { + try { + const result = await batchApi.getSyncStatus(); + setData(result); + } catch { + if (loading) showToast('동기화 현황 조회 실패', 'error'); + } finally { + setLoading(false); + } + // eslint-disable-next-line react-hooks/exhaustive-deps + }, []); + + usePoller(loadData, POLLING_INTERVAL); + + const toggleAccordion = (tableKey: string) => { + setExpandedTable((prev) => (prev === tableKey ? '' : tableKey)); + }; + + const getDetailTab = (tableKey: string) => detailTabs[tableKey] || 'preview'; + const setDetailTab = (tableKey: string, tab: 'preview' | 'stuck') => { + setDetailTabs((prev) => ({ ...prev, [tableKey]: tab })); + }; + + const handleReset = async () => { + setResetting(true); + try { + const result = await batchApi.resetStuckRecords(resetTableKey); + const allTables = data?.domains.flatMap((d) => d.tables) ?? []; + const table = allTables.find((t) => t.tableKey === resetTableKey); + showToast(`${table?.sourceTable ?? resetTableKey}: ${result.resetCount}건 리셋 완료`, 'success'); + setResetConfirmOpen(false); + loadData(); + } catch { + showToast('리셋 실패', 'error'); + } finally { + setResetting(false); + } + }; + + const activeDomainGroup = data?.domains.find((d) => d.domain === activeDomain); + const resetTable = data?.domains.flatMap((d) => d.tables).find((t) => t.tableKey === resetTableKey); + + if (loading) return ; + if (!data) return ; + + return ( +
+ {/* Header */} +
+

동기화 현황

+ setGuideOpen(true)} /> +
+ + {/* ── Domain Tabs ── */} +
+ {data.domains.map((d) => { + const stuckCount = d.tables.filter((t) => t.stuck).length; + return ( + + ); + })} +
+ + {/* ── Table Accordions ── */} + {activeDomainGroup && ( +
+ {activeDomainGroup.tables.map((table) => ( + toggleAccordion(table.tableKey)} + onDetailTabChange={(tab) => setDetailTab(table.tableKey, tab)} + onReset={() => { setResetTableKey(table.tableKey); setResetConfirmOpen(true); }} + /> + ))} +
+ )} + + {/* Reset Confirm Modal */} + setResetConfirmOpen(false)} + /> + + setGuideOpen(false)} + /> +
+ ); +} + +// ── Sub Components ──────────────────────────────────────────── + +interface TableAccordionProps { + table: SyncTableStatus; + expanded: boolean; + detailTab: 'preview' | 'stuck'; + onToggle: () => void; + onDetailTabChange: (tab: 'preview' | 'stuck') => void; + onReset: () => void; +} + +function TableAccordion({ table, expanded, detailTab, onToggle, onDetailTabChange, onReset }: TableAccordionProps) { + return ( +
+ {/* Accordion header */} + + + {/* Accordion body */} + {expanded && ( +
+ {/* Stats row */} +
+ + + +
+

최근 동기화

+

{formatRelativeTime(table.lastSyncTime)}

+
+
+ + {/* Detail sub-tabs */} +
+
+ + +
+ {detailTab === 'stuck' && table.stuck && ( + + )} +
+ + {/* Tab content */} + {detailTab === 'preview' && ( + + )} + {detailTab === 'stuck' && ( + + )} +
+ )} +
+ ); +} + +interface MiniStatProps { + label: string; + value: number; + color: string; + warn?: boolean; +} + +function MiniStat({ label, value, color, warn }: MiniStatProps) { + return ( +
+

{label}

+

+ {value.toLocaleString()} + {warn && 고착} +

+
+ ); +} + +interface InlineDataTableProps { + tableKey: string; + fetchFn: (tableKey: string, limit: number) => Promise; +} + +function InlineDataTable({ tableKey, fetchFn }: InlineDataTableProps) { + const [data, setData] = useState(null); + const [loading, setLoading] = useState(false); + const [error, setError] = useState(null); + + useEffect(() => { + setLoading(true); + setError(null); + setData(null); + fetchFn(tableKey, 20) + .then(setData) + .catch((e) => setError(e.message)) + .finally(() => setLoading(false)); + }, [tableKey, fetchFn]); + + if (loading) return
; + if (error) return
조회 실패: {error}
; + if (!data || data.rows.length === 0) { + return
데이터가 없습니다
; + } + + return ( +
+
+ + + + {data.columns.map((col) => ( + + ))} + + + + {data.rows.map((row, idx) => ( + + {data.columns.map((col) => ( + + ))} + + ))} + +
+ {col} +
+ {formatCellValue(row[col])} +
+
+

+ {data.rows.length}건 표시 (전체 {data.totalCount.toLocaleString()}건) · {data.targetSchema}.{data.targetTable} +

+
+ ); +} + +function formatCellValue(value: unknown): string { + if (value === null || value === undefined) return '-'; + if (typeof value === 'object') return JSON.stringify(value); + return String(value); +} + +function formatRelativeTime(dateStr: string | null): string { + if (!dateStr) return '-'; + try { + const date = new Date(dateStr); + if (isNaN(date.getTime())) return '-'; + const now = new Date(); + const diffMs = now.getTime() - date.getTime(); + const diffMin = Math.floor(diffMs / 60000); + if (diffMin < 1) return '방금 전'; + if (diffMin < 60) return `${diffMin}분 전`; + const diffHour = Math.floor(diffMin / 60); + if (diffHour < 24) return `${diffHour}시간 전`; + const diffDay = Math.floor(diffHour / 24); + return `${diffDay}일 전`; + } catch { + return '-'; + } +} diff --git a/src/main/java/com/snp/batch/common/batch/config/BaseJobConfig.java b/src/main/java/com/snp/batch/common/batch/config/BaseJobConfig.java index bace6af..ba87605 100644 --- a/src/main/java/com/snp/batch/common/batch/config/BaseJobConfig.java +++ b/src/main/java/com/snp/batch/common/batch/config/BaseJobConfig.java @@ -94,7 +94,7 @@ public abstract class BaseJobConfig { if (processor != null) { var chunkBuilder = stepBuilder - .chunk(getChunkSize(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(processor) .writer(createWriter()); @@ -104,7 +104,7 @@ public abstract class BaseJobConfig { } else { @SuppressWarnings("unchecked") var chunkBuilder = stepBuilder - .chunk(getChunkSize(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .writer((ItemWriter) createWriter()); diff --git a/src/main/java/com/snp/batch/common/batch/processor/BaseProcessor.java b/src/main/java/com/snp/batch/common/batch/processor/BaseProcessor.java index 0add9cc..a9ad40c 100644 --- a/src/main/java/com/snp/batch/common/batch/processor/BaseProcessor.java +++ b/src/main/java/com/snp/batch/common/batch/processor/BaseProcessor.java @@ -55,7 +55,7 @@ public abstract class BaseProcessor implements ItemProcessor { return null; } - log.debug("데이터 처리 중: {}", item); +// log.debug("데이터 처리 중: {}", item); return processItem(item); } } diff --git a/src/main/java/com/snp/batch/common/batch/reader/BaseSyncReader.java b/src/main/java/com/snp/batch/common/batch/reader/BaseSyncReader.java new file mode 100644 index 0000000..7e47ecd --- /dev/null +++ b/src/main/java/com/snp/batch/common/batch/reader/BaseSyncReader.java @@ -0,0 +1,98 @@ +package com.snp.batch.common.batch.reader; + +import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.util.JobExecutionGroupable; +import com.snp.batch.common.util.TableMetaInfo; +import lombok.extern.slf4j.Slf4j; +import org.springframework.batch.item.ItemReader; +import org.springframework.jdbc.core.JdbcTemplate; + +import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; + +/** + * 동기화 Reader 추상 클래스 + * + * 1 chunk = 1 job_execution_id 보장: + * - 한 그룹의 데이터를 모두 반환한 후 null을 반환하여 청크 종료 + * - chunk(Integer.MAX_VALUE)와 함께 사용하여 Reader가 청크 경계를 제어 + * - 다음 그룹의 N→P 전환은 이전 그룹의 청크 처리(Write + P→S)가 완료된 후에만 발생 + * + * @param DTO 타입 (JobExecutionGroupable 구현 필요) + */ +@Slf4j +public abstract class BaseSyncReader implements ItemReader { + + protected final TableMetaInfo tableMetaInfo; + protected final JdbcTemplate businessJdbcTemplate; + + private List allDataBuffer = new ArrayList<>(); + private Long currentGroupId = null; + + protected BaseSyncReader(DataSource businessDataSource, TableMetaInfo tableMetaInfo) { + this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); + this.tableMetaInfo = tableMetaInfo; + } + + /** + * 소스 테이블명 반환 (예: tableMetaInfo.sourceIceClass) + */ + protected abstract String getSourceTable(); + + /** + * ResultSet → DTO 매핑 + */ + protected abstract T mapRow(ResultSet rs, Long targetId) throws SQLException; + + protected String getLogPrefix() { + return getClass().getSimpleName(); + } + + @Override + public T read() throws Exception { + if (allDataBuffer.isEmpty()) { + // 이전 그룹 처리 완료 → null 반환하여 청크 종료 + // (Writer + afterWrite(P→S)가 실행된 후 다음 청크에서 다음 그룹 로드) + if (currentGroupId != null) { + currentGroupId = null; + return null; + } + + // 다음 그룹 로드 + fetchNextGroup(); + } + + if (allDataBuffer.isEmpty()) { + return null; // 더 이상 처리할 데이터 없음 → Step 종료 + } + + return allDataBuffer.remove(0); + } + + private void fetchNextGroup() { + Long nextTargetId; + try { + nextTargetId = businessJdbcTemplate.queryForObject( + CommonSql.getNextTargetQuery(getSourceTable()), Long.class); + } catch (Exception e) { + return; + } + + if (nextTargetId == null) return; + + log.info("[{}] 다음 처리 대상 ID 발견: {}", getLogPrefix(), nextTargetId); + + String sql = CommonSql.getTargetDataQuery(getSourceTable()); + this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> + mapRow(rs, nextTargetId), nextTargetId); + + // N→P 전환 + String updateSql = CommonSql.getProcessBatchQuery(getSourceTable()); + businessJdbcTemplate.update(updateSql, nextTargetId); + + currentGroupId = nextTargetId; + } +} diff --git a/src/main/java/com/snp/batch/common/batch/repository/BaseJdbcRepository.java b/src/main/java/com/snp/batch/common/batch/repository/BaseJdbcRepository.java index 76b0a5a..bf5797b 100644 --- a/src/main/java/com/snp/batch/common/batch/repository/BaseJdbcRepository.java +++ b/src/main/java/com/snp/batch/common/batch/repository/BaseJdbcRepository.java @@ -203,7 +203,7 @@ public abstract class BaseJdbcRepository { return; } - log.debug("{} 배치 삽입 시작: {} 건", getEntityName(), entities.size()); + // log.debug("{} 배치 삽입 시작: {} 건", getEntityName(), entities.size()); jdbcTemplate.batchUpdate(getInsertSql(), entities, entities.size(), (ps, entity) -> { @@ -215,7 +215,7 @@ public abstract class BaseJdbcRepository { } }); - log.debug("{} 배치 삽입 완료: {} 건", getEntityName(), entities.size()); + // log.debug("{} 배치 삽입 완료: {} 건", getEntityName(), entities.size()); } /** diff --git a/src/main/java/com/snp/batch/common/batch/repository/MultiDataSourceJdbcRepository.java b/src/main/java/com/snp/batch/common/batch/repository/MultiDataSourceJdbcRepository.java index c83e1b8..5fd4235 100644 --- a/src/main/java/com/snp/batch/common/batch/repository/MultiDataSourceJdbcRepository.java +++ b/src/main/java/com/snp/batch/common/batch/repository/MultiDataSourceJdbcRepository.java @@ -78,7 +78,7 @@ public abstract class MultiDataSourceJdbcRepository { return; } - log.debug("{} 배치 삽입 시작: {} 건 (Business DB)", getEntityName(), entities.size()); + // log.debug("{} 배치 삽입 시작: {} 건 (Business DB)", getEntityName(), entities.size()); // ⭐ businessJdbcTemplate 사용 businessJdbcTemplate.batchUpdate(getInsertSql(), entities, entities.size(), @@ -91,7 +91,7 @@ public abstract class MultiDataSourceJdbcRepository { } }); - log.debug("{} 배치 삽입 완료: {} 건", getEntityName(), entities.size()); + // log.debug("{} 배치 삽입 완료: {} 건", getEntityName(), entities.size()); } // ... (나머지 find, save, update, delete 메서드도 businessJdbcTemplate을 사용하여 구현합니다.) diff --git a/src/main/java/com/snp/batch/common/util/BatchWriteListener.java b/src/main/java/com/snp/batch/common/util/BatchWriteListener.java index 86daf25..cc4ffbc 100644 --- a/src/main/java/com/snp/batch/common/util/BatchWriteListener.java +++ b/src/main/java/com/snp/batch/common/util/BatchWriteListener.java @@ -1,51 +1,55 @@ package com.snp.batch.common.util; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.batch.core.ItemWriteListener; import org.springframework.batch.item.Chunk; import org.springframework.jdbc.core.JdbcTemplate; +/** + * Writer 성공 후 batch_flag P→S 업데이트 리스너 + * + * SQL은 실행 시점에 생성 (CommonSql.SOURCE_SCHEMA 초기화 보장) + */ @Slf4j -@RequiredArgsConstructor public class BatchWriteListener implements ItemWriteListener { private final JdbcTemplate businessJdbcTemplate; - private final String updateSql; // 실행할 쿼리 (예: "UPDATE ... SET batch_flag = 'S' ...") + private final String sourceTable; + + public BatchWriteListener(JdbcTemplate businessJdbcTemplate, String sourceTable) { + this.businessJdbcTemplate = businessJdbcTemplate; + this.sourceTable = sourceTable; + } @Override public void afterWrite(Chunk items) { - // afterWrite는 Writer가 예외 없이 성공했을 때만 실행되는 것이 보장되어야 함 if (items.isEmpty()) return; Long jobExecutionId = items.getItems().get(0).getJobExecutionId(); try { - int updatedRows = businessJdbcTemplate.update(updateSql, jobExecutionId); + // SQL을 실행 시점에 생성하여 SOURCE_SCHEMA null 문제 방지 + String sql = CommonSql.getCompleteBatchQuery(sourceTable); + int updatedRows = businessJdbcTemplate.update(sql, jobExecutionId); log.info("[BatchWriteListener] Success update 'S'. jobExecutionId: {}, rows: {}", jobExecutionId, updatedRows); } catch (Exception e) { log.error("[BatchWriteListener] Update 'S' failed. jobExecutionId: {}", jobExecutionId, e); - // ❗중요: 리스너의 업데이트가 실패해도 배치를 중단시키려면 예외를 던져야 함 throw e; } } @Override public void onWriteError(Exception exception, Chunk items) { - // ⭐ Writer에서 에러가 발생하면 이 메서드가 호출됨 if (!items.isEmpty()) { Long jobExecutionId = items.getItems().get(0).getJobExecutionId(); log.error("[BatchWriteListener] Write Error Detected! jobExecutionId: {}. Status will NOT be updated to 'S'. Error: {}", jobExecutionId, exception.getMessage()); } - // ❗중요: 여기서 예외를 다시 던져야 배치가 중단(FAILED)됨 - // 만약 여기서 예외를 던지지 않으면 배치는 다음 청크를 계속 시도할 수 있음 if (exception instanceof RuntimeException) { throw (RuntimeException) exception; } else { throw new RuntimeException("Force stop batch due to write error", exception); } } - -} \ No newline at end of file +} diff --git a/src/main/java/com/snp/batch/global/config/BatchTableProperties.java b/src/main/java/com/snp/batch/global/config/BatchTableProperties.java new file mode 100644 index 0000000..aa95ea1 --- /dev/null +++ b/src/main/java/com/snp/batch/global/config/BatchTableProperties.java @@ -0,0 +1,26 @@ +package com.snp.batch.global.config; + +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +import java.util.LinkedHashMap; +import java.util.Map; + +@Getter +@Setter +@Component +@ConfigurationProperties(prefix = "app.batch") +public class BatchTableProperties { + + private SchemaConfig sourceSchema = new SchemaConfig(); + private SchemaConfig targetSchema = new SchemaConfig(); + + @Getter + @Setter + public static class SchemaConfig { + private String name; + private Map tables = new LinkedHashMap<>(); + } +} 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 5ddd26e..a7eb9b0 100644 --- a/src/main/java/com/snp/batch/global/controller/BatchController.java +++ b/src/main/java/com/snp/batch/global/controller/BatchController.java @@ -3,8 +3,11 @@ package com.snp.batch.global.controller; import com.snp.batch.global.dto.JobExecutionDto; import com.snp.batch.global.dto.ScheduleRequest; import com.snp.batch.global.dto.ScheduleResponse; +import com.snp.batch.global.dto.SyncDataPreviewResponse; +import com.snp.batch.global.dto.SyncStatusResponse; import com.snp.batch.service.BatchService; import com.snp.batch.service.ScheduleService; +import com.snp.batch.service.SyncStatusService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -27,6 +30,7 @@ public class BatchController { private final BatchService batchService; private final ScheduleService scheduleService; + private final SyncStatusService syncStatusService; @Operation(summary = "배치 작업 실행", description = "지정된 배치 작업을 즉시 실행합니다. 쿼리 파라미터로 Job Parameters 전달 가능") @ApiResponses(value = { @@ -324,4 +328,84 @@ public class BatchController { com.snp.batch.global.dto.ExecutionStatisticsDto stats = batchService.getJobStatistics(jobName, days); return ResponseEntity.ok(stats); } + + // ── 동기화 현황 API ────────────────────────────────────────── + + @Operation(summary = "동기화 현황 조회", description = "전체 테이블의 batch_flag 기반 동기화 현황을 조회합니다") + @GetMapping("/sync-status") + public ResponseEntity getSyncStatus() { + log.info("Received request to get sync status"); + try { + SyncStatusResponse status = syncStatusService.getSyncStatus(); + return ResponseEntity.ok(status); + } catch (Exception e) { + log.error("Error getting sync status", e); + return ResponseEntity.internalServerError().build(); + } + } + + @Operation(summary = "동기화 데이터 미리보기", description = "특정 테이블의 최근 동기화 성공 데이터를 조회합니다") + @GetMapping("/sync-status/{tableKey}/preview") + public ResponseEntity getSyncDataPreview( + @Parameter(description = "테이블 키 (예: ship-001)", required = true) + @PathVariable String tableKey, + @Parameter(description = "조회 건수", example = "10") + @RequestParam(defaultValue = "10") int limit) { + log.info("Received request to preview sync data for: {}", tableKey); + try { + SyncDataPreviewResponse preview = syncStatusService.getDataPreview(tableKey, limit); + return ResponseEntity.ok(preview); + } catch (IllegalArgumentException e) { + return ResponseEntity.badRequest().build(); + } catch (Exception e) { + log.error("Error getting sync data preview for: {}", tableKey, e); + return ResponseEntity.internalServerError().build(); + } + } + + @Operation(summary = "P 상태 고착 레코드 조회", description = "특정 테이블의 batch_flag='P' 고착 레코드를 조회합니다") + @GetMapping("/sync-status/{tableKey}/stuck") + public ResponseEntity getStuckRecords( + @Parameter(description = "테이블 키 (예: ship-001)", required = true) + @PathVariable String tableKey, + @Parameter(description = "조회 건수", example = "50") + @RequestParam(defaultValue = "50") int limit) { + log.info("Received request to get stuck records for: {}", tableKey); + try { + SyncDataPreviewResponse stuck = syncStatusService.getStuckRecords(tableKey, limit); + return ResponseEntity.ok(stuck); + } catch (IllegalArgumentException e) { + return ResponseEntity.badRequest().build(); + } catch (Exception e) { + log.error("Error getting stuck records for: {}", tableKey, e); + return ResponseEntity.internalServerError().build(); + } + } + + @Operation(summary = "P 상태 고착 레코드 리셋", description = "특정 테이블의 batch_flag='P' 레코드를 'N'으로 리셋합니다") + @PostMapping("/sync-status/{tableKey}/reset") + public ResponseEntity> resetStuckRecords( + @Parameter(description = "테이블 키 (예: ship-001)", required = true) + @PathVariable String tableKey) { + log.info("Received request to reset stuck records for: {}", tableKey); + try { + int resetCount = syncStatusService.resetStuckRecords(tableKey); + return ResponseEntity.ok(Map.of( + "success", true, + "message", "P→N 리셋 완료", + "resetCount", resetCount + )); + } catch (IllegalArgumentException e) { + return ResponseEntity.badRequest().body(Map.of( + "success", false, + "message", e.getMessage() + )); + } catch (Exception e) { + log.error("Error resetting stuck records for: {}", tableKey, e); + return ResponseEntity.internalServerError().body(Map.of( + "success", false, + "message", "리셋 실패: " + e.getMessage() + )); + } + } } 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 a30ac55..ac5f27d 100644 --- a/src/main/java/com/snp/batch/global/controller/WebViewController.java +++ b/src/main/java/com/snp/batch/global/controller/WebViewController.java @@ -13,9 +13,9 @@ import org.springframework.web.bind.annotation.GetMapping; public class WebViewController { @GetMapping({"/", "/jobs", "/executions", "/executions/{id:\\d+}", - "/schedules", "/schedule-timeline", + "/schedules", "/schedule-timeline", "/sync-status", "/jobs/**", "/executions/**", - "/schedules/**", "/schedule-timeline/**"}) + "/schedules/**", "/schedule-timeline/**", "/sync-status/**"}) public String forward() { return "forward:/index.html"; } diff --git a/src/main/java/com/snp/batch/global/dto/SyncDataPreviewResponse.java b/src/main/java/com/snp/batch/global/dto/SyncDataPreviewResponse.java new file mode 100644 index 0000000..bfdcc94 --- /dev/null +++ b/src/main/java/com/snp/batch/global/dto/SyncDataPreviewResponse.java @@ -0,0 +1,26 @@ +package com.snp.batch.global.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.List; +import java.util.Map; + +/** + * 동기화 성공 데이터 미리보기 응답 + */ +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SyncDataPreviewResponse { + + private String tableKey; + private String targetTable; + private String targetSchema; + private List columns; + private List> rows; + private long totalCount; +} diff --git a/src/main/java/com/snp/batch/global/dto/SyncStatusResponse.java b/src/main/java/com/snp/batch/global/dto/SyncStatusResponse.java new file mode 100644 index 0000000..e2618a6 --- /dev/null +++ b/src/main/java/com/snp/batch/global/dto/SyncStatusResponse.java @@ -0,0 +1,59 @@ +package com.snp.batch.global.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 동기화 현황 전체 응답 + */ +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SyncStatusResponse { + + private SyncStatusSummary summary; + private List domains; + + @Getter + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class SyncStatusSummary { + private int totalTables; + private long pendingCount; + private long processingCount; + private long completedCount; + private int stuckTables; + } + + @Getter + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class SyncDomainGroup { + private String domain; + private String domainLabel; + private List tables; + } + + @Getter + @Builder + @NoArgsConstructor + @AllArgsConstructor + public static class SyncTableStatus { + private String tableKey; + private String sourceTable; + private String targetTable; + private String domain; + private long pendingCount; + private long processingCount; + private long completedCount; + private String lastSyncTime; + private boolean stuck; + } +} diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/code/config/CodeSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/code/config/CodeSyncJobConfig.java index 9d61e74..815c89b 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/code/config/CodeSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/code/config/CodeSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.code.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.code.dto.FlagCodeDto; import com.snp.batch.jobs.datasync.batch.code.dto.Stat5CodeDto; @@ -113,14 +110,12 @@ public class CodeSyncJobConfig extends BaseJobConfig flagCodeWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceFlagCode); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceFlagCode); } @Bean public BatchWriteListener stat5CodeWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceStat5Code); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceStat5Code); } // --- Steps --- @@ -129,12 +124,10 @@ public class CodeSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(flagCodeWriteListener()) .build(); } @@ -143,12 +136,10 @@ public class CodeSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(stat5CodeReader(businessDataSource, tableMetaInfo)) .processor(new Stat5CodeProcessor()) .writer(new Stat5CodeWriter(codeRepository)) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(stat5CodeWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/FlagCodeReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/FlagCodeReader.java index 0062535..e5702e6 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/FlagCodeReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/FlagCodeReader.java @@ -1,68 +1,36 @@ package com.snp.batch.jobs.datasync.batch.code.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.code.dto.FlagCodeDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class FlagCodeReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class FlagCodeReader extends BaseSyncReader { public FlagCodeReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public FlagCodeDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceFlagCode; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceFlagCode), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[FlagCodeReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceFlagCode); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return FlagCodeDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .shipCountryCd(rs.getString("ship_country_cd")) - .cdNm(rs.getString("cd_nm")) - .isoTwoCd(rs.getString("iso_two_cd")) - .isoThrCd(rs.getString("iso_thr_cd")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceFlagCode); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected FlagCodeDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return FlagCodeDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .shipCountryCd(rs.getString("ship_country_cd")) + .cdNm(rs.getString("cd_nm")) + .isoTwoCd(rs.getString("iso_two_cd")) + .isoThrCd(rs.getString("iso_thr_cd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/Stat5CodeReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/Stat5CodeReader.java index 29020cd..d149fc5 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/Stat5CodeReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/code/reader/Stat5CodeReader.java @@ -1,75 +1,43 @@ package com.snp.batch.jobs.datasync.batch.code.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.code.dto.Stat5CodeDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class Stat5CodeReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class Stat5CodeReader extends BaseSyncReader { public Stat5CodeReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public Stat5CodeDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceStat5Code; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceStat5Code), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[Stat5CodeReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceStat5Code); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return Stat5CodeDto.builder() - .jobExecutionId(targetId) - .lvOne(rs.getString("lv_one")) - .lvOneDesc(rs.getString("lv_one_desc")) - .lvTwo(rs.getString("lv_two")) - .lvTwoDesc(rs.getString("lv_two_desc")) - .lvThr(rs.getString("lv_thr")) - .lvThrDesc(rs.getString("lv_thr_desc")) - .lvFour(rs.getString("lv_four")) - .lvFourDesc(rs.getString("lv_four_desc")) - .lvFive(rs.getString("lv_five")) - .lvFiveDesc(rs.getString("lv_five_desc")) - .dtlDesc(rs.getString("dtl_desc")) - .rlsIem(rs.getString("rls_iem")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceStat5Code); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected Stat5CodeDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return Stat5CodeDto.builder() + .jobExecutionId(targetId) + .lvOne(rs.getString("lv_one")) + .lvOneDesc(rs.getString("lv_one_desc")) + .lvTwo(rs.getString("lv_two")) + .lvTwoDesc(rs.getString("lv_two_desc")) + .lvThr(rs.getString("lv_thr")) + .lvThrDesc(rs.getString("lv_thr_desc")) + .lvFour(rs.getString("lv_four")) + .lvFourDesc(rs.getString("lv_four_desc")) + .lvFive(rs.getString("lv_five")) + .lvFiveDesc(rs.getString("lv_five_desc")) + .dtlDesc(rs.getString("dtl_desc")) + .rlsIem(rs.getString("rls_iem")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/code/repository/CodeRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/code/repository/CodeRepositoryImpl.java index 3890621..2553a7b 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/code/repository/CodeRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/code/repository/CodeRepositoryImpl.java @@ -80,7 +80,7 @@ public class CodeRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -92,7 +92,7 @@ public class CodeRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -123,7 +123,7 @@ public class CodeRepositoryImpl extends MultiDataSourceJdbcRepository companyComplianceWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTbCompanyComplianceInfo); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTbCompanyComplianceInfo); } // --- Steps --- @@ -109,12 +105,10 @@ public class CompanyComplianceSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(companyComplianceWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/config/ShipComplianceSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/config/ShipComplianceSyncJobConfig.java index fc90f41..0916db8 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/config/ShipComplianceSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/config/ShipComplianceSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.compliance.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.compliance.dto.ShipComplianceDto; import com.snp.batch.jobs.datasync.batch.compliance.entity.ShipComplianceEntity; @@ -99,8 +96,7 @@ public class ShipComplianceSyncJobConfig extends BaseJobConfig shipComplianceWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceCompliance); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceCompliance); } // --- Steps --- @@ -109,12 +105,10 @@ public class ShipComplianceSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(shipComplianceWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/CompanyComplianceReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/CompanyComplianceReader.java index 4d1cd7e..8f96760 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/CompanyComplianceReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/CompanyComplianceReader.java @@ -1,82 +1,50 @@ package com.snp.batch.jobs.datasync.batch.compliance.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.compliance.dto.CompanyComplianceDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class CompanyComplianceReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class CompanyComplianceReader extends BaseSyncReader { public CompanyComplianceReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public CompanyComplianceDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTbCompanyComplianceInfo; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTbCompanyComplianceInfo), Long.class); - } catch (Exception e) { - return; - } + @Override + protected CompanyComplianceDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp lstMdfcnDtTs = rs.getTimestamp("lst_mdfcn_dt"); - if (nextTargetId != null) { - log.info("[CompanyComplianceReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTbCompanyComplianceInfo); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp lstMdfcnDtTs = rs.getTimestamp("lst_mdfcn_dt"); - - return CompanyComplianceDto.builder() - .jobExecutionId(targetId) - .companyCd(rs.getString("company_cd")) - .lstMdfcnDt(lstMdfcnDtTs != null ? lstMdfcnDtTs.toLocalDateTime() : null) - .companySnthsComplianceStatus(rs.getObject("company_snths_compliance_status") != null ? rs.getLong("company_snths_compliance_status") : null) - .companyAusSanctionList(rs.getObject("company_aus_sanction_list") != null ? rs.getLong("company_aus_sanction_list") : null) - .companyBesSanctionList(rs.getObject("company_bes_sanction_list") != null ? rs.getLong("company_bes_sanction_list") : null) - .companyCanSanctionList(rs.getObject("company_can_sanction_list") != null ? rs.getLong("company_can_sanction_list") : null) - .companyOfacSanctionCountry(rs.getObject("company_ofac_sanction_country") != null ? rs.getLong("company_ofac_sanction_country") : null) - .companyFatfCmptncCountry(rs.getObject("company_fatf_cmptnc_country") != null ? rs.getLong("company_fatf_cmptnc_country") : null) - .companyEuSanctionList(rs.getObject("company_eu_sanction_list") != null ? rs.getLong("company_eu_sanction_list") : null) - .companyOfacSanctionList(rs.getObject("company_ofac_sanction_list") != null ? rs.getLong("company_ofac_sanction_list") : null) - .companyOfacNonSdnSanctionList(rs.getObject("company_ofac_non_sdn_sanction_list") != null ? rs.getLong("company_ofac_non_sdn_sanction_list") : null) - .companyOfacssiSanctionList(rs.getObject("company_ofacssi_sanction_list") != null ? rs.getLong("company_ofacssi_sanction_list") : null) - .companySwissSanctionList(rs.getObject("company_swiss_sanction_list") != null ? rs.getLong("company_swiss_sanction_list") : null) - .companyUaeSanctionList(rs.getObject("company_uae_sanction_list") != null ? rs.getLong("company_uae_sanction_list") : null) - .companyUnSanctionList(rs.getObject("company_un_sanction_list") != null ? rs.getLong("company_un_sanction_list") : null) - .prntCompanyComplianceRisk(rs.getObject("prnt_company_compliance_risk") != null ? rs.getLong("prnt_company_compliance_risk") : null) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTbCompanyComplianceInfo); - businessJdbcTemplate.update(sql, targetExecutionId); + return CompanyComplianceDto.builder() + .jobExecutionId(targetId) + .companyCd(rs.getString("company_cd")) + .lstMdfcnDt(lstMdfcnDtTs != null ? lstMdfcnDtTs.toLocalDateTime() : null) + .companySnthsComplianceStatus(rs.getObject("company_snths_compliance_status") != null ? rs.getLong("company_snths_compliance_status") : null) + .companyAusSanctionList(rs.getObject("company_aus_sanction_list") != null ? rs.getLong("company_aus_sanction_list") : null) + .companyBesSanctionList(rs.getObject("company_bes_sanction_list") != null ? rs.getLong("company_bes_sanction_list") : null) + .companyCanSanctionList(rs.getObject("company_can_sanction_list") != null ? rs.getLong("company_can_sanction_list") : null) + .companyOfacSanctionCountry(rs.getObject("company_ofac_sanction_country") != null ? rs.getLong("company_ofac_sanction_country") : null) + .companyFatfCmptncCountry(rs.getObject("company_fatf_cmptnc_country") != null ? rs.getLong("company_fatf_cmptnc_country") : null) + .companyEuSanctionList(rs.getObject("company_eu_sanction_list") != null ? rs.getLong("company_eu_sanction_list") : null) + .companyOfacSanctionList(rs.getObject("company_ofac_sanction_list") != null ? rs.getLong("company_ofac_sanction_list") : null) + .companyOfacNonSdnSanctionList(rs.getObject("company_ofac_non_sdn_sanction_list") != null ? rs.getLong("company_ofac_non_sdn_sanction_list") : null) + .companyOfacssiSanctionList(rs.getObject("company_ofacssi_sanction_list") != null ? rs.getLong("company_ofacssi_sanction_list") : null) + .companySwissSanctionList(rs.getObject("company_swiss_sanction_list") != null ? rs.getLong("company_swiss_sanction_list") : null) + .companyUaeSanctionList(rs.getObject("company_uae_sanction_list") != null ? rs.getLong("company_uae_sanction_list") : null) + .companyUnSanctionList(rs.getObject("company_un_sanction_list") != null ? rs.getLong("company_un_sanction_list") : null) + .prntCompanyComplianceRisk(rs.getObject("prnt_company_compliance_risk") != null ? rs.getLong("prnt_company_compliance_risk") : null) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/ShipComplianceReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/ShipComplianceReader.java index 24f2479..6b65534 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/ShipComplianceReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/reader/ShipComplianceReader.java @@ -1,101 +1,69 @@ package com.snp.batch.jobs.datasync.batch.compliance.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.compliance.dto.ShipComplianceDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class ShipComplianceReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class ShipComplianceReader extends BaseSyncReader { public ShipComplianceReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public ShipComplianceDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceCompliance; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceCompliance), Long.class); - } catch (Exception e) { - return; - } + @Override + protected ShipComplianceDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); - if (nextTargetId != null) { - log.info("[ShipComplianceReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceCompliance); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); - - return ShipComplianceDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toLocalDateTime() : null) - .lglSnthsSanction(rs.getString("lgl_snths_sanction")) - .shipBesSanctionList(rs.getString("ship_bes_sanction_list")) - .shipDarkActvInd(rs.getString("ship_dark_actv_ind")) - .shipDtldInfoNtmntd(rs.getString("ship_dtld_info_ntmntd")) - .shipEuSanctionList(rs.getString("ship_eu_sanction_list")) - .shipFlgDspt(rs.getString("ship_flg_dspt")) - .shipFlgSanctionCountry(rs.getString("ship_flg_sanction_country")) - .shipFlgSanctionCountryHstry(rs.getString("ship_flg_sanction_country_hstry")) - .shipOfacNonSdnSanctionList(rs.getString("ship_ofac_non_sdn_sanction_list")) - .shipOfacSanctionList(rs.getString("ship_ofac_sanction_list")) - .shipOfacCutnList(rs.getString("ship_ofac_cutn_list")) - .shipOwnrOfcsSanctionList(rs.getString("ship_ownr_ofcs_sanction_list")) - .shipOwnrAusSanctionList(rs.getString("ship_ownr_aus_sanction_list")) - .shipOwnrBesSanctionList(rs.getString("ship_ownr_bes_sanction_list")) - .shipOwnrCanSanctionList(rs.getString("ship_ownr_can_sanction_list")) - .shipOwnrEuSanctionList(rs.getString("ship_ownr_eu_sanction_list")) - .shipOwnrFatfRglZone(rs.getString("ship_ownr_fatf_rgl_zone")) - .shipOwnrOfacSanctionHstry(rs.getString("ship_ownr_ofac_sanction_hstry")) - .shipOwnrOfacSanctionList(rs.getString("ship_ownr_ofac_sanction_list")) - .shipOwnrOfacSanctionCountry(rs.getString("ship_ownr_ofac_sanction_country")) - .shipOwnrPrntCompanyNcmplnc(rs.getString("ship_ownr_prnt_company_ncmplnc")) - .shipOwnrPrntCompanyFatfRglZone(rs.getString("ship_ownr_prnt_company_fatf_rgl_zone")) - .shipOwnrPrntCompanyOfacSanctionCountry(rs.getString("ship_ownr_prnt_company_ofac_sanction_country")) - .shipOwnrSwiSanctionList(rs.getString("ship_ownr_swi_sanction_list")) - .shipOwnrUaeSanctionList(rs.getString("ship_ownr_uae_sanction_list")) - .shipOwnrUnSanctionList(rs.getString("ship_ownr_un_sanction_list")) - .shipSanctionCountryPrtcllLastTwelveM(rs.getString("ship_sanction_country_prtcll_last_twelve_m")) - .shipSanctionCountryPrtcllLastThrM(rs.getString("ship_sanction_country_prtcll_last_thr_m")) - .shipSanctionCountryPrtcllLastSixM(rs.getString("ship_sanction_country_prtcll_last_six_m")) - .shipScrtyLglDsptEvent(rs.getString("ship_scrty_lgl_dspt_event")) - .shipStsPrtnrNonComplianceTwelveM(rs.getString("ship_sts_prtnr_non_compliance_twelve_m")) - .shipSwiSanctionList(rs.getString("ship_swi_sanction_list")) - .shipUnSanctionList(rs.getString("ship_un_sanction_list")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceCompliance); - businessJdbcTemplate.update(sql, targetExecutionId); + return ShipComplianceDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toLocalDateTime() : null) + .lglSnthsSanction(rs.getString("lgl_snths_sanction")) + .shipBesSanctionList(rs.getString("ship_bes_sanction_list")) + .shipDarkActvInd(rs.getString("ship_dark_actv_ind")) + .shipDtldInfoNtmntd(rs.getString("ship_dtld_info_ntmntd")) + .shipEuSanctionList(rs.getString("ship_eu_sanction_list")) + .shipFlgDspt(rs.getString("ship_flg_dspt")) + .shipFlgSanctionCountry(rs.getString("ship_flg_sanction_country")) + .shipFlgSanctionCountryHstry(rs.getString("ship_flg_sanction_country_hstry")) + .shipOfacNonSdnSanctionList(rs.getString("ship_ofac_non_sdn_sanction_list")) + .shipOfacSanctionList(rs.getString("ship_ofac_sanction_list")) + .shipOfacCutnList(rs.getString("ship_ofac_cutn_list")) + .shipOwnrOfcsSanctionList(rs.getString("ship_ownr_ofcs_sanction_list")) + .shipOwnrAusSanctionList(rs.getString("ship_ownr_aus_sanction_list")) + .shipOwnrBesSanctionList(rs.getString("ship_ownr_bes_sanction_list")) + .shipOwnrCanSanctionList(rs.getString("ship_ownr_can_sanction_list")) + .shipOwnrEuSanctionList(rs.getString("ship_ownr_eu_sanction_list")) + .shipOwnrFatfRglZone(rs.getString("ship_ownr_fatf_rgl_zone")) + .shipOwnrOfacSanctionHstry(rs.getString("ship_ownr_ofac_sanction_hstry")) + .shipOwnrOfacSanctionList(rs.getString("ship_ownr_ofac_sanction_list")) + .shipOwnrOfacSanctionCountry(rs.getString("ship_ownr_ofac_sanction_country")) + .shipOwnrPrntCompanyNcmplnc(rs.getString("ship_ownr_prnt_company_ncmplnc")) + .shipOwnrPrntCompanyFatfRglZone(rs.getString("ship_ownr_prnt_company_fatf_rgl_zone")) + .shipOwnrPrntCompanyOfacSanctionCountry(rs.getString("ship_ownr_prnt_company_ofac_sanction_country")) + .shipOwnrSwiSanctionList(rs.getString("ship_ownr_swi_sanction_list")) + .shipOwnrUaeSanctionList(rs.getString("ship_ownr_uae_sanction_list")) + .shipOwnrUnSanctionList(rs.getString("ship_ownr_un_sanction_list")) + .shipSanctionCountryPrtcllLastTwelveM(rs.getString("ship_sanction_country_prtcll_last_twelve_m")) + .shipSanctionCountryPrtcllLastThrM(rs.getString("ship_sanction_country_prtcll_last_thr_m")) + .shipSanctionCountryPrtcllLastSixM(rs.getString("ship_sanction_country_prtcll_last_six_m")) + .shipScrtyLglDsptEvent(rs.getString("ship_scrty_lgl_dspt_event")) + .shipStsPrtnrNonComplianceTwelveM(rs.getString("ship_sts_prtnr_non_compliance_twelve_m")) + .shipSwiSanctionList(rs.getString("ship_swi_sanction_list")) + .shipUnSanctionList(rs.getString("ship_un_sanction_list")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/repository/ComplianceRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/repository/ComplianceRepositoryImpl.java index e6b0251..3f6b343 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/repository/ComplianceRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/compliance/repository/ComplianceRepositoryImpl.java @@ -80,7 +80,7 @@ public class ComplianceRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -92,7 +92,7 @@ public class ComplianceRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -134,7 +134,7 @@ public class ComplianceRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -293,7 +293,7 @@ public class ComplianceRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -324,7 +324,7 @@ public class ComplianceRepositoryImpl extends MultiDataSourceJdbcRepository { @Bean public BatchWriteListener eventWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceEvent); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceEvent); } @Bean public BatchWriteListener eventCargoWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceEventCargo); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceEventCargo); } @Bean public BatchWriteListener eventHumanCasualtyWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceEventHumanCasualty); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceEventHumanCasualty); } @Bean public BatchWriteListener eventRelationshipWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceEventRelationship); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceEventRelationship); } // --- Steps --- @@ -175,12 +168,10 @@ public class EventSyncJobConfig extends BaseJobConfig { public Step eventSyncStep() { log.info("Step 생성: eventSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(eventWriteListener()) .build(); } @@ -189,12 +180,10 @@ public class EventSyncJobConfig extends BaseJobConfig { public Step eventCargoSyncStep() { log.info("Step 생성: eventCargoSyncStep"); return new StepBuilder("eventCargoSyncStep", jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(eventCargoReader(businessDataSource, tableMetaInfo)) .processor(new EventCargoProcessor()) .writer(new EventCargoWriter(eventRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(eventCargoWriteListener()) .build(); } @@ -203,12 +192,10 @@ public class EventSyncJobConfig extends BaseJobConfig { public Step eventHumanCasualtySyncStep() { log.info("Step 생성: eventHumanCasualtySyncStep"); return new StepBuilder("eventHumanCasualtySyncStep", jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(eventHumanCasualtyReader(businessDataSource, tableMetaInfo)) .processor(new EventHumanCasualtyProcessor()) .writer(new EventHumanCasualtyWriter(eventRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(eventHumanCasualtyWriteListener()) .build(); } @@ -217,12 +204,10 @@ public class EventSyncJobConfig extends BaseJobConfig { public Step eventRelationshipSyncStep() { log.info("Step 생성: eventRelationshipSyncStep"); return new StepBuilder("eventRelationshipSyncStep", jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(eventRelationshipReader(businessDataSource, tableMetaInfo)) .processor(new EventRelationshipProcessor()) .writer(new EventRelationshipWriter(eventRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(eventRelationshipWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventCargoReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventCargoReader.java index af82b44..a428be8 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventCargoReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventCargoReader.java @@ -1,73 +1,41 @@ package com.snp.batch.jobs.datasync.batch.event.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.event.dto.EventCargoDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class EventCargoReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class EventCargoReader extends BaseSyncReader { public EventCargoReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public EventCargoDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceEventCargo; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceEventCargo), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[EventCargoReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceEventCargo); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return EventCargoDto.builder() - .jobExecutionId(targetId) - .eventId(rs.getObject("event_id") != null ? rs.getInt("event_id") : null) - .imoNo(rs.getString("imo_no")) - .type(rs.getString("type")) - .eventSeq(rs.getString("event_seq")) - .cnt(rs.getObject("cnt") != null ? rs.getLong("cnt") : null) - .unitAbbr(rs.getString("unit_abbr")) - .unit(rs.getString("unit")) - .cargoDamg(rs.getString("cargo_damg")) - .riskYn(rs.getString("risk_yn")) - .text(rs.getString("text")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceEventCargo); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected EventCargoDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return EventCargoDto.builder() + .jobExecutionId(targetId) + .eventId(rs.getObject("event_id") != null ? rs.getInt("event_id") : null) + .imoNo(rs.getString("imo_no")) + .type(rs.getString("type")) + .eventSeq(rs.getString("event_seq")) + .cnt(rs.getObject("cnt") != null ? rs.getLong("cnt") : null) + .unitAbbr(rs.getString("unit_abbr")) + .unit(rs.getString("unit")) + .cargoDamg(rs.getString("cargo_damg")) + .riskYn(rs.getString("risk_yn")) + .text(rs.getString("text")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventHumanCasualtyReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventHumanCasualtyReader.java index 3a00435..af6470e 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventHumanCasualtyReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventHumanCasualtyReader.java @@ -1,68 +1,36 @@ package com.snp.batch.jobs.datasync.batch.event.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.event.dto.EventHumanCasualtyDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class EventHumanCasualtyReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class EventHumanCasualtyReader extends BaseSyncReader { public EventHumanCasualtyReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public EventHumanCasualtyDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceEventHumanCasualty; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceEventHumanCasualty), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[EventHumanCasualtyReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceEventHumanCasualty); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return EventHumanCasualtyDto.builder() - .jobExecutionId(targetId) - .eventId(rs.getObject("event_id") != null ? rs.getLong("event_id") : null) - .type(rs.getString("type")) - .scope(rs.getString("scope")) - .qualfr(rs.getString("qualfr")) - .cnt(rs.getObject("cnt") != null ? rs.getLong("cnt") : null) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceEventHumanCasualty); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected EventHumanCasualtyDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return EventHumanCasualtyDto.builder() + .jobExecutionId(targetId) + .eventId(rs.getObject("event_id") != null ? rs.getLong("event_id") : null) + .type(rs.getString("type")) + .scope(rs.getString("scope")) + .qualfr(rs.getString("qualfr")) + .cnt(rs.getObject("cnt") != null ? rs.getLong("cnt") : null) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventReader.java index 04da68c..07277f5 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventReader.java @@ -1,110 +1,79 @@ package com.snp.batch.jobs.datasync.batch.event.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.event.dto.EventDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; +import java.time.ZoneId; @Slf4j -public class EventReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class EventReader extends BaseSyncReader { public EventReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public EventDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceEvent; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceEvent), Long.class); - } catch (Exception e) { - return; - } + @Override + protected EventDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp pstgYmdTs = rs.getTimestamp("pstg_ymd"); + Timestamp eventStartDayTs = rs.getTimestamp("event_start_day"); + Timestamp eventEndDayTs = rs.getTimestamp("event_end_day"); - if (nextTargetId != null) { - log.info("[EventReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceEvent); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp pstgYmdTs = rs.getTimestamp("pstg_ymd"); - Timestamp eventStartDayTs = rs.getTimestamp("event_start_day"); - Timestamp eventEndDayTs = rs.getTimestamp("event_end_day"); - - return EventDto.builder() - .jobExecutionId(targetId) - .eventId(rs.getObject("event_id") != null ? rs.getInt("event_id") : null) - .acdntId(rs.getString("acdnt_id")) - .imoNo(rs.getString("imo_no")) - .pstgYmd(pstgYmdTs != null ? pstgYmdTs.toInstant().atZone(java.time.ZoneId.systemDefault()) : null) - .eventStartDay(eventStartDayTs != null ? eventStartDayTs.toInstant().atZone(java.time.ZoneId.systemDefault()) : null) - .eventEndDay(eventEndDayTs != null ? eventEndDayTs.toInstant().atZone(java.time.ZoneId.systemDefault()) : null) - .embrkTryYn(rs.getString("embrk_try_yn")) - .cargoCapacityStatusCd(rs.getString("cargo_capacity_status_cd")) - .acdntActn(rs.getString("acdnt_actn")) - .acdntZone(rs.getString("acdnt_zone")) - .acdntZoneCd(rs.getString("acdnt_zone_cd")) - .cfgCmpntTwo(rs.getString("cfg_cmpnt_two")) - .countryCd(rs.getString("country_cd")) - .buildYmd(rs.getString("build_ymd")) - .desc(rs.getString("desc")) - .envPosition(rs.getString("env_position")) - .positionNm(rs.getString("position_nm")) - .masdGridRef(rs.getObject("masd_grid_ref") != null ? rs.getLong("masd_grid_ref") : null) - .ctyNm(rs.getString("cty_nm")) - .eventType(rs.getString("event_type")) - .eventTypeDtl(rs.getString("event_type_dtl")) - .eventTypeDtlId(rs.getObject("event_type_dtl_id") != null ? rs.getLong("event_type_dtl_id") : null) - .eventTypeId(rs.getObject("event_type_id") != null ? rs.getLong("event_type_id") : null) - .fireduponYn(rs.getString("firedupon_yn")) - .title(rs.getString("title")) - .ldtTimpt(rs.getObject("ldt_timpt") != null ? rs.getLong("ldt_timpt") : null) - .signfct(rs.getString("signfct")) - .wethr(rs.getString("wethr")) - .pltnMatral(rs.getString("pltn_matral")) - .pltnMatralCnt(rs.getObject("pltn_matral_cnt") != null ? rs.getLong("pltn_matral_cnt") : null) - .pltnMatralUnit(rs.getString("pltn_matral_unit")) - .regShponrCdHr(rs.getString("reg_shponr_cd_hr")) - .regShponrHr(rs.getString("reg_shponr_hr")) - .regShponrCountryCdHr(rs.getString("reg_shponr_country_cd_hr")) - .regShponrCountryHr(rs.getString("reg_shponr_country_hr")) - .shipDwt(rs.getObject("ship_dwt") != null ? rs.getLong("ship_dwt") : null) - .shipFlgCd(rs.getString("ship_flg_cd")) - .shipFlgDecd(rs.getString("ship_flg_decd")) - .shipGt(rs.getObject("ship_gt") != null ? rs.getLong("ship_gt") : null) - .shipNm(rs.getString("ship_nm")) - .shipType(rs.getString("ship_type")) - .shipTypeNm(rs.getString("ship_type_nm")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceEvent); - businessJdbcTemplate.update(sql, targetExecutionId); + return EventDto.builder() + .jobExecutionId(targetId) + .eventId(rs.getObject("event_id") != null ? rs.getInt("event_id") : null) + .acdntId(rs.getString("acdnt_id")) + .imoNo(rs.getString("imo_no")) + .pstgYmd(pstgYmdTs != null ? pstgYmdTs.toInstant().atZone(ZoneId.systemDefault()) : null) + .eventStartDay(eventStartDayTs != null ? eventStartDayTs.toInstant().atZone(ZoneId.systemDefault()) : null) + .eventEndDay(eventEndDayTs != null ? eventEndDayTs.toInstant().atZone(ZoneId.systemDefault()) : null) + .embrkTryYn(rs.getString("embrk_try_yn")) + .cargoCapacityStatusCd(rs.getString("cargo_capacity_status_cd")) + .acdntActn(rs.getString("acdnt_actn")) + .acdntZone(rs.getString("acdnt_zone")) + .acdntZoneCd(rs.getString("acdnt_zone_cd")) + .cfgCmpntTwo(rs.getString("cfg_cmpnt_two")) + .countryCd(rs.getString("country_cd")) + .buildYmd(rs.getString("build_ymd")) + .desc(rs.getString("desc")) + .envPosition(rs.getString("env_position")) + .positionNm(rs.getString("position_nm")) + .masdGridRef(rs.getObject("masd_grid_ref") != null ? rs.getLong("masd_grid_ref") : null) + .ctyNm(rs.getString("cty_nm")) + .eventType(rs.getString("event_type")) + .eventTypeDtl(rs.getString("event_type_dtl")) + .eventTypeDtlId(rs.getObject("event_type_dtl_id") != null ? rs.getLong("event_type_dtl_id") : null) + .eventTypeId(rs.getObject("event_type_id") != null ? rs.getLong("event_type_id") : null) + .fireduponYn(rs.getString("firedupon_yn")) + .title(rs.getString("title")) + .ldtTimpt(rs.getObject("ldt_timpt") != null ? rs.getLong("ldt_timpt") : null) + .signfct(rs.getString("signfct")) + .wethr(rs.getString("wethr")) + .pltnMatral(rs.getString("pltn_matral")) + .pltnMatralCnt(rs.getObject("pltn_matral_cnt") != null ? rs.getLong("pltn_matral_cnt") : null) + .pltnMatralUnit(rs.getString("pltn_matral_unit")) + .regShponrCdHr(rs.getString("reg_shponr_cd_hr")) + .regShponrHr(rs.getString("reg_shponr_hr")) + .regShponrCountryCdHr(rs.getString("reg_shponr_country_cd_hr")) + .regShponrCountryHr(rs.getString("reg_shponr_country_hr")) + .shipDwt(rs.getObject("ship_dwt") != null ? rs.getLong("ship_dwt") : null) + .shipFlgCd(rs.getString("ship_flg_cd")) + .shipFlgDecd(rs.getString("ship_flg_decd")) + .shipGt(rs.getObject("ship_gt") != null ? rs.getLong("ship_gt") : null) + .shipNm(rs.getString("ship_nm")) + .shipType(rs.getString("ship_type")) + .shipTypeNm(rs.getString("ship_type_nm")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventRelationshipReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventRelationshipReader.java index 9fdd2eb..572f758 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventRelationshipReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/event/reader/EventRelationshipReader.java @@ -1,70 +1,38 @@ package com.snp.batch.jobs.datasync.batch.event.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.event.dto.EventRelationshipDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class EventRelationshipReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class EventRelationshipReader extends BaseSyncReader { public EventRelationshipReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public EventRelationshipDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceEventRelationship; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceEventRelationship), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[EventRelationshipReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceEventRelationship); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return EventRelationshipDto.builder() - .jobExecutionId(targetId) - .acdntId(rs.getString("acdnt_id")) - .eventId(rs.getObject("event_id") != null ? rs.getLong("event_id") : null) - .eventIdTwo(rs.getObject("event_id_two") != null ? rs.getLong("event_id_two") : null) - .eventTypeCd(rs.getString("event_type_cd")) - .eventType(rs.getString("event_type")) - .relTypeCd(rs.getString("rel_type_cd")) - .relType(rs.getString("rel_type")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceEventRelationship); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected EventRelationshipDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return EventRelationshipDto.builder() + .jobExecutionId(targetId) + .acdntId(rs.getString("acdnt_id")) + .eventId(rs.getObject("event_id") != null ? rs.getLong("event_id") : null) + .eventIdTwo(rs.getObject("event_id_two") != null ? rs.getLong("event_id_two") : null) + .eventTypeCd(rs.getString("event_type_cd")) + .eventType(rs.getString("event_type")) + .relTypeCd(rs.getString("rel_type_cd")) + .relType(rs.getString("rel_type")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/event/repository/EventRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/event/repository/EventRepositoryImpl.java index 7c24111..b5ef42d 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/event/repository/EventRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/event/repository/EventRepositoryImpl.java @@ -84,7 +84,7 @@ public class EventRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -96,7 +96,7 @@ public class EventRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -164,7 +164,7 @@ public class EventRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -200,7 +200,7 @@ public class EventRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -231,7 +231,7 @@ public class EventRepositoryImpl extends MultiDataSourceJdbcRepository facilityPortWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceFacilityPort); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceFacilityPort); } // --- Steps --- @@ -112,12 +108,10 @@ public class FacilitySyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(facilityPortWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/facility/reader/FacilityPortReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/facility/reader/FacilityPortReader.java index 67aa60d..73844e8 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/facility/reader/FacilityPortReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/facility/reader/FacilityPortReader.java @@ -1,117 +1,86 @@ package com.snp.batch.jobs.datasync.batch.facility.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.facility.dto.FacilityPortDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; +import java.time.ZoneId; @Slf4j -public class FacilityPortReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class FacilityPortReader extends BaseSyncReader { public FacilityPortReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public FacilityPortDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceFacilityPort; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceFacilityPort), Long.class); - } catch (Exception e) { - return; - } + @Override + protected FacilityPortDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); + Timestamp regYmdTs = rs.getTimestamp("reg_ymd"); - if (nextTargetId != null) { - log.info("[FacilityPortReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceFacilityPort); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); - Timestamp regYmdTs = rs.getTimestamp("reg_ymd"); - - return FacilityPortDto.builder() - .jobExecutionId(targetId) - .portId(rs.getObject("port_id") != null ? rs.getLong("port_id") : null) - .bfrId(rs.getString("bfr_id")) - .status(rs.getString("status")) - .portNm(rs.getString("port_nm")) - .unPortCd(rs.getString("un_port_cd")) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .areanm(rs.getString("areanm")) - .cntntnm(rs.getString("cntntnm")) - .mstPortId(rs.getString("mst_port_id")) - .latDecml(rs.getObject("lat_decml") != null ? rs.getDouble("lat_decml") : null) - .lonDecml(rs.getObject("lon_decml") != null ? rs.getDouble("lon_decml") : null) - .positionLat(rs.getObject("position_lat") != null ? rs.getDouble("position_lat") : null) - .positionLon(rs.getObject("position_lon") != null ? rs.getDouble("position_lon") : null) - .positionZVal(rs.getObject("position_z_val") != null ? rs.getDouble("position_z_val") : null) - .positionMvalVal(rs.getObject("position_mval_val") != null ? rs.getDouble("position_mval_val") : null) - .zValHasYn(rs.getObject("z_val_has_yn") != null ? rs.getBoolean("z_val_has_yn") : null) - .mvalValHasYn(rs.getObject("mval_val_has_yn") != null ? rs.getBoolean("mval_val_has_yn") : null) - .positionNulYn(rs.getObject("position_nul_yn") != null ? rs.getBoolean("position_nul_yn") : null) - .positionStsId(rs.getObject("position_sts_id") != null ? rs.getLong("position_sts_id") : null) - .hrZone(rs.getString("hr_zone")) - .daylgtSaveHr(rs.getObject("daylgt_save_hr") != null ? rs.getBoolean("daylgt_save_hr") : null) - .maxDraft(rs.getObject("max_draft") != null ? rs.getDouble("max_draft") : null) - .maxWhlnth(rs.getObject("max_whlnth") != null ? rs.getDouble("max_whlnth") : null) - .maxBeam(rs.getObject("max_beam") != null ? rs.getDouble("max_beam") : null) - .maxDwt(rs.getObject("max_dwt") != null ? rs.getDouble("max_dwt") : null) - .maxSeaDraft(rs.getObject("max_sea_draft") != null ? rs.getDouble("max_sea_draft") : null) - .maxSeaWhlnth(rs.getObject("max_sea_whlnth") != null ? rs.getDouble("max_sea_whlnth") : null) - .maxSeaBcm(rs.getObject("max_sea_bcm") != null ? rs.getDouble("max_sea_bcm") : null) - .maxSeaDwt(rs.getObject("max_sea_dwt") != null ? rs.getDouble("max_sea_dwt") : null) - .baleCargoFacility(rs.getObject("bale_cargo_facility") != null ? rs.getBoolean("bale_cargo_facility") : null) - .cntnrFacility(rs.getObject("cntnr_facility") != null ? rs.getBoolean("cntnr_facility") : null) - .caseCargoFacility(rs.getObject("case_cargo_facility") != null ? rs.getBoolean("case_cargo_facility") : null) - .liquidCargoFacility(rs.getObject("liquid_cargo_facility") != null ? rs.getBoolean("liquid_cargo_facility") : null) - .roroFacility(rs.getObject("roro_facility") != null ? rs.getBoolean("roro_facility") : null) - .paxfclty(rs.getObject("paxfclty") != null ? rs.getBoolean("paxfclty") : null) - .drydkfclty(rs.getObject("drydkfclty") != null ? rs.getBoolean("drydkfclty") : null) - .lpgFacility(rs.getObject("lpg_facility") != null ? rs.getLong("lpg_facility") : null) - .lngFacility(rs.getObject("lng_facility") != null ? rs.getLong("lng_facility") : null) - .lngBnkr(rs.getObject("lng_bnkr") != null ? rs.getBoolean("lng_bnkr") : null) - .doBnkr(rs.getObject("do_bnkr") != null ? rs.getBoolean("do_bnkr") : null) - .foBnkr(rs.getObject("fo_bnkr") != null ? rs.getBoolean("fo_bnkr") : null) - .ispsComplianceYn(rs.getObject("isps_compliance_yn") != null ? rs.getBoolean("isps_compliance_yn") : null) - .csiComplianceYn(rs.getObject("csi_compliance_yn") != null ? rs.getBoolean("csi_compliance_yn") : null) - .freeTrdZone(rs.getObject("free_trd_zone") != null ? rs.getBoolean("free_trd_zone") : null) - .ecfrdPort(rs.getObject("ecfrd_port") != null ? rs.getBoolean("ecfrd_port") : null) - .emsnCtrlArea(rs.getObject("emsn_ctrl_area") != null ? rs.getBoolean("emsn_ctrl_area") : null) - .wsPort(rs.getObject("ws_port") != null ? rs.getLong("ws_port") : null) - .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toInstant().atZone(java.time.ZoneId.systemDefault()) : null) - .regYmd(regYmdTs != null ? regYmdTs.toInstant().atZone(java.time.ZoneId.systemDefault()) : null) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceFacilityPort); - businessJdbcTemplate.update(sql, targetExecutionId); + return FacilityPortDto.builder() + .jobExecutionId(targetId) + .portId(rs.getObject("port_id") != null ? rs.getLong("port_id") : null) + .bfrId(rs.getString("bfr_id")) + .status(rs.getString("status")) + .portNm(rs.getString("port_nm")) + .unPortCd(rs.getString("un_port_cd")) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .areanm(rs.getString("areanm")) + .cntntnm(rs.getString("cntntnm")) + .mstPortId(rs.getString("mst_port_id")) + .latDecml(rs.getObject("lat_decml") != null ? rs.getDouble("lat_decml") : null) + .lonDecml(rs.getObject("lon_decml") != null ? rs.getDouble("lon_decml") : null) + .positionLat(rs.getObject("position_lat") != null ? rs.getDouble("position_lat") : null) + .positionLon(rs.getObject("position_lon") != null ? rs.getDouble("position_lon") : null) + .positionZVal(rs.getObject("position_z_val") != null ? rs.getDouble("position_z_val") : null) + .positionMvalVal(rs.getObject("position_mval_val") != null ? rs.getDouble("position_mval_val") : null) + .zValHasYn(rs.getObject("z_val_has_yn") != null ? rs.getBoolean("z_val_has_yn") : null) + .mvalValHasYn(rs.getObject("mval_val_has_yn") != null ? rs.getBoolean("mval_val_has_yn") : null) + .positionNulYn(rs.getObject("position_nul_yn") != null ? rs.getBoolean("position_nul_yn") : null) + .positionStsId(rs.getObject("position_sts_id") != null ? rs.getLong("position_sts_id") : null) + .hrZone(rs.getString("hr_zone")) + .daylgtSaveHr(rs.getObject("daylgt_save_hr") != null ? rs.getBoolean("daylgt_save_hr") : null) + .maxDraft(rs.getObject("max_draft") != null ? rs.getDouble("max_draft") : null) + .maxWhlnth(rs.getObject("max_whlnth") != null ? rs.getDouble("max_whlnth") : null) + .maxBeam(rs.getObject("max_beam") != null ? rs.getDouble("max_beam") : null) + .maxDwt(rs.getObject("max_dwt") != null ? rs.getDouble("max_dwt") : null) + .maxSeaDraft(rs.getObject("max_sea_draft") != null ? rs.getDouble("max_sea_draft") : null) + .maxSeaWhlnth(rs.getObject("max_sea_whlnth") != null ? rs.getDouble("max_sea_whlnth") : null) + .maxSeaBcm(rs.getObject("max_sea_bcm") != null ? rs.getDouble("max_sea_bcm") : null) + .maxSeaDwt(rs.getObject("max_sea_dwt") != null ? rs.getDouble("max_sea_dwt") : null) + .baleCargoFacility(rs.getObject("bale_cargo_facility") != null ? rs.getBoolean("bale_cargo_facility") : null) + .cntnrFacility(rs.getObject("cntnr_facility") != null ? rs.getBoolean("cntnr_facility") : null) + .caseCargoFacility(rs.getObject("case_cargo_facility") != null ? rs.getBoolean("case_cargo_facility") : null) + .liquidCargoFacility(rs.getObject("liquid_cargo_facility") != null ? rs.getBoolean("liquid_cargo_facility") : null) + .roroFacility(rs.getObject("roro_facility") != null ? rs.getBoolean("roro_facility") : null) + .paxfclty(rs.getObject("paxfclty") != null ? rs.getBoolean("paxfclty") : null) + .drydkfclty(rs.getObject("drydkfclty") != null ? rs.getBoolean("drydkfclty") : null) + .lpgFacility(rs.getObject("lpg_facility") != null ? rs.getLong("lpg_facility") : null) + .lngFacility(rs.getObject("lng_facility") != null ? rs.getLong("lng_facility") : null) + .lngBnkr(rs.getObject("lng_bnkr") != null ? rs.getBoolean("lng_bnkr") : null) + .doBnkr(rs.getObject("do_bnkr") != null ? rs.getBoolean("do_bnkr") : null) + .foBnkr(rs.getObject("fo_bnkr") != null ? rs.getBoolean("fo_bnkr") : null) + .ispsComplianceYn(rs.getObject("isps_compliance_yn") != null ? rs.getBoolean("isps_compliance_yn") : null) + .csiComplianceYn(rs.getObject("csi_compliance_yn") != null ? rs.getBoolean("csi_compliance_yn") : null) + .freeTrdZone(rs.getObject("free_trd_zone") != null ? rs.getBoolean("free_trd_zone") : null) + .ecfrdPort(rs.getObject("ecfrd_port") != null ? rs.getBoolean("ecfrd_port") : null) + .emsnCtrlArea(rs.getObject("emsn_ctrl_area") != null ? rs.getBoolean("emsn_ctrl_area") : null) + .wsPort(rs.getObject("ws_port") != null ? rs.getLong("ws_port") : null) + .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toInstant().atZone(ZoneId.systemDefault()) : null) + .regYmd(regYmdTs != null ? regYmdTs.toInstant().atZone(ZoneId.systemDefault()) : null) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/facility/repository/FacilityRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/facility/repository/FacilityRepositoryImpl.java index 67292e4..318ee4d 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/facility/repository/FacilityRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/facility/repository/FacilityRepositoryImpl.java @@ -81,7 +81,7 @@ public class FacilityRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -93,7 +93,7 @@ public class FacilityRepositoryImpl extends MultiDataSourceJdbcRepository anchorageCallWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTAnchorageCall); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTAnchorageCall); } @Bean(name = "anchorageCallSyncStep") public Step anchorageCallSyncStep() { log.info("Step 생성: anchorageCallSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(anchorageCallWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/BerthCallSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/BerthCallSyncJobConfig.java index c7bc8a1..3ee3251 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/BerthCallSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/BerthCallSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.movement.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.BerthCallDto; import com.snp.batch.jobs.datasync.batch.movement.entity.BerthCallEntity; @@ -95,20 +92,17 @@ public class BerthCallSyncJobConfig extends BaseJobConfig berthCallWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTBerthCall); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTBerthCall); } @Bean(name = "berthCallSyncStep") public Step berthCallSyncStep() { log.info("Step 생성: berthCallSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(berthCallWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/CurrentlyAtSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/CurrentlyAtSyncJobConfig.java index 42562d4..c6a6e2b 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/CurrentlyAtSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/CurrentlyAtSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.movement.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.CurrentlyAtDto; import com.snp.batch.jobs.datasync.batch.movement.entity.CurrentlyAtEntity; @@ -95,20 +92,17 @@ public class CurrentlyAtSyncJobConfig extends BaseJobConfig currentlyAtWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTCurrentlyAt); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTCurrentlyAt); } @Bean(name = "currentlyAtSyncStep") public Step currentlyAtSyncStep() { log.info("Step 생성: currentlyAtSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(currentlyAtWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/DestinationSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/DestinationSyncJobConfig.java index 43f42fc..11f24c0 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/DestinationSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/DestinationSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.movement.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.DestinationDto; import com.snp.batch.jobs.datasync.batch.movement.entity.DestinationEntity; @@ -95,20 +92,17 @@ public class DestinationSyncJobConfig extends BaseJobConfig destinationWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTDestination); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTDestination); } @Bean(name = "destinationSyncStep") public Step destinationSyncStep() { log.info("Step 생성: destinationSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(destinationWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/PortCallSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/PortCallSyncJobConfig.java index 4b50c19..1dfb761 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/PortCallSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/PortCallSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.movement.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.PortCallDto; import com.snp.batch.jobs.datasync.batch.movement.entity.PortCallEntity; @@ -95,20 +92,17 @@ public class PortCallSyncJobConfig extends BaseJobConfig portCallWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTShipStpovInfo); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTShipStpovInfo); } @Bean(name = "portCallSyncStep") public Step portCallSyncStep() { log.info("Step 생성: portCallSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(portCallWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/StsOperationSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/StsOperationSyncJobConfig.java index aa81346..25f7199 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/StsOperationSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/StsOperationSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.movement.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.StsOperationDto; import com.snp.batch.jobs.datasync.batch.movement.entity.StsOperationEntity; @@ -95,20 +92,17 @@ public class StsOperationSyncJobConfig extends BaseJobConfig stsOperationWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTStsOperation); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTStsOperation); } @Bean(name = "stsOperationSyncStep") public Step stsOperationSyncStep() { log.info("Step 생성: stsOperationSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(stsOperationWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TerminalCallSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TerminalCallSyncJobConfig.java index 6cc2a03..676c9b2 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TerminalCallSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TerminalCallSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.movement.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.TerminalCallDto; import com.snp.batch.jobs.datasync.batch.movement.entity.TerminalCallEntity; @@ -95,20 +92,17 @@ public class TerminalCallSyncJobConfig extends BaseJobConfig terminalCallWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTTerminalCall); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTTerminalCall); } @Bean(name = "terminalCallSyncStep") public Step terminalCallSyncStep() { log.info("Step 생성: terminalCallSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(terminalCallWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TransitSyncJobConfig.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TransitSyncJobConfig.java index 8753268..d330042 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TransitSyncJobConfig.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/config/TransitSyncJobConfig.java @@ -2,10 +2,7 @@ package com.snp.batch.jobs.datasync.batch.movement.config; import com.snp.batch.common.batch.config.BaseJobConfig; import com.snp.batch.common.util.BatchWriteListener; -import com.snp.batch.common.util.CommonSql; -import com.snp.batch.common.util.GroupByExecutionIdChunkListener; -import com.snp.batch.common.util.GroupByExecutionIdPolicy; -import com.snp.batch.common.util.GroupByExecutionIdReadListener; + import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.TransitDto; import com.snp.batch.jobs.datasync.batch.movement.entity.TransitEntity; @@ -95,20 +92,17 @@ public class TransitSyncJobConfig extends BaseJobConfig transitWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTTransit); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTTransit); } @Bean(name = "transitSyncStep") public Step transitSyncStep() { log.info("Step 생성: transitSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(transitWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/AnchorageCallReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/AnchorageCallReader.java index 0990776..1e4f7c5 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/AnchorageCallReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/AnchorageCallReader.java @@ -1,85 +1,52 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.AnchorageCallDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.math.BigDecimal; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class AnchorageCallReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class AnchorageCallReader extends BaseSyncReader { public AnchorageCallReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public AnchorageCallDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTAnchorageCall; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTAnchorageCall), Long.class); - } catch (Exception e) { - return; - } + @Override + protected AnchorageCallDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - if (nextTargetId != null) { - log.info("[AnchorageCallReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTAnchorageCall); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - - return AnchorageCallDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .prtcllId(rs.getObject("prtcll_id") != null ? rs.getInt("prtcll_id") : null) - .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) - .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) - .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) - .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) - .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) - .positionInfo(rs.getString("position_info")) - .dest(rs.getString("dest")) - .isoTwoCountryCd(rs.getString("iso_two_country_cd")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTAnchorageCall); - businessJdbcTemplate.update(sql, targetExecutionId); + return AnchorageCallDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .prtcllId(rs.getObject("prtcll_id") != null ? rs.getInt("prtcll_id") : null) + .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) + .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) + .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) + .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) + .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) + .positionInfo(rs.getString("position_info")) + .dest(rs.getString("dest")) + .isoTwoCountryCd(rs.getString("iso_two_country_cd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/BerthCallReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/BerthCallReader.java index 2d79011..1e09045 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/BerthCallReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/BerthCallReader.java @@ -1,85 +1,53 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.BerthCallDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class BerthCallReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class BerthCallReader extends BaseSyncReader { public BerthCallReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public BerthCallDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTBerthCall; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTBerthCall), Long.class); - } catch (Exception e) { - return; - } + @Override + protected BerthCallDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); + Timestamp eventStaDtTs = rs.getTimestamp("event_sta_dt"); - if (nextTargetId != null) { - log.info("[BerthCallReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTBerthCall); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - Timestamp eventStaDtTs = rs.getTimestamp("event_sta_dt"); - - return BerthCallDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) - .upFacilityNm(rs.getString("up_facility_nm")) - .upFacilityType(rs.getString("up_facility_type")) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) - .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) - .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) - .positionInfo(rs.getString("position_info")) - .upClotId(rs.getObject("up_clot_id") != null ? rs.getLong("up_clot_id") : null) - .isoTwoCountryCd(rs.getString("iso_two_country_cd")) - .eventStaDt(eventStaDtTs != null ? eventStaDtTs.toLocalDateTime() : null) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTBerthCall); - businessJdbcTemplate.update(sql, targetExecutionId); + return BerthCallDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) + .upFacilityNm(rs.getString("up_facility_nm")) + .upFacilityType(rs.getString("up_facility_type")) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) + .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) + .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) + .positionInfo(rs.getString("position_info")) + .upClotId(rs.getObject("up_clot_id") != null ? rs.getLong("up_clot_id") : null) + .isoTwoCountryCd(rs.getString("iso_two_country_cd")) + .eventStaDt(eventStaDtTs != null ? eventStaDtTs.toLocalDateTime() : null) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/CurrentlyAtReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/CurrentlyAtReader.java index b62784e..e6dcb67 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/CurrentlyAtReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/CurrentlyAtReader.java @@ -1,87 +1,55 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.CurrentlyAtDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class CurrentlyAtReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class CurrentlyAtReader extends BaseSyncReader { public CurrentlyAtReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public CurrentlyAtDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTCurrentlyAt; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTCurrentlyAt), Long.class); - } catch (Exception e) { - return; - } + @Override + protected CurrentlyAtDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - if (nextTargetId != null) { - log.info("[CurrentlyAtReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTCurrentlyAt); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - - return CurrentlyAtDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .prtcllId(rs.getObject("prtcll_id") != null ? rs.getInt("prtcll_id") : null) - .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) - .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) - .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) - .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) - .upFacilityNm(rs.getString("up_facility_nm")) - .upFacilityType(rs.getString("up_facility_type")) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) - .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) - .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) - .dest(rs.getString("dest")) - .countryIsoTwoCd(rs.getString("country_iso_two_cd")) - .positionInfo(rs.getString("position_info")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTCurrentlyAt); - businessJdbcTemplate.update(sql, targetExecutionId); + return CurrentlyAtDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .prtcllId(rs.getObject("prtcll_id") != null ? rs.getInt("prtcll_id") : null) + .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) + .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) + .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) + .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) + .upFacilityNm(rs.getString("up_facility_nm")) + .upFacilityType(rs.getString("up_facility_type")) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) + .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) + .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) + .dest(rs.getString("dest")) + .countryIsoTwoCd(rs.getString("country_iso_two_cd")) + .positionInfo(rs.getString("position_info")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/DestinationReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/DestinationReader.java index 6064409..3f97c08 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/DestinationReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/DestinationReader.java @@ -1,78 +1,46 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.DestinationDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class DestinationReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class DestinationReader extends BaseSyncReader { public DestinationReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public DestinationDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTDestination; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTDestination), Long.class); - } catch (Exception e) { - return; - } + @Override + protected DestinationDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - if (nextTargetId != null) { - log.info("[DestinationReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTDestination); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - - return DestinationDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) - .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) - .positionInfo(rs.getString("position_info")) - .countryIsoTwoCd(rs.getString("country_iso_two_cd")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTDestination); - businessJdbcTemplate.update(sql, targetExecutionId); + return DestinationDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) + .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) + .positionInfo(rs.getString("position_info")) + .countryIsoTwoCd(rs.getString("country_iso_two_cd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/PortCallReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/PortCallReader.java index 910159f..50b2e19 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/PortCallReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/PortCallReader.java @@ -1,87 +1,55 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.PortCallDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class PortCallReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class PortCallReader extends BaseSyncReader { public PortCallReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public PortCallDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTShipStpovInfo; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTShipStpovInfo), Long.class); - } catch (Exception e) { - return; - } + @Override + protected PortCallDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - if (nextTargetId != null) { - log.info("[PortCallReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTShipStpovInfo); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - - return PortCallDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .prtcllId(rs.getObject("prtcll_id") != null ? rs.getInt("prtcll_id") : null) - .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) - .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) - .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) - .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) - .upFacilityNm(rs.getString("up_facility_nm")) - .upFacilityType(rs.getString("up_facility_type")) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) - .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) - .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) - .dest(rs.getString("dest")) - .countryIsoTwoCd(rs.getString("country_iso_two_cd")) - .positionInfo(rs.getString("position_info")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTShipStpovInfo); - businessJdbcTemplate.update(sql, targetExecutionId); + return PortCallDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .prtcllId(rs.getObject("prtcll_id") != null ? rs.getInt("prtcll_id") : null) + .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) + .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) + .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) + .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) + .upFacilityNm(rs.getString("up_facility_nm")) + .upFacilityType(rs.getString("up_facility_type")) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) + .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) + .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) + .dest(rs.getString("dest")) + .countryIsoTwoCd(rs.getString("country_iso_two_cd")) + .positionInfo(rs.getString("position_info")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/StsOperationReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/StsOperationReader.java index 580f78c..69cf8d5 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/StsOperationReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/StsOperationReader.java @@ -1,86 +1,54 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.StsOperationDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class StsOperationReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class StsOperationReader extends BaseSyncReader { public StsOperationReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public StsOperationDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTStsOperation; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTStsOperation), Long.class); - } catch (Exception e) { - return; - } + @Override + protected StsOperationDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); + Timestamp eventStaDtTs = rs.getTimestamp("event_sta_dt"); - if (nextTargetId != null) { - log.info("[StsOperationReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTStsOperation); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - Timestamp eventStaDtTs = rs.getTimestamp("event_sta_dt"); - - return StsOperationDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) - .upFacilityNm(rs.getString("up_facility_nm")) - .upFacilityType(rs.getString("up_facility_type")) - .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) - .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) - .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) - .positionInfo(rs.getString("position_info")) - .upPrtcllId(rs.getObject("up_prtcll_id") != null ? rs.getLong("up_prtcll_id") : null) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .stsPosition(rs.getString("sts_position")) - .stsType(rs.getString("sts_type")) - .eventStaDt(eventStaDtTs != null ? eventStaDtTs.toLocalDateTime() : null) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTStsOperation); - businessJdbcTemplate.update(sql, targetExecutionId); + return StsOperationDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) + .upFacilityNm(rs.getString("up_facility_nm")) + .upFacilityType(rs.getString("up_facility_type")) + .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) + .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) + .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) + .positionInfo(rs.getString("position_info")) + .upPrtcllId(rs.getObject("up_prtcll_id") != null ? rs.getLong("up_prtcll_id") : null) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .stsPosition(rs.getString("sts_position")) + .stsType(rs.getString("sts_type")) + .eventStaDt(eventStaDtTs != null ? eventStaDtTs.toLocalDateTime() : null) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TerminalCallReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TerminalCallReader.java index a5a9f52..b4d12ad 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TerminalCallReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TerminalCallReader.java @@ -1,88 +1,56 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.TerminalCallDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class TerminalCallReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class TerminalCallReader extends BaseSyncReader { public TerminalCallReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public TerminalCallDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTTerminalCall; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTTerminalCall), Long.class); - } catch (Exception e) { - return; - } + @Override + protected TerminalCallDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); + Timestamp eventStaDtTs = rs.getTimestamp("event_sta_dt"); - if (nextTargetId != null) { - log.info("[TerminalCallReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTTerminalCall); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - Timestamp eventStaDtTs = rs.getTimestamp("event_sta_dt"); - - return TerminalCallDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) - .upFacilityNm(rs.getString("up_facility_nm")) - .upFacilityType(rs.getString("up_facility_type")) - .countryCd(rs.getString("country_cd")) - .countryNm(rs.getString("country_nm")) - .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) - .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) - .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) - .positionInfo(rs.getString("position_info")) - .upPrtcllId(rs.getObject("up_prtcll_id") != null ? rs.getLong("up_prtcll_id") : null) - .countryIsoTwoCd(rs.getString("country_iso_two_cd")) - .eventStaDt(eventStaDtTs != null ? eventStaDtTs.toLocalDateTime() : null) - .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) - .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) - .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTTerminalCall); - businessJdbcTemplate.update(sql, targetExecutionId); + return TerminalCallDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .facilityId(rs.getObject("facility_id") != null ? rs.getInt("facility_id") : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .upFacilityId(rs.getObject("up_facility_id") != null ? rs.getInt("up_facility_id") : null) + .upFacilityNm(rs.getString("up_facility_nm")) + .upFacilityType(rs.getString("up_facility_type")) + .countryCd(rs.getString("country_cd")) + .countryNm(rs.getString("country_nm")) + .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) + .lat(rs.getObject("lat") != null ? rs.getBigDecimal("lat") : null) + .lon(rs.getObject("lon") != null ? rs.getBigDecimal("lon") : null) + .positionInfo(rs.getString("position_info")) + .upPrtcllId(rs.getObject("up_prtcll_id") != null ? rs.getLong("up_prtcll_id") : null) + .countryIsoTwoCd(rs.getString("country_iso_two_cd")) + .eventStaDt(eventStaDtTs != null ? eventStaDtTs.toLocalDateTime() : null) + .lwrnkFacilityId(rs.getObject("lwrnk_facility_id") != null ? rs.getInt("lwrnk_facility_id") : null) + .lwrnkFacilityDesc(rs.getString("lwrnk_facility_desc")) + .lwrnkFacilityType(rs.getString("lwrnk_facility_type")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TransitReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TransitReader.java index bbe235d..77b2c65 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TransitReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/reader/TransitReader.java @@ -1,72 +1,40 @@ package com.snp.batch.jobs.datasync.batch.movement.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.movement.dto.TransitDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class TransitReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class TransitReader extends BaseSyncReader { public TransitReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public TransitDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTTransit; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTTransit), Long.class); - } catch (Exception e) { - return; - } + @Override + protected TransitDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - if (nextTargetId != null) { - log.info("[TransitReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTTransit); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp mvmnDtTs = rs.getTimestamp("mvmn_dt"); - - return TransitDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .mvmnType(rs.getString("mvmn_type")) - .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) - .facilityNm(rs.getString("facility_nm")) - .facilityType(rs.getString("facility_type")) - .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTTransit); - businessJdbcTemplate.update(sql, targetExecutionId); + return TransitDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .mvmnType(rs.getString("mvmn_type")) + .mvmnDt(mvmnDtTs != null ? mvmnDtTs.toLocalDateTime() : null) + .facilityNm(rs.getString("facility_nm")) + .facilityType(rs.getString("facility_type")) + .draft(rs.getObject("draft") != null ? rs.getBigDecimal("draft") : null) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/repository/MovementRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/repository/MovementRepositoryImpl.java index 8a6b01f..b9a66bb 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/movement/repository/MovementRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/movement/repository/MovementRepositoryImpl.java @@ -80,7 +80,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -92,7 +92,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -137,7 +137,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -182,7 +182,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -230,7 +230,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -269,7 +269,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -317,7 +317,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -363,7 +363,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -411,7 +411,7 @@ public class MovementRepositoryImpl extends MultiDataSourceJdbcRepository pscDetailWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourcePscDetail); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourcePscDetail); } @Bean public BatchWriteListener pscDefectWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourcePscDefect); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourcePscDefect); } @Bean public BatchWriteListener pscAllCertificateWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourcePscAllCertificate); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourcePscAllCertificate); } // --- Steps --- @@ -154,12 +148,10 @@ public class PscSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(pscDetailWriteListener()) .build(); } @@ -168,12 +160,10 @@ public class PscSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(pscDefectReader(businessDataSource, tableMetaInfo)) .processor(new PscDefectProcessor()) .writer(new PscDefectWriter(pscRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(pscDefectWriteListener()) .build(); } @@ -182,12 +172,10 @@ public class PscSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(pscAllCertificateReader(businessDataSource, tableMetaInfo)) .processor(new PscAllCertificateProcessor()) .writer(new PscAllCertificateWriter(pscRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(pscAllCertificateWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscAllCertificateReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscAllCertificateReader.java index 568e9df..ac86608 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscAllCertificateReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscAllCertificateReader.java @@ -1,87 +1,55 @@ package com.snp.batch.jobs.datasync.batch.psc.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.psc.dto.PscAllCertificateDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class PscAllCertificateReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class PscAllCertificateReader extends BaseSyncReader { public PscAllCertificateReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public PscAllCertificateDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourcePscAllCertificate; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourcePscAllCertificate), Long.class); - } catch (Exception e) { - return; - } + @Override + protected PscAllCertificateDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp expryYmdTs = rs.getTimestamp("expry_ymd"); + Timestamp lastInspectionYmdTs = rs.getTimestamp("last_inspection_ymd"); - if (nextTargetId != null) { - log.info("[PscAllCertificateReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourcePscAllCertificate); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp expryYmdTs = rs.getTimestamp("expry_ymd"); - Timestamp lastInspectionYmdTs = rs.getTimestamp("last_inspection_ymd"); - - return PscAllCertificateDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .certId(rs.getString("cert_id")) - .inspectionId(rs.getString("inspection_id")) - .imoNo(rs.getString("imo_no")) - .certfNmCd(rs.getString("certf_nm_cd")) - .certfNm(rs.getString("certf_nm")) - .issueEnginesCd(rs.getString("issue_engines_cd")) - .issueEngines(rs.getString("issue_engines")) - .etcIssueEngines(rs.getString("etc_issue_engines")) - .issueYmd(rs.getString("issue_ymd")) - .expryYmd(expryYmdTs != null ? expryYmdTs.toLocalDateTime() : null) - .lastInspectionYmd(lastInspectionYmdTs != null ? lastInspectionYmdTs.toLocalDateTime() : null) - .inspectionEnginesCd(rs.getString("inspection_engines_cd")) - .inspectionEngines(rs.getString("inspection_engines")) - .etcInspectionEngines(rs.getString("etc_inspection_engines")) - .recentInspectionPlc(rs.getString("recent_inspection_plc")) - .recentInspectionPlcCd(rs.getString("recent_inspection_plc_cd")) - .inspectionEnginesType(rs.getString("inspection_engines_type")) - .checkYmd(rs.getString("check_ymd")) - .insptr(rs.getString("insptr")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourcePscAllCertificate); - businessJdbcTemplate.update(sql, targetExecutionId); + return PscAllCertificateDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .certId(rs.getString("cert_id")) + .inspectionId(rs.getString("inspection_id")) + .imoNo(rs.getString("imo_no")) + .certfNmCd(rs.getString("certf_nm_cd")) + .certfNm(rs.getString("certf_nm")) + .issueEnginesCd(rs.getString("issue_engines_cd")) + .issueEngines(rs.getString("issue_engines")) + .etcIssueEngines(rs.getString("etc_issue_engines")) + .issueYmd(rs.getString("issue_ymd")) + .expryYmd(expryYmdTs != null ? expryYmdTs.toLocalDateTime() : null) + .lastInspectionYmd(lastInspectionYmdTs != null ? lastInspectionYmdTs.toLocalDateTime() : null) + .inspectionEnginesCd(rs.getString("inspection_engines_cd")) + .inspectionEngines(rs.getString("inspection_engines")) + .etcInspectionEngines(rs.getString("etc_inspection_engines")) + .recentInspectionPlc(rs.getString("recent_inspection_plc")) + .recentInspectionPlcCd(rs.getString("recent_inspection_plc_cd")) + .inspectionEnginesType(rs.getString("inspection_engines_type")) + .checkYmd(rs.getString("check_ymd")) + .insptr(rs.getString("insptr")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDefectReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDefectReader.java index f943a3e..82b9e0b 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDefectReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDefectReader.java @@ -1,87 +1,55 @@ package com.snp.batch.jobs.datasync.batch.psc.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.psc.dto.PscDefectDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class PscDefectReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class PscDefectReader extends BaseSyncReader { public PscDefectReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public PscDefectDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourcePscDefect; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourcePscDefect), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[PscDefectReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourcePscDefect); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return PscDefectDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .defectId(rs.getString("defect_id")) - .inspectionId(rs.getString("inspection_id")) - .actnOne(rs.getString("actn_one")) - .actnTwo(rs.getString("actn_two")) - .actnThr(rs.getString("actn_thr")) - .actnCdOne(rs.getString("actn_cd_one")) - .actnCdTwo(rs.getString("actn_cd_two")) - .actnCdThr(rs.getString("actn_cd_thr")) - .clficRespsbYn(rs.getString("clfic_respsb_yn")) - .defectCd(rs.getString("defect_cd")) - .defectCn(rs.getString("defect_cn")) - .defectIemCd(rs.getString("defect_iem_cd")) - .detainedReasonDefect(rs.getString("detained_reason_defect")) - .mainDefectCd(rs.getString("main_defect_cd")) - .mainDefectCn(rs.getString("main_defect_cn")) - .defectTypeCd(rs.getString("defect_type_cd")) - .defectTypeNm(rs.getString("defect_type_nm")) - .etcActn(rs.getString("etc_actn")) - .etcPubcEnginesRespsb(rs.getString("etc_pubc_engines_respsb")) - .pubcEnginesRespsb(rs.getString("pubc_engines_respsb")) - .pubcEnginesRespsbCd(rs.getString("pubc_engines_respsb_cd")) - .pubcEnginesRespsbYn(rs.getString("pubc_engines_respsb_yn")) - .acdntDamgYn(rs.getString("acdnt_damg_yn")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourcePscDefect); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected PscDefectDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return PscDefectDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .defectId(rs.getString("defect_id")) + .inspectionId(rs.getString("inspection_id")) + .actnOne(rs.getString("actn_one")) + .actnTwo(rs.getString("actn_two")) + .actnThr(rs.getString("actn_thr")) + .actnCdOne(rs.getString("actn_cd_one")) + .actnCdTwo(rs.getString("actn_cd_two")) + .actnCdThr(rs.getString("actn_cd_thr")) + .clficRespsbYn(rs.getString("clfic_respsb_yn")) + .defectCd(rs.getString("defect_cd")) + .defectCn(rs.getString("defect_cn")) + .defectIemCd(rs.getString("defect_iem_cd")) + .detainedReasonDefect(rs.getString("detained_reason_defect")) + .mainDefectCd(rs.getString("main_defect_cd")) + .mainDefectCn(rs.getString("main_defect_cn")) + .defectTypeCd(rs.getString("defect_type_cd")) + .defectTypeNm(rs.getString("defect_type_nm")) + .etcActn(rs.getString("etc_actn")) + .etcPubcEnginesRespsb(rs.getString("etc_pubc_engines_respsb")) + .pubcEnginesRespsb(rs.getString("pubc_engines_respsb")) + .pubcEnginesRespsbCd(rs.getString("pubc_engines_respsb_cd")) + .pubcEnginesRespsbYn(rs.getString("pubc_engines_respsb_yn")) + .acdntDamgYn(rs.getString("acdnt_damg_yn")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDetailReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDetailReader.java index f7d9e3d..b27c926 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDetailReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/reader/PscDetailReader.java @@ -1,98 +1,66 @@ package com.snp.batch.jobs.datasync.batch.psc.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.psc.dto.PscDetailDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class PscDetailReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class PscDetailReader extends BaseSyncReader { public PscDetailReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public PscDetailDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourcePscDetail; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourcePscDetail), Long.class); - } catch (Exception e) { - return; - } + @Override + protected PscDetailDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp inspectionYmdTs = rs.getTimestamp("inspection_ymd"); + Timestamp tkoffPrmtYmdTs = rs.getTimestamp("tkoff_prmt_ymd"); + Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); - if (nextTargetId != null) { - log.info("[PscDetailReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourcePscDetail); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp inspectionYmdTs = rs.getTimestamp("inspection_ymd"); - Timestamp tkoffPrmtYmdTs = rs.getTimestamp("tkoff_prmt_ymd"); - Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); - - return PscDetailDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .inspectionId(rs.getString("inspection_id")) - .typeId(rs.getString("type_id")) - .clsgnNo(rs.getString("clsgn_no")) - .chrter(rs.getString("chrter")) - .clfic(rs.getString("clfic")) - .country(rs.getString("country")) - .inspectionYmd(inspectionYmdTs != null ? inspectionYmdTs.toLocalDateTime() : null) - .tkoffPrmtYmd(tkoffPrmtYmdTs != null ? tkoffPrmtYmdTs.toLocalDateTime() : null) - .shipDetainedYn(rs.getString("ship_detained_yn")) - .dwt(rs.getString("dwt")) - .expndInspectionYn(rs.getString("expnd_inspection_yn")) - .flg(rs.getString("flg")) - .folwInspectionYn(rs.getString("folw_inspection_yn")) - .gt(rs.getString("gt")) - .inspectionPortNm(rs.getString("inspection_port_nm")) - .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toLocalDateTime() : null) - .shipMngr(rs.getString("ship_mngr")) - .detainedDays(rs.getObject("detained_days") != null ? rs.getInt("detained_days") : null) - .defectCnt(rs.getString("defect_cnt")) - .defectCntDays(rs.getBigDecimal("defect_cnt_days")) - .etcInspectionType(rs.getString("etc_inspection_type")) - .shponr(rs.getString("shponr")) - .shipNm(rs.getString("ship_nm")) - .shipTypeCd(rs.getString("ship_type_cd")) - .shipTypeNm(rs.getString("ship_type_nm")) - .dataSrc(rs.getString("data_src")) - .unPortCd(rs.getString("un_port_cd")) - .buildYy(rs.getString("build_yy")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourcePscDetail); - businessJdbcTemplate.update(sql, targetExecutionId); + return PscDetailDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .inspectionId(rs.getString("inspection_id")) + .typeId(rs.getString("type_id")) + .clsgnNo(rs.getString("clsgn_no")) + .chrter(rs.getString("chrter")) + .clfic(rs.getString("clfic")) + .country(rs.getString("country")) + .inspectionYmd(inspectionYmdTs != null ? inspectionYmdTs.toLocalDateTime() : null) + .tkoffPrmtYmd(tkoffPrmtYmdTs != null ? tkoffPrmtYmdTs.toLocalDateTime() : null) + .shipDetainedYn(rs.getString("ship_detained_yn")) + .dwt(rs.getString("dwt")) + .expndInspectionYn(rs.getString("expnd_inspection_yn")) + .flg(rs.getString("flg")) + .folwInspectionYn(rs.getString("folw_inspection_yn")) + .gt(rs.getString("gt")) + .inspectionPortNm(rs.getString("inspection_port_nm")) + .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toLocalDateTime() : null) + .shipMngr(rs.getString("ship_mngr")) + .detainedDays(rs.getObject("detained_days") != null ? rs.getInt("detained_days") : null) + .defectCnt(rs.getString("defect_cnt")) + .defectCntDays(rs.getBigDecimal("defect_cnt_days")) + .etcInspectionType(rs.getString("etc_inspection_type")) + .shponr(rs.getString("shponr")) + .shipNm(rs.getString("ship_nm")) + .shipTypeCd(rs.getString("ship_type_cd")) + .shipTypeNm(rs.getString("ship_type_nm")) + .dataSrc(rs.getString("data_src")) + .unPortCd(rs.getString("un_port_cd")) + .buildYy(rs.getString("build_yy")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/repository/PscRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/repository/PscRepositoryImpl.java index d6f292f..43e4dd4 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/psc/repository/PscRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/psc/repository/PscRepositoryImpl.java @@ -83,7 +83,7 @@ public class PscRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -95,7 +95,7 @@ public class PscRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -151,7 +151,7 @@ public class PscRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -201,7 +201,7 @@ public class PscRepositoryImpl extends MultiDataSourceJdbcRepository { @Bean public BatchWriteListener riskWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceRisk); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceRisk); } // --- Steps --- @@ -112,12 +108,10 @@ public class RiskSyncJobConfig extends BaseJobConfig { public Step riskSyncStep() { log.info("Step 생성: riskSyncStep"); return new StepBuilder(getStepName(), jobRepository) - .chunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) - .listener(new GroupByExecutionIdChunkListener()) .listener(riskWriteListener()) .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/risk/reader/RiskReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/risk/reader/RiskReader.java index 724efd0..59ad094 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/risk/reader/RiskReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/risk/reader/RiskReader.java @@ -1,108 +1,76 @@ package com.snp.batch.jobs.datasync.batch.risk.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.risk.dto.RiskDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; +import java.sql.ResultSet; +import java.sql.SQLException; import java.sql.Timestamp; -import java.util.ArrayList; -import java.util.List; @Slf4j -public class RiskReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class RiskReader extends BaseSyncReader { public RiskReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public RiskDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceRisk; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceRisk), Long.class); - } catch (Exception e) { - return; - } + @Override + protected RiskDto mapRow(ResultSet rs, Long targetId) throws SQLException { + Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); - if (nextTargetId != null) { - log.info("[RiskReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceRisk); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - Timestamp lastMdfcnDtTs = rs.getTimestamp("last_mdfcn_dt"); - - return RiskDto.builder() - .jobExecutionId(targetId) - .imoNo(rs.getString("imo_no")) - .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toLocalDateTime() : null) - .riskDataMaint(rs.getString("risk_data_maint")) - .aisNotrcvElpsDays(rs.getString("ais_notrcv_elps_days")) - .aisLwrnkDays(rs.getString("ais_lwrnk_days")) - .aisUpImoDesc(rs.getString("ais_up_imo_desc")) - .othrShipNmVoyYn(rs.getString("othr_ship_nm_voy_yn")) - .mmsiAnomMessage(rs.getString("mmsi_anom_message")) - .recentDarkActv(rs.getString("recent_dark_actv")) - .portPrtcll(rs.getString("port_prtcll")) - .portRisk(rs.getString("port_risk")) - .stsJob(rs.getString("sts_job")) - .driftChg(rs.getString("drift_chg")) - .riskEvent(rs.getString("risk_event")) - .ntnltyChg(rs.getString("ntnlty_chg")) - .ntnltyPrsMouPerf(rs.getString("ntnlty_prs_mou_perf")) - .ntnltyTkyMouPerf(rs.getString("ntnlty_tky_mou_perf")) - .ntnltyUscgMouPerf(rs.getString("ntnlty_uscg_mou_perf")) - .uscgExclShipCert(rs.getString("uscg_excl_ship_cert")) - .pscInspectionElpsHr(rs.getString("psc_inspection_elps_hr")) - .pscInspection(rs.getString("psc_inspection")) - .pscDefect(rs.getString("psc_defect")) - .pscDetained(rs.getString("psc_detained")) - .nowSmgrcEvdc(rs.getString("now_smgrc_evdc")) - .doccChg(rs.getString("docc_chg")) - .nowClfic(rs.getString("now_clfic")) - .clficStatusChg(rs.getString("clfic_status_chg")) - .pniInsrnc(rs.getString("pni_insrnc")) - .shipNmChg(rs.getString("ship_nm_chg")) - .gboChg(rs.getString("gbo_chg")) - .vslage(rs.getString("vslage")) - .ilglFshrViol(rs.getString("ilgl_fshr_viol")) - .draftChg(rs.getString("draft_chg")) - .recentSanctionPrtcll(rs.getString("recent_sanction_prtcll")) - .snglShipVoy(rs.getString("sngl_ship_voy")) - .fltsfty(rs.getString("fltsfty")) - .fltPsc(rs.getString("flt_psc")) - .spcInspectionOvdue(rs.getString("spc_inspection_ovdue")) - .ownrUnk(rs.getString("ownr_unk")) - .rssPortCall(rs.getString("rss_port_call")) - .rssOwnrReg(rs.getString("rss_ownr_reg")) - .rssSts(rs.getString("rss_sts")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceRisk); - businessJdbcTemplate.update(sql, targetExecutionId); + return RiskDto.builder() + .jobExecutionId(targetId) + .imoNo(rs.getString("imo_no")) + .lastMdfcnDt(lastMdfcnDtTs != null ? lastMdfcnDtTs.toLocalDateTime() : null) + .riskDataMaint(rs.getString("risk_data_maint")) + .aisNotrcvElpsDays(rs.getString("ais_notrcv_elps_days")) + .aisLwrnkDays(rs.getString("ais_lwrnk_days")) + .aisUpImoDesc(rs.getString("ais_up_imo_desc")) + .othrShipNmVoyYn(rs.getString("othr_ship_nm_voy_yn")) + .mmsiAnomMessage(rs.getString("mmsi_anom_message")) + .recentDarkActv(rs.getString("recent_dark_actv")) + .portPrtcll(rs.getString("port_prtcll")) + .portRisk(rs.getString("port_risk")) + .stsJob(rs.getString("sts_job")) + .driftChg(rs.getString("drift_chg")) + .riskEvent(rs.getString("risk_event")) + .ntnltyChg(rs.getString("ntnlty_chg")) + .ntnltyPrsMouPerf(rs.getString("ntnlty_prs_mou_perf")) + .ntnltyTkyMouPerf(rs.getString("ntnlty_tky_mou_perf")) + .ntnltyUscgMouPerf(rs.getString("ntnlty_uscg_mou_perf")) + .uscgExclShipCert(rs.getString("uscg_excl_ship_cert")) + .pscInspectionElpsHr(rs.getString("psc_inspection_elps_hr")) + .pscInspection(rs.getString("psc_inspection")) + .pscDefect(rs.getString("psc_defect")) + .pscDetained(rs.getString("psc_detained")) + .nowSmgrcEvdc(rs.getString("now_smgrc_evdc")) + .doccChg(rs.getString("docc_chg")) + .nowClfic(rs.getString("now_clfic")) + .clficStatusChg(rs.getString("clfic_status_chg")) + .pniInsrnc(rs.getString("pni_insrnc")) + .shipNmChg(rs.getString("ship_nm_chg")) + .gboChg(rs.getString("gbo_chg")) + .vslage(rs.getString("vslage")) + .ilglFshrViol(rs.getString("ilgl_fshr_viol")) + .draftChg(rs.getString("draft_chg")) + .recentSanctionPrtcll(rs.getString("recent_sanction_prtcll")) + .snglShipVoy(rs.getString("sngl_ship_voy")) + .fltsfty(rs.getString("fltsfty")) + .fltPsc(rs.getString("flt_psc")) + .spcInspectionOvdue(rs.getString("spc_inspection_ovdue")) + .ownrUnk(rs.getString("ownr_unk")) + .rssPortCall(rs.getString("rss_port_call")) + .rssOwnrReg(rs.getString("rss_ownr_reg")) + .rssSts(rs.getString("rss_sts")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/risk/repository/RiskRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/risk/repository/RiskRepositoryImpl.java index fbc101f..9ac442b 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/risk/repository/RiskRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/risk/repository/RiskRepositoryImpl.java @@ -80,7 +80,7 @@ public class RiskRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -92,7 +92,7 @@ public class RiskRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -113,7 +113,7 @@ public class RiskRepositoryImpl extends MultiDataSourceJdbcRepository shipWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceShipDetailData); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceShipDetailData); } @Bean public BatchWriteListener ownerHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceOwnerHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceOwnerHistory); } @Bean public BatchWriteListener shipAddInfoWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceAdditionalShipsData); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceAdditionalShipsData); } @Bean public BatchWriteListener bareboatCharterHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceBareboatCharterHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceBareboatCharterHistory); } @Bean public BatchWriteListener callsignAndMmsiHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceCallsignAndMmsiHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceCallsignAndMmsiHistory); } @Bean public BatchWriteListener classHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceClassHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceClassHistory); } @Bean public BatchWriteListener companyVesselRelationshipsWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceCompanyVesselRelationships); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceCompanyVesselRelationships); } @Bean public BatchWriteListener crewListWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceCrewList); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceCrewList); } @Bean public BatchWriteListener darkActivityConfirmedWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceDarkActivityConfirmed); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceDarkActivityConfirmed); } @Bean public BatchWriteListener flagHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceFlagHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceFlagHistory); } @Bean public BatchWriteListener groupBeneficialOwnerHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceGroupBeneficialOwnerHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceGroupBeneficialOwnerHistory); } @Bean public BatchWriteListener iceClassWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceIceClass); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceIceClass); } @Bean public BatchWriteListener nameHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceNameHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceNameHistory); } @Bean public BatchWriteListener operatorHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceOperatorHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceOperatorHistory); } @Bean public BatchWriteListener pandIHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourcePandiHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourcePandiHistory); } @Bean public BatchWriteListener safetyManagementCertificateHistWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceSafetyManagementCertificateHist); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceSafetyManagementCertificateHist); } @Bean public BatchWriteListener shipManagerHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceShipManagerHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceShipManagerHistory); } @Bean public BatchWriteListener sisterShipLinksWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceSisterShipLinks); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceSisterShipLinks); } @Bean public BatchWriteListener specialFeatureWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceSpecialFeature); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceSpecialFeature); } @Bean public BatchWriteListener statusHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceStatusHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceStatusHistory); } @Bean public BatchWriteListener stowageCommodityWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceStowageCommodity); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceStowageCommodity); } @Bean public BatchWriteListener surveyDatesWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceSurveyDates); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceSurveyDates); } @Bean public BatchWriteListener surveyDatesHistoryUniqueWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceSurveyDatesHistoryUnique); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceSurveyDatesHistoryUnique); } @Bean public BatchWriteListener technicalManagerHistoryWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTechnicalManagerHistory); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTechnicalManagerHistory); } @Bean public BatchWriteListener thrustersWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceThrusters); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceThrusters); } @Bean public BatchWriteListener tbCompanyDetailWriteListener() { - String sql = CommonSql.getCompleteBatchQuery(tableMetaInfo.sourceTbCompanyDetail); - return new BatchWriteListener<>(businessJdbcTemplate, sql); + return new BatchWriteListener<>(businessJdbcTemplate, tableMetaInfo.sourceTbCompanyDetail); } // --- Steps --- @@ -634,12 +605,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(createReader()) .processor(createProcessor()) .writer(createWriter()) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 (ThreadLocal 설정) - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 (ThreadLocal 정리) .listener(shipWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -648,12 +617,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(ownerHistoryReader(businessDataSource, tableMetaInfo)) .processor(new OwnerHistoryProcessor()) .writer(new OwnerHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(ownerHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -662,12 +629,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(shipAddInfoReader(businessDataSource, tableMetaInfo)) .processor(new ShipAddInfoProcessor()) .writer(new ShipAddInfoWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(shipAddInfoWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -676,12 +641,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(bareboatCharterHistoryReader(businessDataSource, tableMetaInfo)) .processor(new BareboatCharterHistoryProcessor()) .writer(new BareboatCharterHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(bareboatCharterHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -690,12 +653,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(callsignAndMmsiHistoryReader(businessDataSource, tableMetaInfo)) .processor(new CallsignAndMmsiHistoryProcessor()) .writer(new CallsignAndMmsiHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(callsignAndMmsiHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -704,12 +665,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(classHistoryReader(businessDataSource, tableMetaInfo)) .processor(new ClassHistoryProcessor()) .writer(new ClassHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(classHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -718,12 +677,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(companyVesselRelationshipsReader(businessDataSource, tableMetaInfo)) .processor(new CompanyVesselRelationshipsProcessor()) .writer(new CompanyVesselRelationshipsWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(companyVesselRelationshipsWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -732,12 +689,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(crewListReader(businessDataSource, tableMetaInfo)) .processor(new CrewListProcessor()) .writer(new CrewListWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(crewListWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -746,12 +701,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(darkActivityConfirmedReader(businessDataSource, tableMetaInfo)) .processor(new DarkActivityConfirmedProcessor()) .writer(new DarkActivityConfirmedWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(darkActivityConfirmedWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -760,12 +713,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(flagHistoryReader(businessDataSource, tableMetaInfo)) .processor(new FlagHistoryProcessor()) .writer(new FlagHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(flagHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -774,12 +725,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(groupBeneficialOwnerHistoryReader(businessDataSource, tableMetaInfo)) .processor(new GroupBeneficialOwnerHistoryProcessor()) .writer(new GroupBeneficialOwnerHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(groupBeneficialOwnerHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -788,12 +737,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(iceClassReader(businessDataSource, tableMetaInfo)) .processor(new IceClassProcessor()) .writer(new IceClassWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(iceClassWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -802,12 +749,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(nameHistoryReader(businessDataSource, tableMetaInfo)) .processor(new NameHistoryProcessor()) .writer(new NameHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(nameHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -816,12 +761,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(operatorHistoryReader(businessDataSource, tableMetaInfo)) .processor(new OperatorHistoryProcessor()) .writer(new OperatorHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(operatorHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -830,12 +773,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(pandIHistoryReader(businessDataSource, tableMetaInfo)) .processor(new PandIHistoryProcessor()) .writer(new PandIHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(pandIHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -844,12 +785,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(safetyManagementCertificateHistReader(businessDataSource, tableMetaInfo)) .processor(new SafetyManagementCertificateHistProcessor()) .writer(new SafetyManagementCertificateHistWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(safetyManagementCertificateHistWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -858,12 +797,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(shipManagerHistoryReader(businessDataSource, tableMetaInfo)) .processor(new ShipManagerHistoryProcessor()) .writer(new ShipManagerHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(shipManagerHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -872,12 +809,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(sisterShipLinksReader(businessDataSource, tableMetaInfo)) .processor(new SisterShipLinksProcessor()) .writer(new SisterShipLinksWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(sisterShipLinksWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -886,12 +821,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(specialFeatureReader(businessDataSource, tableMetaInfo)) .processor(new SpecialFeatureProcessor()) .writer(new SpecialFeatureWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(specialFeatureWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -900,12 +833,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(statusHistoryReader(businessDataSource, tableMetaInfo)) .processor(new StatusHistoryProcessor()) .writer(new StatusHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(statusHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -914,12 +845,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(stowageCommodityReader(businessDataSource, tableMetaInfo)) .processor(new StowageCommodityProcessor()) .writer(new StowageCommodityWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(stowageCommodityWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -928,12 +857,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(surveyDatesReader(businessDataSource, tableMetaInfo)) .processor(new SurveyDatesProcessor()) .writer(new SurveyDatesWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(surveyDatesWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -942,12 +869,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(surveyDatesHistoryUniqueReader(businessDataSource, tableMetaInfo)) .processor(new SurveyDatesHistoryUniqueProcessor()) .writer(new SurveyDatesHistoryUniqueWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(surveyDatesHistoryUniqueWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -956,12 +881,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(technicalManagerHistoryReader(businessDataSource, tableMetaInfo)) .processor(new TechnicalManagerHistoryProcessor()) .writer(new TechnicalManagerHistoryWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(technicalManagerHistoryWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -970,12 +893,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(thrustersReader(businessDataSource, tableMetaInfo)) .processor(new ThrustersProcessor()) .writer(new ThrustersWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(thrustersWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } @@ -984,12 +905,10 @@ public class ShipDetailSyncJobConfig extends BaseJobConfigchunk(new GroupByExecutionIdPolicy(), transactionManager) + .chunk(Integer.MAX_VALUE, transactionManager) .reader(tbCompanyDetailReader(businessDataSource, tableMetaInfo)) .processor(new TbCompanyDetailProcessor()) .writer(new TbCompanyDetailWriter(shipRepository, transactionManager, subChunkSize)) - .listener(new GroupByExecutionIdReadListener()) // Reader 리스너 - .listener(new GroupByExecutionIdChunkListener()) // Chunk 리스너 .listener(tbCompanyDetailWriteListener()) // Write 완료 후 batch_flag 업데이트 .build(); } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/BareboatCharterHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/BareboatCharterHistoryReader.java index 3ab79b7..5706882 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/BareboatCharterHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/BareboatCharterHistoryReader.java @@ -1,73 +1,37 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.BareboatCharterHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class BareboatCharterHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class BareboatCharterHistoryReader extends BaseSyncReader { public BareboatCharterHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public BareboatCharterHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceBareboatCharterHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceBareboatCharterHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[BareboatCharterHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceBareboatCharterHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return BareboatCharterHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .bbctrSeq(rs.getString("bbctr_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .bbctrCompanyCd(rs.getString("bbctr_company_cd")) - .bbctrCompany(rs.getString("bbctr_company")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceBareboatCharterHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected BareboatCharterHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return BareboatCharterHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .bbctrSeq(rs.getString("bbctr_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .bbctrCompanyCd(rs.getString("bbctr_company_cd")) + .bbctrCompany(rs.getString("bbctr_company")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CallsignAndMmsiHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CallsignAndMmsiHistoryReader.java index 4d54f93..909773e 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CallsignAndMmsiHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CallsignAndMmsiHistoryReader.java @@ -1,73 +1,37 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.CallsignAndMmsiHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class CallsignAndMmsiHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class CallsignAndMmsiHistoryReader extends BaseSyncReader { public CallsignAndMmsiHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public CallsignAndMmsiHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceCallsignAndMmsiHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceCallsignAndMmsiHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[CallsignAndMmsiHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceCallsignAndMmsiHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return CallsignAndMmsiHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipIdntfSeq(rs.getString("ship_idntf_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .clsgnNo(rs.getString("clsgn_no")) - .mmsiNo(rs.getString("mmsi_no")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceCallsignAndMmsiHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected CallsignAndMmsiHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return CallsignAndMmsiHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipIdntfSeq(rs.getString("ship_idntf_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .clsgnNo(rs.getString("clsgn_no")) + .mmsiNo(rs.getString("mmsi_no")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ClassHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ClassHistoryReader.java index d5ccbf2..4d0eef2 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ClassHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ClassHistoryReader.java @@ -1,76 +1,40 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.ClassHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class ClassHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class ClassHistoryReader extends BaseSyncReader { public ClassHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public ClassHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceClassHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceClassHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[ClassHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceClassHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return ClassHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .clficHstrySeq(rs.getString("clfic_hstry_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .clficCd(rs.getString("clfic_cd")) - .clficId(rs.getString("clfic_id")) - .clficAstnNm(rs.getString("clfic_asctn_nm")) - .clficHasYn(rs.getString("clfic_has_yn")) - .nowYn(rs.getString("now_yn")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceClassHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected ClassHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return ClassHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .clficHstrySeq(rs.getString("clfic_hstry_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .clficCd(rs.getString("clfic_cd")) + .clficId(rs.getString("clfic_id")) + .clficAstnNm(rs.getString("clfic_asctn_nm")) + .clficHasYn(rs.getString("clfic_has_yn")) + .nowYn(rs.getString("now_yn")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CompanyVesselRelationshipsReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CompanyVesselRelationshipsReader.java index f313ab8..f3f68f6 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CompanyVesselRelationshipsReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CompanyVesselRelationshipsReader.java @@ -1,89 +1,53 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.CompanyVesselRelationshipsDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class CompanyVesselRelationshipsReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class CompanyVesselRelationshipsReader extends BaseSyncReader { public CompanyVesselRelationshipsReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public CompanyVesselRelationshipsDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceCompanyVesselRelationships; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceCompanyVesselRelationships), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[CompanyVesselRelationshipsReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceCompanyVesselRelationships); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return CompanyVesselRelationshipsDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .doccHasCompanyCd(rs.getString("docc_has_company_cd")) - .doccHasCompany(rs.getString("docc_has_company")) - .groupActlOwnr(rs.getString("group_actl_ownr")) - .groupActlOwnrCd(rs.getString("group_actl_ownr_cd")) - .shipOperator(rs.getString("ship_operator")) - .shipOperatorCd(rs.getString("ship_operator_cd")) - .rgOwnr(rs.getString("rg_ownr")) - .rgOwnrCd(rs.getString("rg_ownr_cd")) - .shipMngCompany(rs.getString("ship_mng_company")) - .shipMngCompanyCd(rs.getString("ship_mng_company_cd")) - .techMngCompany(rs.getString("tech_mng_company")) - .techMngCompanyCd(rs.getString("tech_mng_company_cd")) - .doccGroup(rs.getString("docc_group")) - .doccGroupCd(rs.getString("docc_group_cd")) - .shipOperatorGroup(rs.getString("ship_operator_group")) - .shipOperatorGroupCd(rs.getString("ship_operator_group_cd")) - .shipMngCompanyGroup(rs.getString("ship_mng_company_group")) - .shipMngCompanyGroupCd(rs.getString("ship_mng_company_group_cd")) - .techMngCompanyGroup(rs.getString("tech_mng_company_group")) - .techMngCompanyGroupCd(rs.getString("tech_mng_company_group_cd")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceCompanyVesselRelationships); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected CompanyVesselRelationshipsDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return CompanyVesselRelationshipsDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .doccHasCompanyCd(rs.getString("docc_has_company_cd")) + .doccHasCompany(rs.getString("docc_has_company")) + .groupActlOwnr(rs.getString("group_actl_ownr")) + .groupActlOwnrCd(rs.getString("group_actl_ownr_cd")) + .shipOperator(rs.getString("ship_operator")) + .shipOperatorCd(rs.getString("ship_operator_cd")) + .rgOwnr(rs.getString("rg_ownr")) + .rgOwnrCd(rs.getString("rg_ownr_cd")) + .shipMngCompany(rs.getString("ship_mng_company")) + .shipMngCompanyCd(rs.getString("ship_mng_company_cd")) + .techMngCompany(rs.getString("tech_mng_company")) + .techMngCompanyCd(rs.getString("tech_mng_company_cd")) + .doccGroup(rs.getString("docc_group")) + .doccGroupCd(rs.getString("docc_group_cd")) + .shipOperatorGroup(rs.getString("ship_operator_group")) + .shipOperatorGroupCd(rs.getString("ship_operator_group_cd")) + .shipMngCompanyGroup(rs.getString("ship_mng_company_group")) + .shipMngCompanyGroupCd(rs.getString("ship_mng_company_group_cd")) + .techMngCompanyGroup(rs.getString("tech_mng_company_group")) + .techMngCompanyGroupCd(rs.getString("tech_mng_company_group_cd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CrewListReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CrewListReader.java index f98da96..202c910 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CrewListReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/CrewListReader.java @@ -1,80 +1,44 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.CrewListDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class CrewListReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class CrewListReader extends BaseSyncReader { public CrewListReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public CrewListDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceCrewList; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceCrewList), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[CrewListReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceCrewList); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return CrewListDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .crewId(rs.getString("crew_id")) - .shipNm(rs.getString("ship_nm")) - .ntnlty(rs.getString("ntnlty")) - .crewRstrYmd(rs.getString("crew_rstr_ymd")) - .oaCrewCnt(rs.getBigDecimal("oa_crew_cnt")) - .genCrewCnt(rs.getBigDecimal("gen_crew_cnt")) - .offcrCnt(rs.getBigDecimal("offcr_cnt")) - .apprOffcrCnt(rs.getBigDecimal("appr_offcr_cnt")) - .trneCnt(rs.getBigDecimal("trne_cnt")) - .embrkMntncCrewCnt(rs.getBigDecimal("embrk_mntnc_crew_cnt")) - .unrprtCnt(rs.getBigDecimal("unrprt_cnt")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceCrewList); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected CrewListDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return CrewListDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .crewId(rs.getString("crew_id")) + .shipNm(rs.getString("ship_nm")) + .ntnlty(rs.getString("ntnlty")) + .crewRstrYmd(rs.getString("crew_rstr_ymd")) + .oaCrewCnt(rs.getBigDecimal("oa_crew_cnt")) + .genCrewCnt(rs.getBigDecimal("gen_crew_cnt")) + .offcrCnt(rs.getBigDecimal("offcr_cnt")) + .apprOffcrCnt(rs.getBigDecimal("appr_offcr_cnt")) + .trneCnt(rs.getBigDecimal("trne_cnt")) + .embrkMntncCrewCnt(rs.getBigDecimal("embrk_mntnc_crew_cnt")) + .unrprtCnt(rs.getBigDecimal("unrprt_cnt")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/DarkActivityConfirmedReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/DarkActivityConfirmedReader.java index b053cb4..c3c1c7e 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/DarkActivityConfirmedReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/DarkActivityConfirmedReader.java @@ -1,94 +1,58 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.DarkActivityConfirmedDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class DarkActivityConfirmedReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class DarkActivityConfirmedReader extends BaseSyncReader { public DarkActivityConfirmedReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public DarkActivityConfirmedDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceDarkActivityConfirmed; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceDarkActivityConfirmed), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[DarkActivityConfirmedReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceDarkActivityConfirmed); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return DarkActivityConfirmedDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .mmsiNo(rs.getString("mmsi_no")) - .darkHr(rs.getObject("dark_hr", Long.class)) - .darkActvStatus(rs.getObject("dark_actv_status", Long.class)) - .shipNm(rs.getString("ship_nm")) - .darkActv(rs.getString("dark_actv")) - .zoneId(rs.getObject("zone_id", Long.class)) - .zoneNm(rs.getString("zone_nm")) - .zoneCountry(rs.getString("zone_country")) - .darkTmUtc(rs.getTimestamp("dark_tm_utc") != null ? rs.getTimestamp("dark_tm_utc").toLocalDateTime() : null) - .darkLat(rs.getObject("dark_lat", Double.class)) - .darkLon(rs.getObject("dark_lon", Double.class)) - .darkSpd(rs.getObject("dark_spd", Double.class)) - .darkHeading(rs.getObject("dark_heading", Double.class)) - .darkDraft(rs.getObject("dark_draft", Double.class)) - .nxtCptrTmUtc(rs.getTimestamp("nxt_cptr_tm_utc") != null ? rs.getTimestamp("nxt_cptr_tm_utc").toLocalDateTime() : null) - .nxtCptrSpd(rs.getObject("nxt_cptr_spd", Double.class)) - .nxtCptrDraft(rs.getObject("nxt_cptr_draft", Double.class)) - .nxtCptrHeading(rs.getObject("nxt_cptr_heading", Double.class)) - .darkRptDestAis(rs.getString("dark_rpt_dest_ais")) - .lastPrtcllPort(rs.getString("last_prtcll_port")) - .lastPoccntryCd(rs.getString("last_poccntry_cd")) - .lastPoccntry(rs.getString("last_poccntry")) - .nxtCptrLat(rs.getObject("nxt_cptr_lat", Double.class)) - .nxtCptrLon(rs.getObject("nxt_cptr_lon", Double.class)) - .nxtCptrRptDestAis(rs.getString("nxt_cptr_rpt_dest_ais")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceDarkActivityConfirmed); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected DarkActivityConfirmedDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return DarkActivityConfirmedDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .mmsiNo(rs.getString("mmsi_no")) + .darkHr(rs.getObject("dark_hr", Long.class)) + .darkActvStatus(rs.getObject("dark_actv_status", Long.class)) + .shipNm(rs.getString("ship_nm")) + .darkActv(rs.getString("dark_actv")) + .zoneId(rs.getObject("zone_id", Long.class)) + .zoneNm(rs.getString("zone_nm")) + .zoneCountry(rs.getString("zone_country")) + .darkTmUtc(rs.getTimestamp("dark_tm_utc") != null ? rs.getTimestamp("dark_tm_utc").toLocalDateTime() : null) + .darkLat(rs.getObject("dark_lat", Double.class)) + .darkLon(rs.getObject("dark_lon", Double.class)) + .darkSpd(rs.getObject("dark_spd", Double.class)) + .darkHeading(rs.getObject("dark_heading", Double.class)) + .darkDraft(rs.getObject("dark_draft", Double.class)) + .nxtCptrTmUtc(rs.getTimestamp("nxt_cptr_tm_utc") != null ? rs.getTimestamp("nxt_cptr_tm_utc").toLocalDateTime() : null) + .nxtCptrSpd(rs.getObject("nxt_cptr_spd", Double.class)) + .nxtCptrDraft(rs.getObject("nxt_cptr_draft", Double.class)) + .nxtCptrHeading(rs.getObject("nxt_cptr_heading", Double.class)) + .darkRptDestAis(rs.getString("dark_rpt_dest_ais")) + .lastPrtcllPort(rs.getString("last_prtcll_port")) + .lastPoccntryCd(rs.getString("last_poccntry_cd")) + .lastPoccntry(rs.getString("last_poccntry")) + .nxtCptrLat(rs.getObject("nxt_cptr_lat", Double.class)) + .nxtCptrLon(rs.getObject("nxt_cptr_lon", Double.class)) + .nxtCptrRptDestAis(rs.getString("nxt_cptr_rpt_dest_ais")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/FlagHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/FlagHistoryReader.java index be404c3..e27d2d6 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/FlagHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/FlagHistoryReader.java @@ -1,73 +1,37 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.FlagHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class FlagHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class FlagHistoryReader extends BaseSyncReader { public FlagHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public FlagHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceFlagHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceFlagHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[FlagHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceFlagHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return FlagHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipCountryHstrySeq(rs.getString("ship_country_hstry_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .countryCd(rs.getString("country_cd")) - .country(rs.getString("country")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceFlagHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected FlagHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return FlagHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipCountryHstrySeq(rs.getString("ship_country_hstry_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .countryCd(rs.getString("country_cd")) + .country(rs.getString("country")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/GroupBeneficialOwnerHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/GroupBeneficialOwnerHistoryReader.java index a59d587..1f2d935 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/GroupBeneficialOwnerHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/GroupBeneficialOwnerHistoryReader.java @@ -1,74 +1,38 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.GroupBeneficialOwnerHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class GroupBeneficialOwnerHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class GroupBeneficialOwnerHistoryReader extends BaseSyncReader { public GroupBeneficialOwnerHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public GroupBeneficialOwnerHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceGroupBeneficialOwnerHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceGroupBeneficialOwnerHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[GroupBeneficialOwnerHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceGroupBeneficialOwnerHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return GroupBeneficialOwnerHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipGroupRevnOwnrHstrySeq(rs.getString("ship_group_revn_ownr_hstry_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .groupActlOwnrCd(rs.getString("group_actl_ownr_cd")) - .groupActlOwnr(rs.getString("group_actl_ownr")) - .companyStatus(rs.getString("company_status")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceGroupBeneficialOwnerHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected GroupBeneficialOwnerHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return GroupBeneficialOwnerHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipGroupRevnOwnrHstrySeq(rs.getString("ship_group_revn_ownr_hstry_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .groupActlOwnrCd(rs.getString("group_actl_ownr_cd")) + .groupActlOwnr(rs.getString("group_actl_ownr")) + .companyStatus(rs.getString("company_status")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/IceClassReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/IceClassReader.java index 232ecdb..2d0a267 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/IceClassReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/IceClassReader.java @@ -1,71 +1,35 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.IceClassDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class IceClassReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class IceClassReader extends BaseSyncReader { public IceClassReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public IceClassDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceIceClass; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceIceClass), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[IceClassReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceIceClass); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return IceClassDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .iceGrdCd(rs.getString("ice_grd_cd")) - .iceGrd(rs.getString("ice_grd")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceIceClass); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected IceClassDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return IceClassDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .iceGrdCd(rs.getString("ice_grd_cd")) + .iceGrd(rs.getString("ice_grd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/NameHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/NameHistoryReader.java index 07dba2c..d810458 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/NameHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/NameHistoryReader.java @@ -1,72 +1,36 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.NameHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class NameHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class NameHistoryReader extends BaseSyncReader { public NameHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public NameHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceNameHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceNameHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[NameHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceNameHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return NameHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipNmChgHstrySeq(rs.getString("ship_nm_chg_hstry_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .shipNm(rs.getString("ship_nm")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceNameHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected NameHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return NameHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipNmChgHstrySeq(rs.getString("ship_nm_chg_hstry_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .shipNm(rs.getString("ship_nm")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OperatorHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OperatorHistoryReader.java index c24687f..87aca5f 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OperatorHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OperatorHistoryReader.java @@ -1,74 +1,38 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.OperatorHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class OperatorHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class OperatorHistoryReader extends BaseSyncReader { public OperatorHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public OperatorHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceOperatorHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceOperatorHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[OperatorHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceOperatorHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return OperatorHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipOperatorHstrySeq(rs.getString("ship_operator_hstry_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .shipOperatorCd(rs.getString("ship_operator_cd")) - .shipOperator(rs.getString("ship_operator")) - .companyStatus(rs.getString("company_status")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceOperatorHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected OperatorHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return OperatorHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipOperatorHstrySeq(rs.getString("ship_operator_hstry_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .shipOperatorCd(rs.getString("ship_operator_cd")) + .shipOperator(rs.getString("ship_operator")) + .companyStatus(rs.getString("company_status")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OwnerHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OwnerHistoryReader.java index 416a4c4..fac0967 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OwnerHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/OwnerHistoryReader.java @@ -1,74 +1,38 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.OwnerHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class OwnerHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class OwnerHistoryReader extends BaseSyncReader { public OwnerHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public OwnerHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceOwnerHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceOwnerHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[OwnerHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceOwnerHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return OwnerHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipOwnrHstrySeq(rs.getString("ship_ownr_hstry_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .ownrCd(rs.getString("ownr_cd")) - .ownr(rs.getString("ownr")) - .companyStatus(rs.getString("company_status")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceOwnerHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected OwnerHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return OwnerHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipOwnrHstrySeq(rs.getString("ship_ownr_hstry_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .ownrCd(rs.getString("ownr_cd")) + .ownr(rs.getString("ownr")) + .companyStatus(rs.getString("company_status")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/PandIHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/PandIHistoryReader.java index 0733783..91be782 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/PandIHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/PandIHistoryReader.java @@ -1,74 +1,38 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.PandIHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class PandIHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class PandIHistoryReader extends BaseSyncReader { public PandIHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public PandIHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourcePandiHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourcePandiHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[PandIHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourcePandiHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return PandIHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipPrtcRpnHstrySeq(rs.getString("ship_prtc_rpn_hstry_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .pniClubCd(rs.getString("pni_club_cd")) - .pniClubNm(rs.getString("pni_club_nm")) - .src(rs.getString("src")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourcePandiHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected PandIHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return PandIHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipPrtcRpnHstrySeq(rs.getString("ship_prtc_rpn_hstry_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .pniClubCd(rs.getString("pni_club_cd")) + .pniClubNm(rs.getString("pni_club_nm")) + .src(rs.getString("src")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SafetyManagementCertificateHistReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SafetyManagementCertificateHistReader.java index 9e9ecd2..9481078 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SafetyManagementCertificateHistReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SafetyManagementCertificateHistReader.java @@ -1,82 +1,46 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.SafetyManagementCertificateHistDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class SafetyManagementCertificateHistReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class SafetyManagementCertificateHistReader extends BaseSyncReader { public SafetyManagementCertificateHistReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public SafetyManagementCertificateHistDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceSafetyManagementCertificateHist; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceSafetyManagementCertificateHist), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[SafetyManagementCertificateHistReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceSafetyManagementCertificateHist); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return SafetyManagementCertificateHistDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipSftyMngEvdcSeq(rs.getString("ship_sfty_mng_evdc_seq")) - .smgrcSrngEngines(rs.getString("smgrc_srng_engines")) - .smgrcSysCatConvArbt(rs.getString("smgrc_sys_cat_conv_arbt")) - .smgrcExpryDay(rs.getString("smgrc_expry_day")) - .smgrcIssueDay(rs.getString("smgrc_issue_day")) - .smgrcDoccCompany(rs.getString("smgrc_docc_company")) - .smgrcNtnlty(rs.getString("smgrc_ntnlty")) - .smgrcIssueEngines(rs.getString("smgrc_issue_engines")) - .smgrcEtcDesc(rs.getString("smgrc_etc_desc")) - .smgrcShipNm(rs.getString("smgrc_ship_nm")) - .smgrcShipType(rs.getString("smgrc_ship_type")) - .smgrcSrc(rs.getString("smgrc_src")) - .smgrcCompanyCd(rs.getString("smgrc_company_cd")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceSafetyManagementCertificateHist); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected SafetyManagementCertificateHistDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return SafetyManagementCertificateHistDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipSftyMngEvdcSeq(rs.getString("ship_sfty_mng_evdc_seq")) + .smgrcSrngEngines(rs.getString("smgrc_srng_engines")) + .smgrcSysCatConvArbt(rs.getString("smgrc_sys_cat_conv_arbt")) + .smgrcExpryDay(rs.getString("smgrc_expry_day")) + .smgrcIssueDay(rs.getString("smgrc_issue_day")) + .smgrcDoccCompany(rs.getString("smgrc_docc_company")) + .smgrcNtnlty(rs.getString("smgrc_ntnlty")) + .smgrcIssueEngines(rs.getString("smgrc_issue_engines")) + .smgrcEtcDesc(rs.getString("smgrc_etc_desc")) + .smgrcShipNm(rs.getString("smgrc_ship_nm")) + .smgrcShipType(rs.getString("smgrc_ship_type")) + .smgrcSrc(rs.getString("smgrc_src")) + .smgrcCompanyCd(rs.getString("smgrc_company_cd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipAddInfoReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipAddInfoReader.java index e4f1efe..0ca15a1 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipAddInfoReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipAddInfoReader.java @@ -1,84 +1,44 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.ShipAddInfoDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class ShipAddInfoReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class ShipAddInfoReader extends BaseSyncReader { public ShipAddInfoReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public ShipAddInfoDto read() throws Exception { - // 1. 버퍼가 비어있을 때만 DB에서 "다음 처리 대상 ID 하나"의 데이터를 긁어옵니다. - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; // 진짜 데이터가 없으면 종료 - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceAdditionalShipsData; } - private void fetchNextGroup() { - // 1. 아직 'N'인 최소 ID 하나를 찾음 - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceAdditionalShipsData), Long.class); - } catch (Exception e) { - return; // 대상 없음 - } - - if (nextTargetId != null) { - log.info("[ShipAddInfoReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - // 2. 해당 ID의 데이터만 버퍼에 로드 - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceAdditionalShipsData); - final Long targetId = nextTargetId; // lambda 내부에서 사용하기 위해 final 변수로 - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return ShipAddInfoDto.builder() - .jobExecutionId(targetId) // job_execution_id 설정 - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipEml(rs.getString("ship_eml")) - .maxDpwt(rs.getString("max_dpwt")) - .maxDrillDepth(rs.getString("max_drill_depth")) - .drillBrg(rs.getString("drill_brg")) - .oceanProdFacility(rs.getString("ocean_prod_facility")) - .deckHeatExch(rs.getString("deck_heat_exch")) - .dehtexMatral(rs.getString("dehtex_matral")) - .portblTwinDeck(rs.getString("portbl_twin_deck")) - .fixedTwinDeck(rs.getString("fixed_twin_deck")) - .shipSatlitCommId(rs.getString("ship_satlit_comm_id")) - .shipSatlitCmrspCd(rs.getString("ship_satlit_cmrsp_cd")) - .build(); - }, nextTargetId); - - // 3. 해당 ID 'P'로 변경 - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceAdditionalShipsData); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected ShipAddInfoDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return ShipAddInfoDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipEml(rs.getString("ship_eml")) + .maxDpwt(rs.getString("max_dpwt")) + .maxDrillDepth(rs.getString("max_drill_depth")) + .drillBrg(rs.getString("drill_brg")) + .oceanProdFacility(rs.getString("ocean_prod_facility")) + .deckHeatExch(rs.getString("deck_heat_exch")) + .dehtexMatral(rs.getString("dehtex_matral")) + .portblTwinDeck(rs.getString("portbl_twin_deck")) + .fixedTwinDeck(rs.getString("fixed_twin_deck")) + .shipSatlitCommId(rs.getString("ship_satlit_comm_id")) + .shipSatlitCmrspCd(rs.getString("ship_satlit_cmrsp_cd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipDataReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipDataReader.java index 8a3c792..aced5f2 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipDataReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipDataReader.java @@ -1,156 +1,115 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.ShipInfoMstDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class ShipDataReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class ShipDataReader extends BaseSyncReader { public ShipDataReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public ShipInfoMstDto read() throws Exception { - // 1. 버퍼가 비어있을 때만 DB에서 "다음 처리 대상 ID 하나"의 데이터를 긁어옵니다. - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; // 진짜 데이터가 없으면 종료 - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceShipDetailData; } - - private void fetchNextGroup() { - // 1. 아직 'N'인 최소 ID 하나를 찾음 - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject(CommonSql.getNextTargetQuery(tableMetaInfo.sourceShipDetailData), Long.class); - } catch (Exception e) { - return; // 대상 없음 - } - - if (nextTargetId != null) { - log.info("[ShipDataReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - // 2. 해당 ID의 데이터만 버퍼에 로드 - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceShipDetailData); - final Long targetId = nextTargetId; // lambda 내부에서 사용하기 위해 final 변수로 - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return ShipInfoMstDto.builder() - .jobExecutionId(targetId) // job_execution_id 설정 - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .mmsiNo(rs.getString("mmsi_no")) - .shipNm(rs.getString("ship_nm")) - .clsgnNo(rs.getString("clsgn_no")) - .frmlaRegNo(rs.getString("frmla_reg_no")) - .fshrPrmtNo(rs.getString("fshr_prmt_no")) - .shipNtnlty(rs.getString("ship_ntnlty")) - .ntnltyCd(rs.getString("ntnlty_cd")) - .loadPort(rs.getString("load_port")) - .clfic(rs.getString("clfic")) - .clficDesc(rs.getString("clfic_desc")) - .shipStatus(rs.getString("ship_status")) - .shipTypeGroup(rs.getString("ship_type_group")) - .shipTypeLvTwo(rs.getString("ship_type_lv_two")) - .shipTypeLvThr(rs.getString("ship_type_lv_thr")) - .shipTypeLvFour(rs.getString("ship_type_lv_four")) - .shipTypeLvFive(rs.getString("ship_type_lv_five")) - .shipTypeLvFiveDtldType(rs.getString("ship_type_lv_five_dtld_type")) - .shipTypeLvFiveHullType(rs.getString("ship_type_lv_five_hull_type")) - .shipTypeLvFiveLwrnkGroup(rs.getString("ship_type_lv_five_lwrnk_group")) - .buildYy(rs.getString("build_yy")) - .buildYmd(rs.getString("build_ymd")) - .shpyrd(rs.getString("shpyrd")) - .shpyrdOffclNm(rs.getString("shpyrd_offcl_nm")) - .shpyrdBuildNo(rs.getString("shpyrd_build_no")) - .buildDesc(rs.getString("build_desc")) - .modfHstryDesc(rs.getString("modf_hstry_desc")) - .whlnthLoa(rs.getString("whlnth_loa")) - .regLength(rs.getString("reg_length")) - .lbp(rs.getString("lbp")) - .formnBreadth(rs.getString("formn_breadth")) - .maxBreadth(rs.getString("max_breadth")) - .depth(rs.getString("depth")) - .draft(rs.getString("draft")) - .keelMastHg(rs.getString("keel_mast_hg")) - .bulbBow(rs.getString("bulb_bow")) - .gt(rs.getString("gt")) - .ntTon(rs.getString("nt_ton")) - .dwt(rs.getString("dwt")) - .displacement(rs.getString("displacement")) - .lightDisplacementTon(rs.getString("light_displacement_ton")) - .cgt(rs.getString("cgt")) - .fldngOneCmPerTonTpci(rs.getString("fldng_one_cm_per_ton_tpci")) - .tonEfectDay(rs.getString("ton_efect_day")) - .calcfrmDwt(rs.getString("calcfrm_dwt")) - .teuCnt(rs.getString("teu_cnt")) - .teuCapacity(rs.getString("teu_capacity")) - .grainCapacityM3(rs.getString("grain_capacity_m3")) - .baleCapacity(rs.getString("bale_capacity")) - .liquidCapacity(rs.getString("liquid_capacity")) - .gasM3(rs.getString("gas_m3")) - .insulatedM3(rs.getString("insulated_m3")) - .passengerCapacity(rs.getString("passenger_capacity")) - .bollardPull(rs.getString("bollard_pull")) - .svcSpd(rs.getString("svc_spd")) - .mainEngineType(rs.getString("main_engine_type")) - .fuelCnsmpSpdOne(rs.getString("fuel_cnsmp_spd_one")) - .fuelCnsmpamtValOne(rs.getString("fuel_cnsmpamt_val_one")) - .fuelCnsmpSpdTwo(rs.getString("fuel_cnsmp_spd_two")) - .fuelCnsmpamtValTwo(rs.getString("fuel_cnsmpamt_val_two")) - .totalFuelCapacityM3(rs.getString("total_fuel_capacity_m3")) - .blrMftr(rs.getString("blr_mftr")) - .proplrMftr(rs.getString("proplr_mftr")) - .cargoCapacityM3Desc(rs.getString("cargo_capacity_m3_desc")) - .eqpmntDesc(rs.getString("eqpmnt_desc")) - .hdn(rs.getString("hdn")) - .hatcheDesc(rs.getString("hatche_desc")) - .laneDoorRampDesc(rs.getString("lane_door_ramp_desc")) - .spcTankDesc(rs.getString("spc_tank_desc")) - .tankDesc(rs.getString("tank_desc")) - .prmovrDesc(rs.getString("prmovr_desc")) - .prmovrOvrvwDesc(rs.getString("prmovr_ovrvw_desc")) - .auxDesc(rs.getString("aux_desc")) - .asstGnrtrDesc(rs.getString("asst_gnrtr_desc")) - .fuelDesc(rs.getString("fuel_desc")) - .docCompanyCd(rs.getString("doc_company_cd")) - .groupActlOwnrCompanyCd(rs.getString("group_actl_ownr_company_cd")) - .operator(rs.getString("operator")) - .operatorCompanyCd(rs.getString("operator_company_cd")) - .shipMngrCompanyCd(rs.getString("ship_mngr_company_cd")) - .techMngrCd(rs.getString("tech_mngr_cd")) - .regShponrCd(rs.getString("reg_shponr_cd")) - .lastMdfcnDt(rs.getString("last_mdfcn_dt")) - .build(); - }, nextTargetId); - - // 3. 해당 ID 'P'로 변경 - updateBatchProcessing(nextTargetId); - } + @Override + protected ShipInfoMstDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return ShipInfoMstDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .mmsiNo(rs.getString("mmsi_no")) + .shipNm(rs.getString("ship_nm")) + .clsgnNo(rs.getString("clsgn_no")) + .frmlaRegNo(rs.getString("frmla_reg_no")) + .fshrPrmtNo(rs.getString("fshr_prmt_no")) + .shipNtnlty(rs.getString("ship_ntnlty")) + .ntnltyCd(rs.getString("ntnlty_cd")) + .loadPort(rs.getString("load_port")) + .clfic(rs.getString("clfic")) + .clficDesc(rs.getString("clfic_desc")) + .shipStatus(rs.getString("ship_status")) + .shipTypeGroup(rs.getString("ship_type_group")) + .shipTypeLvTwo(rs.getString("ship_type_lv_two")) + .shipTypeLvThr(rs.getString("ship_type_lv_thr")) + .shipTypeLvFour(rs.getString("ship_type_lv_four")) + .shipTypeLvFive(rs.getString("ship_type_lv_five")) + .shipTypeLvFiveDtldType(rs.getString("ship_type_lv_five_dtld_type")) + .shipTypeLvFiveHullType(rs.getString("ship_type_lv_five_hull_type")) + .shipTypeLvFiveLwrnkGroup(rs.getString("ship_type_lv_five_lwrnk_group")) + .buildYy(rs.getString("build_yy")) + .buildYmd(rs.getString("build_ymd")) + .shpyrd(rs.getString("shpyrd")) + .shpyrdOffclNm(rs.getString("shpyrd_offcl_nm")) + .shpyrdBuildNo(rs.getString("shpyrd_build_no")) + .buildDesc(rs.getString("build_desc")) + .modfHstryDesc(rs.getString("modf_hstry_desc")) + .whlnthLoa(rs.getString("whlnth_loa")) + .regLength(rs.getString("reg_length")) + .lbp(rs.getString("lbp")) + .formnBreadth(rs.getString("formn_breadth")) + .maxBreadth(rs.getString("max_breadth")) + .depth(rs.getString("depth")) + .draft(rs.getString("draft")) + .keelMastHg(rs.getString("keel_mast_hg")) + .bulbBow(rs.getString("bulb_bow")) + .gt(rs.getString("gt")) + .ntTon(rs.getString("nt_ton")) + .dwt(rs.getString("dwt")) + .displacement(rs.getString("displacement")) + .lightDisplacementTon(rs.getString("light_displacement_ton")) + .cgt(rs.getString("cgt")) + .fldngOneCmPerTonTpci(rs.getString("fldng_one_cm_per_ton_tpci")) + .tonEfectDay(rs.getString("ton_efect_day")) + .calcfrmDwt(rs.getString("calcfrm_dwt")) + .teuCnt(rs.getString("teu_cnt")) + .teuCapacity(rs.getString("teu_capacity")) + .grainCapacityM3(rs.getString("grain_capacity_m3")) + .baleCapacity(rs.getString("bale_capacity")) + .liquidCapacity(rs.getString("liquid_capacity")) + .gasM3(rs.getString("gas_m3")) + .insulatedM3(rs.getString("insulated_m3")) + .passengerCapacity(rs.getString("passenger_capacity")) + .bollardPull(rs.getString("bollard_pull")) + .svcSpd(rs.getString("svc_spd")) + .mainEngineType(rs.getString("main_engine_type")) + .fuelCnsmpSpdOne(rs.getString("fuel_cnsmp_spd_one")) + .fuelCnsmpamtValOne(rs.getString("fuel_cnsmpamt_val_one")) + .fuelCnsmpSpdTwo(rs.getString("fuel_cnsmp_spd_two")) + .fuelCnsmpamtValTwo(rs.getString("fuel_cnsmpamt_val_two")) + .totalFuelCapacityM3(rs.getString("total_fuel_capacity_m3")) + .blrMftr(rs.getString("blr_mftr")) + .proplrMftr(rs.getString("proplr_mftr")) + .cargoCapacityM3Desc(rs.getString("cargo_capacity_m3_desc")) + .eqpmntDesc(rs.getString("eqpmnt_desc")) + .hdn(rs.getString("hdn")) + .hatcheDesc(rs.getString("hatche_desc")) + .laneDoorRampDesc(rs.getString("lane_door_ramp_desc")) + .spcTankDesc(rs.getString("spc_tank_desc")) + .tankDesc(rs.getString("tank_desc")) + .prmovrDesc(rs.getString("prmovr_desc")) + .prmovrOvrvwDesc(rs.getString("prmovr_ovrvw_desc")) + .auxDesc(rs.getString("aux_desc")) + .asstGnrtrDesc(rs.getString("asst_gnrtr_desc")) + .fuelDesc(rs.getString("fuel_desc")) + .docCompanyCd(rs.getString("doc_company_cd")) + .groupActlOwnrCompanyCd(rs.getString("group_actl_ownr_company_cd")) + .operator(rs.getString("operator")) + .operatorCompanyCd(rs.getString("operator_company_cd")) + .shipMngrCompanyCd(rs.getString("ship_mngr_company_cd")) + .techMngrCd(rs.getString("tech_mngr_cd")) + .regShponrCd(rs.getString("reg_shponr_cd")) + .lastMdfcnDt(rs.getString("last_mdfcn_dt")) + .build(); } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceShipDetailData); - businessJdbcTemplate.update(sql, targetExecutionId); - } - } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipManagerHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipManagerHistoryReader.java index 452bf3e..a9ffc50 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipManagerHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ShipManagerHistoryReader.java @@ -1,74 +1,38 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.ShipManagerHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class ShipManagerHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class ShipManagerHistoryReader extends BaseSyncReader { public ShipManagerHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public ShipManagerHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - - if (allDataBuffer.isEmpty()) { - return null; - } - - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceShipManagerHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceShipManagerHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[ShipManagerHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceShipManagerHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return ShipManagerHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipMngCompanySeq(rs.getString("ship_mng_company_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .shipMngrCd(rs.getString("ship_mngr_cd")) - .shipMngr(rs.getString("ship_mngr")) - .companyStatus(rs.getString("company_status")) - .build(); - }, nextTargetId); - - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceShipManagerHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected ShipManagerHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return ShipManagerHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipMngCompanySeq(rs.getString("ship_mng_company_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .shipMngrCd(rs.getString("ship_mngr_cd")) + .shipMngr(rs.getString("ship_mngr")) + .companyStatus(rs.getString("company_status")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SisterShipLinksReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SisterShipLinksReader.java index 6bd9ab7..615a4a3 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SisterShipLinksReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SisterShipLinksReader.java @@ -1,66 +1,34 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.SisterShipLinksDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class SisterShipLinksReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class SisterShipLinksReader extends BaseSyncReader { public SisterShipLinksReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public SisterShipLinksDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceSisterShipLinks; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceSisterShipLinks), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[SisterShipLinksReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceSisterShipLinks); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return SisterShipLinksDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .linkImoNo(rs.getString("link_imo_no")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceSisterShipLinks); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected SisterShipLinksDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return SisterShipLinksDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .linkImoNo(rs.getString("link_imo_no")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SpecialFeatureReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SpecialFeatureReader.java index 0032157..6297353 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SpecialFeatureReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SpecialFeatureReader.java @@ -1,68 +1,36 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.SpecialFeatureDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class SpecialFeatureReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class SpecialFeatureReader extends BaseSyncReader { public SpecialFeatureReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public SpecialFeatureDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceSpecialFeature; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceSpecialFeature), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[SpecialFeatureReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceSpecialFeature); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return SpecialFeatureDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipSpcFetrSeq(rs.getString("ship_spc_fetr_seq")) - .spcMttrCd(rs.getString("spc_mttr_cd")) - .spcMttr(rs.getString("spc_mttr")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceSpecialFeature); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected SpecialFeatureDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return SpecialFeatureDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipSpcFetrSeq(rs.getString("ship_spc_fetr_seq")) + .spcMttrCd(rs.getString("spc_mttr_cd")) + .spcMttr(rs.getString("spc_mttr")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StatusHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StatusHistoryReader.java index ef55147..dc2eeab 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StatusHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StatusHistoryReader.java @@ -1,69 +1,37 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.StatusHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class StatusHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class StatusHistoryReader extends BaseSyncReader { public StatusHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public StatusHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceStatusHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceStatusHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[StatusHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceStatusHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return StatusHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipStatusHstrySeq(rs.getString("ship_status_hstry_seq")) - .statusCd(rs.getString("status_cd")) - .statusChgYmd(rs.getString("status_chg_ymd")) - .status(rs.getString("status")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceStatusHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected StatusHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return StatusHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipStatusHstrySeq(rs.getString("ship_status_hstry_seq")) + .statusCd(rs.getString("status_cd")) + .statusChgYmd(rs.getString("status_chg_ymd")) + .status(rs.getString("status")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StowageCommodityReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StowageCommodityReader.java index 416b5ef..88970ff 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StowageCommodityReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/StowageCommodityReader.java @@ -1,70 +1,38 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.StowageCommodityDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class StowageCommodityReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class StowageCommodityReader extends BaseSyncReader { public StowageCommodityReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public StowageCommodityDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceStowageCommodity; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceStowageCommodity), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[StowageCommodityReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceStowageCommodity); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return StowageCommodityDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipCargoCapacitySeq(rs.getString("ship_cargo_capacity_seq")) - .capacityCd(rs.getString("capacity_cd")) - .capacityCdDesc(rs.getString("capacity_cd_desc")) - .cargoCd(rs.getString("cargo_cd")) - .cargoNm(rs.getString("cargo_nm")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceStowageCommodity); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected StowageCommodityDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return StowageCommodityDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipCargoCapacitySeq(rs.getString("ship_cargo_capacity_seq")) + .capacityCd(rs.getString("capacity_cd")) + .capacityCdDesc(rs.getString("capacity_cd_desc")) + .cargoCd(rs.getString("cargo_cd")) + .cargoNm(rs.getString("cargo_nm")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesHistoryUniqueReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesHistoryUniqueReader.java index d30a5ff..b2e0f86 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesHistoryUniqueReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesHistoryUniqueReader.java @@ -1,69 +1,37 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.SurveyDatesHistoryUniqueDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class SurveyDatesHistoryUniqueReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class SurveyDatesHistoryUniqueReader extends BaseSyncReader { public SurveyDatesHistoryUniqueReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public SurveyDatesHistoryUniqueDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceSurveyDatesHistoryUnique; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceSurveyDatesHistoryUnique), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[SurveyDatesHistoryUniqueReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceSurveyDatesHistoryUnique); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return SurveyDatesHistoryUniqueDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .clficCd(rs.getString("clfic_cd")) - .inspectionType(rs.getString("inspection_type")) - .inspectionYmd(rs.getString("inspection_ymd")) - .clfic(rs.getString("clfic")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceSurveyDatesHistoryUnique); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected SurveyDatesHistoryUniqueDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return SurveyDatesHistoryUniqueDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .clficCd(rs.getString("clfic_cd")) + .inspectionType(rs.getString("inspection_type")) + .inspectionYmd(rs.getString("inspection_ymd")) + .clfic(rs.getString("clfic")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesReader.java index 5611cc6..0ac4f45 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/SurveyDatesReader.java @@ -1,72 +1,40 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.SurveyDatesDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class SurveyDatesReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class SurveyDatesReader extends BaseSyncReader { public SurveyDatesReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public SurveyDatesDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceSurveyDates; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceSurveyDates), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[SurveyDatesReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceSurveyDates); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return SurveyDatesDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .clficCd(rs.getString("clfic_cd")) - .clfic(rs.getString("clfic")) - .dckngInspection(rs.getString("dckng_inspection")) - .fxtmInspection(rs.getString("fxtm_inspection")) - .annualInspection(rs.getString("annual_inspection")) - .mchnFxtmInspectionYmd(rs.getString("mchn_fxtm_inspection_ymd")) - .tlsftInspectionYmd(rs.getString("tlsft_inspection_ymd")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceSurveyDates); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected SurveyDatesDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return SurveyDatesDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .clficCd(rs.getString("clfic_cd")) + .clfic(rs.getString("clfic")) + .dckngInspection(rs.getString("dckng_inspection")) + .fxtmInspection(rs.getString("fxtm_inspection")) + .annualInspection(rs.getString("annual_inspection")) + .mchnFxtmInspectionYmd(rs.getString("mchn_fxtm_inspection_ymd")) + .tlsftInspectionYmd(rs.getString("tlsft_inspection_ymd")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TbCompanyDetailReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TbCompanyDetailReader.java index 9ec5fb3..067520a 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TbCompanyDetailReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TbCompanyDetailReader.java @@ -1,93 +1,61 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.TbCompanyDetailDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class TbCompanyDetailReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class TbCompanyDetailReader extends BaseSyncReader { public TbCompanyDetailReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public TbCompanyDetailDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTbCompanyDetail; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTbCompanyDetail), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[TbCompanyDetailReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTbCompanyDetail); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return TbCompanyDetailDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .companyCd(rs.getString("company_cd")) - .lastUpdYmd(rs.getString("last_upd_ymd")) - .careCd(rs.getString("care_cd")) - .companyStatus(rs.getString("company_status")) - .fullNm(rs.getString("full_nm")) - .companyNameAbbr(rs.getString("company_name_abbr")) - .companyFndnYmd(rs.getString("company_fndn_ymd")) - .prntCompanyCd(rs.getString("prnt_company_cd")) - .countryNm(rs.getString("country_nm")) - .ctyNm(rs.getString("cty_nm")) - .oaAddr(rs.getString("oa_addr")) - .emlAddr(rs.getString("eml_addr")) - .tel(rs.getString("tel")) - .faxNo(rs.getString("fax_no")) - .wbstUrl(rs.getString("wbst_url")) - .countryCtrl(rs.getString("country_ctrl")) - .countryCtrlCd(rs.getString("country_ctrl_cd")) - .countryReg(rs.getString("country_reg")) - .countryRegCd(rs.getString("country_reg_cd")) - .regionCd(rs.getString("region_cd")) - .distNm(rs.getString("dist_nm")) - .distNo(rs.getString("dist_no")) - .mailAddrRear(rs.getString("mail_addr_rear")) - .mailAddrFrnt(rs.getString("mail_addr_frnt")) - .poBox(rs.getString("po_box")) - .dtlAddrOne(rs.getString("dtl_addr_one")) - .dtlAddrTwo(rs.getString("dtl_addr_two")) - .dtlAddrThr(rs.getString("dtl_addr_thr")) - .tlx(rs.getString("tlx")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTbCompanyDetail); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected TbCompanyDetailDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return TbCompanyDetailDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .companyCd(rs.getString("company_cd")) + .lastUpdYmd(rs.getString("last_upd_ymd")) + .careCd(rs.getString("care_cd")) + .companyStatus(rs.getString("company_status")) + .fullNm(rs.getString("full_nm")) + .companyNameAbbr(rs.getString("company_name_abbr")) + .companyFndnYmd(rs.getString("company_fndn_ymd")) + .prntCompanyCd(rs.getString("prnt_company_cd")) + .countryNm(rs.getString("country_nm")) + .ctyNm(rs.getString("cty_nm")) + .oaAddr(rs.getString("oa_addr")) + .emlAddr(rs.getString("eml_addr")) + .tel(rs.getString("tel")) + .faxNo(rs.getString("fax_no")) + .wbstUrl(rs.getString("wbst_url")) + .countryCtrl(rs.getString("country_ctrl")) + .countryCtrlCd(rs.getString("country_ctrl_cd")) + .countryReg(rs.getString("country_reg")) + .countryRegCd(rs.getString("country_reg_cd")) + .regionCd(rs.getString("region_cd")) + .distNm(rs.getString("dist_nm")) + .distNo(rs.getString("dist_no")) + .mailAddrRear(rs.getString("mail_addr_rear")) + .mailAddrFrnt(rs.getString("mail_addr_frnt")) + .poBox(rs.getString("po_box")) + .dtlAddrOne(rs.getString("dtl_addr_one")) + .dtlAddrTwo(rs.getString("dtl_addr_two")) + .dtlAddrThr(rs.getString("dtl_addr_thr")) + .tlx(rs.getString("tlx")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TechnicalManagerHistoryReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TechnicalManagerHistoryReader.java index 1b07d39..9613ad5 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TechnicalManagerHistoryReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/TechnicalManagerHistoryReader.java @@ -1,70 +1,38 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.TechnicalManagerHistoryDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class TechnicalManagerHistoryReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class TechnicalManagerHistoryReader extends BaseSyncReader { public TechnicalManagerHistoryReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public TechnicalManagerHistoryDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceTechnicalManagerHistory; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceTechnicalManagerHistory), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[TechnicalManagerHistoryReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceTechnicalManagerHistory); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return TechnicalManagerHistoryDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .shipTechMngCompanySeq(rs.getString("ship_tech_mng_company_seq")) - .efectStaDay(rs.getString("efect_sta_day")) - .techMngrCd(rs.getString("tech_mngr_cd")) - .techMngr(rs.getString("tech_mngr")) - .companyStatus(rs.getString("company_status")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceTechnicalManagerHistory); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected TechnicalManagerHistoryDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return TechnicalManagerHistoryDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .shipTechMngCompanySeq(rs.getString("ship_tech_mng_company_seq")) + .efectStaDay(rs.getString("efect_sta_day")) + .techMngrCd(rs.getString("tech_mngr_cd")) + .techMngr(rs.getString("tech_mngr")) + .companyStatus(rs.getString("company_status")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ThrustersReader.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ThrustersReader.java index c25a0dc..faeaa10 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ThrustersReader.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/reader/ThrustersReader.java @@ -1,73 +1,41 @@ package com.snp.batch.jobs.datasync.batch.ship.reader; -import com.snp.batch.common.util.CommonSql; +import com.snp.batch.common.batch.reader.BaseSyncReader; import com.snp.batch.common.util.TableMetaInfo; import com.snp.batch.jobs.datasync.batch.ship.dto.ThrustersDto; import lombok.extern.slf4j.Slf4j; -import org.springframework.batch.item.ItemReader; import org.springframework.beans.factory.annotation.Qualifier; -import org.springframework.jdbc.core.JdbcTemplate; import javax.sql.DataSource; -import java.util.ArrayList; -import java.util.List; +import java.sql.ResultSet; +import java.sql.SQLException; @Slf4j -public class ThrustersReader implements ItemReader { - private final TableMetaInfo tableMetaInfo; - private final JdbcTemplate businessJdbcTemplate; - private List allDataBuffer = new ArrayList<>(); +public class ThrustersReader extends BaseSyncReader { public ThrustersReader(@Qualifier("businessDataSource") DataSource businessDataSource, TableMetaInfo tableMetaInfo) { - this.businessJdbcTemplate = new JdbcTemplate(businessDataSource); - this.tableMetaInfo = tableMetaInfo; + super(businessDataSource, tableMetaInfo); } @Override - public ThrustersDto read() throws Exception { - if (allDataBuffer.isEmpty()) { - fetchNextGroup(); - } - if (allDataBuffer.isEmpty()) { - return null; - } - return allDataBuffer.remove(0); + protected String getSourceTable() { + return tableMetaInfo.sourceThrusters; } - private void fetchNextGroup() { - Long nextTargetId = null; - try { - nextTargetId = businessJdbcTemplate.queryForObject( - CommonSql.getNextTargetQuery(tableMetaInfo.sourceThrusters), Long.class); - } catch (Exception e) { - return; - } - - if (nextTargetId != null) { - log.info("[ThrustersReader] 다음 처리 대상 ID 발견: {}", nextTargetId); - String sql = CommonSql.getTargetDataQuery(tableMetaInfo.sourceThrusters); - final Long targetId = nextTargetId; - this.allDataBuffer = businessJdbcTemplate.query(sql, (rs, rowNum) -> { - return ThrustersDto.builder() - .jobExecutionId(targetId) - .datasetVer(rs.getString("dataset_ver")) - .imoNo(rs.getString("imo_no")) - .thrstrSeq(rs.getString("thrstr_seq")) - .thrstrTypeCd(rs.getString("thrstr_type_cd")) - .thrstrType(rs.getString("thrstr_type")) - .thrstrCnt(rs.getBigDecimal("thrstr_cnt")) - .thrstrPosition(rs.getString("thrstr_position")) - .thrstrPowerBhp(rs.getBigDecimal("thrstr_power_bhp")) - .thrstrPowerKw(rs.getBigDecimal("thrstr_power_kw")) - .instlMth(rs.getString("instl_mth")) - .build(); - }, nextTargetId); - updateBatchProcessing(nextTargetId); - } - } - - private void updateBatchProcessing(Long targetExecutionId) { - String sql = CommonSql.getProcessBatchQuery(tableMetaInfo.sourceThrusters); - businessJdbcTemplate.update(sql, targetExecutionId); + @Override + protected ThrustersDto mapRow(ResultSet rs, Long targetId) throws SQLException { + return ThrustersDto.builder() + .jobExecutionId(targetId) + .datasetVer(rs.getString("dataset_ver")) + .imoNo(rs.getString("imo_no")) + .thrstrSeq(rs.getString("thrstr_seq")) + .thrstrTypeCd(rs.getString("thrstr_type_cd")) + .thrstrType(rs.getString("thrstr_type")) + .thrstrCnt(rs.getBigDecimal("thrstr_cnt")) + .thrstrPosition(rs.getString("thrstr_position")) + .thrstrPowerBhp(rs.getBigDecimal("thrstr_power_bhp")) + .thrstrPowerKw(rs.getBigDecimal("thrstr_power_kw")) + .instlMth(rs.getString("instl_mth")) + .build(); } } diff --git a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/repository/ShipRepositoryImpl.java b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/repository/ShipRepositoryImpl.java index 4ab0ee8..ce4ec40 100644 --- a/src/main/java/com/snp/batch/jobs/datasync/batch/ship/repository/ShipRepositoryImpl.java +++ b/src/main/java/com/snp/batch/jobs/datasync/batch/ship/repository/ShipRepositoryImpl.java @@ -237,7 +237,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -249,7 +249,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -288,7 +288,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -320,7 +320,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -352,7 +352,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -387,7 +387,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -435,7 +435,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -474,7 +474,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -527,7 +527,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -559,7 +559,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -592,7 +592,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -622,7 +622,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -653,7 +653,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -686,7 +686,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -719,7 +719,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -752,7 +752,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -793,7 +793,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -826,7 +826,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -855,7 +855,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -886,7 +886,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -918,7 +918,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -951,7 +951,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -986,7 +986,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -1018,7 +1018,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -1051,7 +1051,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository { @@ -1087,7 +1087,7 @@ public class ShipRepositoryImpl extends MultiDataSourceJdbcRepository DOMAIN_LABELS = Map.of( + "ship", "Ship (선박)", + "company", "Company (회사)", + "event", "Event (사건)", + "facility", "Facility (시설)", + "psc", "PSC (검사)", + "movements", "Movements (이동)", + "code", "Code (코드)", + "risk-compliance", "Risk & Compliance" + ); + + private static final List DOMAIN_ORDER = List.of( + "ship", "company", "event", "facility", "psc", + "movements", "code", "risk-compliance" + ); + + private final JdbcTemplate businessJdbc; + private final BatchTableProperties tableProps; + + private String sourceSchema; + private String targetSchema; + private Map sourceTables; + private Map targetTables; + + public SyncStatusService(@Qualifier("businessDataSource") DataSource businessDataSource, + BatchTableProperties tableProps) { + this.businessJdbc = new JdbcTemplate(businessDataSource); + this.tableProps = tableProps; + this.sourceSchema = tableProps.getSourceSchema().getName(); + this.targetSchema = tableProps.getTargetSchema().getName(); + this.sourceTables = tableProps.getSourceSchema().getTables(); + this.targetTables = tableProps.getTargetSchema().getTables(); + } + + /** + * 전체 동기화 현황 조회 + */ + public SyncStatusResponse getSyncStatus() { + // 테이블을 병렬 조회 (HikariCP pool=10 기준 동시 10개) + ExecutorService executor = Executors.newFixedThreadPool( + Math.min(sourceTables.size(), 10)); + + List> futures = sourceTables.entrySet().stream() + .map(entry -> CompletableFuture.supplyAsync(() -> { + String tableKey = entry.getKey(); + String sourceTable = entry.getValue(); + String targetTable = targetTables.getOrDefault(tableKey, ""); + + try { + return queryTableStatus(tableKey, sourceTable, targetTable); + } catch (Exception e) { + log.warn("테이블 상태 조회 실패: {} ({})", tableKey, e.getMessage()); + return SyncTableStatus.builder() + .tableKey(tableKey) + .sourceTable(sourceTable) + .targetTable(targetTable) + .domain(extractDomain(tableKey)) + .pendingCount(0) + .processingCount(0) + .completedCount(0) + .stuck(false) + .build(); + } + }, executor)) + .collect(Collectors.toList()); + + List allStatuses = futures.stream() + .map(CompletableFuture::join) + .collect(Collectors.toList()); + + executor.shutdown(); + + // 도메인별 그룹핑 + Map> grouped = allStatuses.stream() + .collect(Collectors.groupingBy(SyncTableStatus::getDomain)); + + List domains = DOMAIN_ORDER.stream() + .filter(grouped::containsKey) + .map(domain -> SyncDomainGroup.builder() + .domain(domain) + .domainLabel(DOMAIN_LABELS.getOrDefault(domain, domain)) + .tables(grouped.get(domain)) + .build()) + .collect(Collectors.toList()); + + // 요약 + long totalPending = allStatuses.stream().mapToLong(SyncTableStatus::getPendingCount).sum(); + long totalProcessing = allStatuses.stream().mapToLong(SyncTableStatus::getProcessingCount).sum(); + long totalCompleted = allStatuses.stream().mapToLong(SyncTableStatus::getCompletedCount).sum(); + int stuckTables = (int) allStatuses.stream().filter(SyncTableStatus::isStuck).count(); + + SyncStatusSummary summary = SyncStatusSummary.builder() + .totalTables(allStatuses.size()) + .pendingCount(totalPending) + .processingCount(totalProcessing) + .completedCount(totalCompleted) + .stuckTables(stuckTables) + .build(); + + return SyncStatusResponse.builder() + .summary(summary) + .domains(domains) + .build(); + } + + /** + * 특정 테이블의 최근 동기화 데이터 미리보기 + */ + public SyncDataPreviewResponse getDataPreview(String tableKey, int limit) { + String targetTable = targetTables.get(tableKey); + if (targetTable == null) { + throw new IllegalArgumentException("존재하지 않는 테이블 키: " + tableKey); + } + + String countSql = "SELECT COUNT(*) FROM %s.%s".formatted(targetSchema, targetTable); + Long totalCount = businessJdbc.queryForObject(countSql, Long.class); + + String sql = "SELECT * FROM %s.%s ORDER BY mdfcn_dt DESC NULLS LAST LIMIT %d" + .formatted(targetSchema, targetTable, limit); + + List> rows = businessJdbc.queryForList(sql); + + List columns = rows.isEmpty() + ? getTableColumns(targetTable) + : new ArrayList<>(rows.get(0).keySet()); + + return SyncDataPreviewResponse.builder() + .tableKey(tableKey) + .targetTable(targetTable) + .targetSchema(targetSchema) + .columns(columns) + .rows(rows) + .totalCount(totalCount != null ? totalCount : 0) + .build(); + } + + /** + * P 상태 고착 레코드 조회 + */ + public SyncDataPreviewResponse getStuckRecords(String tableKey, int limit) { + String sourceTable = sourceTables.get(tableKey); + if (sourceTable == null) { + throw new IllegalArgumentException("존재하지 않는 테이블 키: " + tableKey); + } + + String countSql = """ + SELECT COUNT(*) + FROM %s.%s a + INNER JOIN %s.batch_job_execution b + ON a.job_execution_id = b.job_execution_id + AND b.status = 'COMPLETED' + WHERE a.batch_flag = 'P' + """.formatted(sourceSchema, sourceTable, sourceSchema); + Long totalCount = businessJdbc.queryForObject(countSql, Long.class); + + String sql = """ + SELECT a.* + FROM %s.%s a + INNER JOIN %s.batch_job_execution b + ON a.job_execution_id = b.job_execution_id + AND b.status = 'COMPLETED' + WHERE a.batch_flag = 'P' + ORDER BY a.mdfcn_dt DESC NULLS LAST + LIMIT %d + """.formatted(sourceSchema, sourceTable, sourceSchema, limit); + + List> rows = businessJdbc.queryForList(sql); + + List columns = rows.isEmpty() + ? getTableColumns(sourceTable) + : new ArrayList<>(rows.get(0).keySet()); + + return SyncDataPreviewResponse.builder() + .tableKey(tableKey) + .targetTable(sourceTable) + .targetSchema(sourceSchema) + .columns(columns) + .rows(rows) + .totalCount(totalCount != null ? totalCount : 0) + .build(); + } + + /** + * P 상태 고착 레코드를 N으로 리셋 + */ + public int resetStuckRecords(String tableKey) { + String sourceTable = sourceTables.get(tableKey); + if (sourceTable == null) { + throw new IllegalArgumentException("존재하지 않는 테이블 키: " + tableKey); + } + + String sql = """ + UPDATE %s.%s + SET batch_flag = 'N' + , mdfcn_dt = CURRENT_TIMESTAMP + , mdfr_id = 'MANUAL_RESET' + WHERE batch_flag = 'P' + """.formatted(sourceSchema, sourceTable); + + int updated = businessJdbc.update(sql); + log.info("P→N 리셋 완료: {} ({}) {}건", tableKey, sourceTable, updated); + return updated; + } + + private SyncTableStatus queryTableStatus(String tableKey, String sourceTable, String targetTable) { + // batch_job_execution.status = 'COMPLETED'인 데이터만 집계 + // (수집/적재가 완전히 완료된 데이터만 동기화 대상) + String sql = """ + SELECT a.batch_flag, COUNT(*) AS cnt + FROM %s.%s a + INNER JOIN %s.batch_job_execution b + ON a.job_execution_id = b.job_execution_id + AND b.status = 'COMPLETED' + WHERE a.batch_flag IN ('N', 'P', 'S') + GROUP BY a.batch_flag + """.formatted(sourceSchema, sourceTable, sourceSchema); + + Map counts = new HashMap<>(); + counts.put("N", 0L); + counts.put("P", 0L); + counts.put("S", 0L); + + businessJdbc.query(sql, rs -> { + counts.put(rs.getString("batch_flag"), rs.getLong("cnt")); + }); + + // 최근 동기화 시간 (COMPLETED된 job의 batch_flag='S'인 가장 최근 mdfcn_dt) + String lastSyncSql = """ + SELECT MAX(a.mdfcn_dt) + FROM %s.%s a + INNER JOIN %s.batch_job_execution b + ON a.job_execution_id = b.job_execution_id + AND b.status = 'COMPLETED' + WHERE a.batch_flag = 'S' + """.formatted(sourceSchema, sourceTable, sourceSchema); + + String lastSyncTime = null; + try { + lastSyncTime = businessJdbc.queryForObject(lastSyncSql, String.class); + } catch (Exception e) { + log.trace("최근 동기화 시간 조회 실패: {}", tableKey); + } + + boolean stuck = counts.get("P") > 0; + + return SyncTableStatus.builder() + .tableKey(tableKey) + .sourceTable(sourceTable) + .targetTable(targetTable) + .domain(extractDomain(tableKey)) + .pendingCount(counts.get("N")) + .processingCount(counts.get("P")) + .completedCount(counts.get("S")) + .lastSyncTime(lastSyncTime) + .stuck(stuck) + .build(); + } + + private String extractDomain(String tableKey) { + int dashIndex = tableKey.indexOf('-'); + if (dashIndex < 0) return tableKey; + String prefix = tableKey.substring(0, dashIndex); + // "risk" prefix → "risk-compliance" domain + if ("risk".equals(prefix)) return "risk-compliance"; + return prefix; + } + + private List getTableColumns(String tableName) { + String sql = """ + SELECT column_name FROM information_schema.columns + WHERE table_schema = ? AND table_name = ? + ORDER BY ordinal_position + """; + return businessJdbc.queryForList(sql, String.class, targetSchema, tableName); + } +} diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index fe56683..944e0b9 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -103,6 +103,8 @@ logging: # Custom Application Properties app: batch: + chunk-size: 10000 + sub-chunk-size: 5000 # Writer Sub-Chunk 분할 크기 api: url: https://api.example.com/data timeout: 30000