+)
+
+// 자동매매 로그 스트림
+export const tradeLogStream = derived(
+ { subscribe: msgSubscribe },
+ ($msg) => {
+ if ($msg?.type === 'tradelog') return $msg.data as AutoTradeLog
+ return null
+ }
+)
diff --git a/frontend/src/lib/utils.ts b/frontend/src/lib/utils.ts
new file mode 100644
index 0000000..71ef64b
--- /dev/null
+++ b/frontend/src/lib/utils.ts
@@ -0,0 +1,54 @@
+// 가격 포맷 (천 단위 콤마)
+export function formatPrice(n: number): string {
+ if (n === 0) return '0'
+ return Math.abs(n).toLocaleString('ko-KR')
+}
+
+// 등락률 포맷 (+/-% 포함)
+export function formatRate(rate: number): string {
+ const sign = rate >= 0 ? '+' : ''
+ return `${sign}${rate.toFixed(2)}%`
+}
+
+// 등락에 따른 CSS 색상 클래스 (한국 관행: 상승=빨강, 하락=파랑)
+export function priceClass(value: number): string {
+ if (value > 0) return 'text-red-400'
+ if (value < 0) return 'text-blue-400'
+ return 'text-gray-400'
+}
+
+// 체결강도 CSS 클래스 (100 기준)
+export function cntrClass(cntr: number): string {
+ if (cntr > 100) return 'text-red-400'
+ if (cntr < 100 && cntr > 0) return 'text-blue-400'
+ return 'text-gray-400'
+}
+
+// 거래량 포맷 (만 단위 축약)
+export function formatVolume(n: number): string {
+ if (n >= 100_000_000) return (n / 100_000_000).toFixed(1) + '억'
+ if (n >= 10_000) return (n / 10_000).toFixed(0) + '만'
+ return n.toLocaleString('ko-KR')
+}
+
+// 날짜 포맷 (ISO → YYYY-MM-DD HH:mm)
+export function formatDate(iso: string): string {
+ if (!iso) return ''
+ const d = new Date(iso)
+ const pad = (n: number) => String(n).padStart(2, '0')
+ return `${d.getFullYear()}-${pad(d.getMonth() + 1)}-${pad(d.getDate())} ${pad(d.getHours())}:${pad(d.getMinutes())}`
+}
+
+// 전일대비 부호 문자 (2=상승, 3=보합, 5=하락)
+export function sigToArrow(sig: string): string {
+ if (sig === '2') return '▲'
+ if (sig === '5') return '▼'
+ return '-'
+}
+
+// 전일대비 부호에 따른 클래스
+export function sigClass(sig: string): string {
+ if (sig === '2') return 'text-red-400'
+ if (sig === '5') return 'text-blue-400'
+ return 'text-gray-400'
+}
diff --git a/frontend/src/routes/(app)/+layout.svelte b/frontend/src/routes/(app)/+layout.svelte
new file mode 100644
index 0000000..3f3165a
--- /dev/null
+++ b/frontend/src/routes/(app)/+layout.svelte
@@ -0,0 +1,64 @@
+
+
+
+
+
+
+
+
+ {@render children()}
+
+
+ 주식 시세
+
+
+
+{#if indices.length > 0}
+
+ {#each indices as idx}
+
+
{idx.name}
+
{idx.value.toLocaleString('ko-KR', { maximumFractionDigits: 2 })}
+
{formatRate(idx.changeRate)}
+
+ {/each}
+
+
+
+
+
+
+ ★ 관심종목
+
+
+
+
+ {#if searchResults.length > 0}
+
+ {#each searchResults.slice(0, 8) as result}
+ addToWatchlist(result)}
+ disabled={addingCode === result.code}
+ >
+
+ {result.name}
+ {result.code}
+
+ {result.market}
+
+ {/each}
+
+ {/if}
+
+
+
+ {#if $watchlist.length === 0}
+
+ 종목을 검색해 관심종목을 추가하세요
+
+ {:else}
+
+
+
+
+
+
+
+ {#each (wlSorted.length > 0 ? wlSorted : $watchlist) as item (item.code)}
+ {@const price = $priceMap[item.code]}
+ goto(`/stock/${item.code}`)}
+ >
+
+ {item.name}
+ {item.code}
+
+
+ {price ? formatPrice(price.currentPrice) : '-'}
+
+
+ {price ? formatRate(price.changeRate) : '-'}
+
+
+ {price ? price.cntrStr.toFixed(1) : '-'}
+
+
+
+ { e.stopPropagation(); removeFromWatchlist(item.code) }}
+ >×
+
+
+ {/each}
+
+
+
+ {/if}
+
+
+
+
+
+
+ ⚡ 체결강도 상승 감지
+ (거래량 상위 20 · 10초 갱신)
+
+
+
+ { showGuide = true }}
+ class="w-5 h-5 rounded-full bg-gray-700 text-gray-400 text-xs font-bold hover:bg-orange-900/50 hover:text-orange-400 transition-colors flex items-center justify-center shrink-0"
+ >?
+
+
+
+ {scannerOn ? '● ON' : '○ OFF'}
+
+
+ {#if updatedAt}
+ {updatedAt}
+ {/if}
+
+
+ {#if !scannerOn}
+
+ 스캐너가 꺼져 있습니다. 버튼을 눌러 켜주세요.
+
+ {:else if signals.length === 0}
+
+ 08:00 이후 거래량 상위 종목에서 체결강도 100 이상 + 상승 종목을 표시합니다.
+
+ {:else}
+
+ {#each signals as sig (sig.code)}
+ {@const live = $priceMap[sig.code]}
+ {@const displayPrice = live ?? sig}
+ {@const history = getCntrHistory(sig.code)}
+
+
goto(`/stock/${sig.code}`)}
+ >
+
+
+
{sig.code}
+
+ {#if sig.signalType}
+ {sig.signalType}
+ {/if}
+ {#if sig.riseLabel}
+
+ {sig.riseLabel === '매우 높음' ? '🚀' : '📈'} {sig.riseLabel}
+
+ {/if}
+ {#if sig.risingCount >= 1}
+ {risingLabel(sig.risingCount)}
+ {/if}
+ {#if sig.sentiment && sig.sentiment !== '정보없음'}
+ {sig.sentiment}
+ {/if}
+
+
+
+
+
{sig.name}
+
+ {formatPrice(displayPrice.currentPrice)}원
+
+
+
+
+
+ 체결강도
+ {(live?.cntrStr ?? sig.cntrStr).toFixed(2)}
+
+
+ 직전 대비
+
+ {sig.prevCntrStr.toFixed(2)} →
+ +{(sig.cntrStr - sig.prevCntrStr).toFixed(2)}
+
+
+
+ 등락률
+
+ {formatRate(displayPrice.changeRate)}
+
+
+
+ 거래량
+ {formatVolume(live?.volume ?? sig.volume)}
+
+
+
+ {#if sig.volRatio > 0}
+
+ 거래량 증가
+
+ {sig.volRatio.toFixed(1)}배{sig.volRatio >= 10 ? ' ⚠과열' : ''}
+
+
+ {/if}
+ {#if sig.totalAskVol > 0 && sig.totalBidVol > 0}
+
+ 매도/매수 잔량
+
+ {sig.askBidRatio.toFixed(2)} ({askBidLabel(sig.askBidRatio)})
+
+
+ {/if}
+ {#if sig.pricePos !== undefined}
+
+ 가격 위치
+ {sig.pricePos.toFixed(0)}%
+
+ {/if}
+
+
+ {#if sig.targetPrice && sig.targetPrice > 0}
+ {@const diff = sig.targetPrice - displayPrice.currentPrice}
+ {@const pct = ((diff / displayPrice.currentPrice) * 100).toFixed(1)}
+
+ AI 목표가
+
+ {formatPrice(sig.targetPrice)}원
+ ({diff >= 0 ? '+' : ''}{pct}%)
+
+
+ {/if}
+
+
+ {#if sig.nextDayTrend}
+
+
익일 추세
+
+
+ {nextDayIcon(sig.nextDayTrend)} {sig.nextDayTrend}
+ {#if sig.nextDayConf}
+ ({sig.nextDayConf})
+ {/if}
+
+ {#if sig.nextDayReason}
+
{sig.nextDayReason}
+ {/if}
+
+
+ {:else}
+
+ 익일 추세
+ 분석 중...
+
+ {/if}
+
+
+
+ {#key cntrTick}
+ {#if history.length >= 2}
+
+
+ {/if}
+ {/key}
+
+ {/each}
+
+ {/if}
+
+
{ showGuide = false }}>
+
+
+
+
+
📊 상승 확률 스코어 (0~100점)
+
4가지 복합 요소를 동시에 만족해야 진짜 상승 확률이 높습니다.
+
+
+
+
+ 요소
+ 배점
+ 핵심 로직
+
+
+
+ {#each [
+ ['A. 체결강도 레벨', '0~30', '150+: 30점 · 130+: 22점 · 110+: 14점'],
+ ['B. 연속 상승 횟수', '0~25', '5회+: 25점 · 3회+: 14점 · 1회: 3점'],
+ ['C. 가격 위치/캔들', '0~20', '윗꼬리 10% 미만: +10점 · 60% 이상: −8점'],
+ ['D. 거래량 건전성', '0~15', '2~5배 증가: +15점 · 10배 이상: −5점'],
+ ['E. 매도잔량 소화', '0~10', '매수잔량 압도적: +10점 · 매도 우세: −3점'],
+ ] as [name, score, desc]}
+
+ {name}
+ {score}
+ {desc}
+
+ {/each}
+
+
+
+
+
+
+
+
🏷️ 신호 유형 분류
+
+ {#each [
+ ['강한매수', 'bg-red-600 text-white border-red-700', '체결강도 130+ · 3회 이상 연속 상승 · 윗꼬리 없음 · 매도잔량 소화 중'],
+ ['매수우세', 'bg-orange-400 text-white border-orange-500', '기본 상승 패턴. 강한매수 조건 미충족이나 전반적으로 매수세가 우위'],
+ ['물량소화', 'bg-yellow-100 text-yellow-700 border-yellow-300', '체결강도는 높은데 가격이 제자리 + 긴 윗꼬리 → 위에서 파는 물량을 받아내는 중'],
+ ['추격위험', 'bg-gray-800 text-white border-gray-700', '체결강도 170+ · 거래량 7배 이상 · 긴 윗꼬리 → 고점 물량털기 가능성 경계'],
+ ['약한상승', 'bg-gray-700 text-gray-300 border-gray-600', '거래량 증가 없음 · 체결강도 120 미만 → 얇은 호가에서 뜬 상승'],
+ ] as [label, cls, desc]}
+
+ {label}
+ {desc}
+
+ {/each}
+
+
+
+
+
+
🔍 지표 상세
+
+
+
체결강도
+
100 = 균형 / 100 초과 = 매수 우위 / 100 미만 = 매도 우위. 10초마다 연속 상승 종목만 표시.
+
+ 150+ 강한 매수세
+ 130~150 매수 우세
+ 100 미만 매도 경향
+
+
+
+
거래량 증가
+
직전 6회(1분) 평균 대비 현재 10초 구간 배수. 2~5배가 최적, 10배 이상은 고점 물량털기 가능성.
+
+
+
매도/매수 잔량
+
10단계 호가 총잔량 비율. 1 미만 = 매수 우위, 클수록 위에 팔 물량이 많음.
+
+
+
가격 위치
+
장중 저가~고가 내 현재가 위치(%). 80%+ = 고가권 강한 매수, 30% 미만 = 저가권.
+
+
+
AI 목표가 / 익일 추세
+
현재가·기술 지표·AI 감성을 종합한 추론. 참고용이며 투자 권유가 아닙니다.
+
+
+
+
+
+ 💡 진짜 상승 한 줄 기준
+
+
+ ⚠️ 모든 지표와 AI 분석은 참고용이며 투자 권유가 아닙니다. 모든 투자 손실의 책임은 투자자 본인에게 있습니다.
+
+
diff --git a/frontend/src/routes/(app)/asset/+page.svelte b/frontend/src/routes/(app)/asset/+page.svelte
new file mode 100644
index 0000000..94a1eb5
--- /dev/null
+++ b/frontend/src/routes/(app)/asset/+page.svelte
@@ -0,0 +1,282 @@
+
+
+
+ 자산 현황 - 주식 시세
+
+
+자산 현황
+
+{#if loading}
+ 로딩 중...
+{:else if balance}
+
+
+ {#each [
+ { label: '총 자산', value: balance.totalAsset, fmt: 'price' },
+ { label: '예수금', value: balance.deposit, fmt: 'price' },
+ { label: '주식 평가액', value: balance.stockValue, fmt: 'price' },
+ { label: '평가 손익', value: balance.profitLoss, fmt: 'profit' },
+ ] as card}
+
+
{card.label}
+
+ {card.value >= 0 && card.fmt === 'profit' ? '+' : ''}{formatPrice(card.value)}
+
+ {#if card.fmt === 'profit'}
+
+ {formatRate(balance.profitRate)}
+
+ {/if}
+
+ {/each}
+
+ {#each [['balance', '보유종목'], ['pending', '미체결'], ['history', '주문내역']] as [tab, label]}
+ setTab(tab as typeof activeTab)}
+ class="px-4 py-2 text-sm rounded-t transition-colors {activeTab === tab ? 'text-blue-400 border-b-2 border-blue-400' : 'text-gray-400 hover:text-white'}"
+ >{label}
+ {/each}
+
+
+ {#if activeTab === 'balance'}
+
+
+
+
+ 종목
+ 수량
+ 매수가
+ 현재가
+ 평가손익
+ 수익률
+ 평가금액
+
+
+
+ {#each balance.stocks as stock (stock.code)}
+ goto(`/stock/${stock.code}`)}
+ >
+
+ {stock.name}
+ {stock.code}
+
+ {stock.qty.toLocaleString()}
+ {formatPrice(stock.buyPrice)}
+ {formatPrice(stock.curPrice)}
+
+ {stock.profitLoss >= 0 ? '+' : ''}{formatPrice(stock.profitLoss)}
+
+ {formatRate(stock.profitRate)}
+ {formatPrice(stock.value)}
+
+ {:else}
+
+ 보유 종목 없음
+
+ {/each}
+
+
+
+ {#if pending.length === 0}
+
미체결 주문 없음
+ {:else}
+
+
+
+ 종목
+ 구분
+ 주문가
+ 주문수량
+ 미체결
+ 체결가
+ 체결량
+ 시간
+
+
+
+ {#each pending as order (order.ordNo)}
+
+
+ {order.stkNm}
+ {order.stkCd}
+
+
+ {order.ioTpNm || tradeTypeLabel(order.trdeTp)}
+
+
+ {parseInt(order.ordPric).toLocaleString()}
+
+ {order.ordQty}
+ {order.osoQty}
+
+ {parseInt(order.cntrPric) > 0 ? parseInt(order.cntrPric).toLocaleString() : '-'}
+
+
+ {parseInt(order.cntrQty) > 0 ? order.cntrQty : '-'}
+
+ {formatTm(order.tm)}
+
+ cancelOrder(order)}
+ class="text-xs px-2 py-1 rounded bg-red-900/50 hover:bg-red-800/50 text-red-300 transition-colors"
+ >취소
+
+
+ {/each}
+
+
+ {/if}
+
+ {#if history.length === 0}
+
오늘 주문 내역 없음
+ {:else}
+
+
+
+ 종목
+ 구분
+ 주문가
+ 주문수량
+ 체결가
+ 체결량
+ 미체결
+ 상태
+ 수수료
+ 시간
+
+
+
+ {#each history as order (order.ordNo + order.ordTm)}
+
+
+ {order.stkNm}
+ {order.stkCd}
+
+
+ {order.ioTpNm || tradeTypeLabel(order.trdeTp)}
+
+
+ {parseInt(order.ordPric).toLocaleString()}
+
+ {order.ordQty}
+
+ {parseInt(order.cntrPric) > 0 ? parseInt(order.cntrPric).toLocaleString() : '-'}
+
+
+ {parseInt(order.cntrQty) > 0 ? order.cntrQty : '-'}
+
+
+ {parseInt(order.osoQty) > 0 ? order.osoQty : '0'}
+
+
+ {order.ordStt || '-'}
+
+
+ {parseInt(order.trdeCmsn) + parseInt(order.trdeTax) > 0
+ ? (parseInt(order.trdeCmsn) + parseInt(order.trdeTax)).toLocaleString()
+ : '-'}
+
+ {formatTm(order.ordTm)}
+
+ {/each}
+
+
+ {/if}
+
+ 계좌 정보를 불러올 수 없습니다.
+
+{/if}
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/autotrade/+page.svelte b/frontend/src/routes/(app)/autotrade/+page.svelte
new file mode 100644
index 0000000..954df1a
--- /dev/null
+++ b/frontend/src/routes/(app)/autotrade/+page.svelte
@@ -0,0 +1,570 @@
+
+
+
+ 자동매매 - 주식 시세
+
+
+
+
+
+
자동매매
+ {#if status}
+
+
+ 포지션 {status.positions}개
+ 오늘 {status.todayTrades}건
+ {#if status.todayProfit !== 0}
+
+ 오늘 손익 {status.todayProfit >= 0 ? '+' : ''}{formatPrice(status.todayProfit)}
+
+ {/if}
+ {/if}
+
+
+
+
+ {status?.running ? '⏹ 중지' : '▶ 시작'}
+
+
+
+ {emergencyConfirm ? '⚠ 한번 더 클릭하면 전량 청산' : '🚨 긴급청산'}
+
+
+
+
감시 소스
+
+
+
+
+
+ 체결강도 자동감지
+ (거래량 상위 20종목)
+
+
+
+
+
+
감시 테마
+
+
{ showThemeDropdown = true }}
+ onblur={() => { setTimeout(() => { showThemeDropdown = false }, 200) }}
+ placeholder="테마 검색..."
+ class="w-full bg-gray-700 border border-gray-600 rounded px-3 py-1.5 text-sm text-white placeholder-gray-500 focus:outline-none focus:border-blue-500"
+ />
+ {#if showThemeDropdown && filteredThemes.length > 0}
+
+ {#each filteredThemes as theme (theme.code)}
+ addTheme(theme)}
+ class="w-full px-3 py-2 text-left text-sm text-gray-200 hover:bg-gray-600 transition-colors flex justify-between items-center"
+ >
+ {theme.name}
+ {formatRate(theme.fluRt)}
+
+ {/each}
+
+ {/if}
+
+
+ {#if watchSource.selectedThemes.length > 0}
+
+ {#each watchSource.selectedThemes as theme (theme.code)}
+
+ {theme.name}
+ removeTheme(theme.code)}
+ class="text-blue-400 hover:text-blue-200 ml-0.5"
+ >×
+
+ {/each}
+
+ {:else}
+
선택된 테마 없음
+ {/if}
+
+
+
+ {#each [['rules', `규칙 (${rules.length})`], ['positions', `포지션 (${positions.length})`], ['logs', '로그']] as [tab, label]}
+ { activeTab = tab as typeof activeTab }}
+ class="px-4 py-2 text-sm transition-colors {activeTab === tab ? 'text-blue-400 border-b-2 border-blue-400' : 'text-gray-400 hover:text-white'}"
+ >{label}
+ {/each}
+
+
+
+{#if activeTab === 'rules'}
+
+ + 규칙 추가
+
+
+ {#if rules.length === 0}
+ 규칙을 추가해보세요
+ {:else}
+
+ {#each rules as rule (rule.id)}
+
+
+
+
+ {rule.name}
+
+ {rule.enabled ? '활성' : '비활성'}
+
+
+
+ 진입점수 {rule.minRiseScore}↑
+ 체결강도 {rule.minCntrStr}↑
+ 주문금액 {formatPrice(rule.orderAmount)}
+ 최대 {rule.maxPositions}종목
+ 익절 +{rule.takeProfitPct}%
+ 손절 {rule.stopLossPct}%
+ {#if rule.maxHoldMinutes > 0}
+ 최대 {rule.maxHoldMinutes}분
+ {/if}
+
+
+
+ toggleRule(rule.id)}
+ class="text-xs px-3 py-1 rounded bg-gray-700 hover:bg-gray-600 text-gray-300 transition-colors"
+ >{rule.enabled ? '비활성화' : '활성화'}
+ openEditRule(rule)}
+ class="text-xs px-3 py-1 rounded bg-gray-700 hover:bg-gray-600 text-gray-300 transition-colors"
+ >수정
+ deleteRule(rule.id)}
+ class="text-xs px-3 py-1 rounded bg-red-900/50 hover:bg-red-800/50 text-red-300 transition-colors"
+ >삭제
+
+
+
+ {/each}
+
보유 포지션 없음
+ {:else}
+
+
+
+
+ 종목
+ 수량
+ 매수가
+ 손절가
+ 익절가
+ 상태
+ 진입시각
+
+
+
+ {#each positions as pos (pos.code + pos.orderNo)}
+
+
+ {pos.name}
+ {pos.code}
+
+ {pos.qty}
+ {formatPrice(pos.buyPrice)}
+ {formatPrice(pos.stopLoss)}
+ {formatPrice(pos.takeProfit)}
+
+ {pos.status}
+
+ {formatTime(pos.entryTime)}
+
+ {#if pos.status === 'open' || pos.status === 'pending'}
+ closePosition(pos.code, pos.name)}
+ class="text-xs px-2.5 py-1 rounded bg-orange-900/50 hover:bg-orange-800/50 text-orange-300 transition-colors"
+ >청산
+ {:else if pos.exitReason}
+ {pos.exitReason}
+ {/if}
+
+
+ {/each}
+
+
+
+ {#if logs.length === 0}
+
로그 없음
+ {/if}
+ {#each logs as log}
+
+ {formatTime(log.at)}
+ [{log.level}]
+ {#if log.code}
+ {log.code}
+ {/if}
+ {log.message}
+
+ {/each}
+
{ showRuleModal = false }}>
+ {#if editingRule}
+
+ {/if}
+
\ No newline at end of file
diff --git a/frontend/src/routes/(app)/kospi200/+page.svelte b/frontend/src/routes/(app)/kospi200/+page.svelte
new file mode 100644
index 0000000..2b8c68a
--- /dev/null
+++ b/frontend/src/routes/(app)/kospi200/+page.svelte
@@ -0,0 +1,117 @@
+
+
+
+ 코스피200 - 주식 시세
+
+
+
+
코스피200
+ 로딩 중...
+{:else}
+
+
+
+
+
+
+
+
+ {#each sorted as stock (stock.code)}
+ goto(`/stock/${stock.code}`)}
+ >
+
+ {stock.name}
+ {stock.code}
+
+
+ {stock.curPrc.toLocaleString()}
+
+
+ {sigToArrow(stock.predPreSig)} {stock.predPre.toLocaleString()}
+
+
+ {formatRate(stock.fluRt)}
+
+
+ {formatVolume(stock.volume)}
+
+ {stock.open.toLocaleString()}
+ {stock.high.toLocaleString()}
+ {stock.low.toLocaleString()}
+
+ {/each}
+
+
+
+
+ {displayPrice?.name ?? code} - 주식 시세
+
+
+{#if loading}
+ 로딩 중...
+{:else if displayPrice}
+
+
+
+
+ goto('/')} class="text-gray-400 hover:text-white">←
+
{displayPrice.name}
+ {code}
+ {displayPrice.market}
+ ★
+
+
+
+
+ {formatPrice(displayPrice.currentPrice)}
+
+
+ {displayPrice.changePrice >= 0 ? '+' : ''}{formatPrice(displayPrice.changePrice)}
+ ({formatRate(displayPrice.changeRate)})
+
+
+
+
+ 시가 {formatPrice(displayPrice.open)}
+ 고가 {formatPrice(displayPrice.high)}
+ 저가 {formatPrice(displayPrice.low)}
+ 거래량 {displayPrice.volume.toLocaleString()}
+ 체결강도 {displayPrice.cntrStr.toFixed(1)}
+
+
+
+
+
+
+
+
캔들 차트
+
+ {#each [['D','일봉'], ['W','주봉'], ['M','월봉']] as [type, label]}
+ loadChart(type as 'D'|'W'|'M')}
+ class="px-3 py-1 text-xs rounded {chartType === type ? 'bg-blue-600 text-white' : 'bg-gray-700 text-gray-300 hover:bg-gray-600'}"
+ >{label}
+ {/each}
+
+
+
+
+
+
+
+
+
+ {#if liveOrderBook}
+
+
호가창
+
+
+ {#each [...liveOrderBook.asks].reverse() as ask}
+
+ {ask.volume.toLocaleString()}
+ {formatPrice(ask.price)}
+
+ {/each}
+
+
+ {formatPrice(displayPrice.currentPrice)}
+
+
+ {#each liveOrderBook.bids as bid}
+
+ {formatPrice(bid.price)}
+ {bid.volume.toLocaleString()}
+
+ {/each}
+
+
+ {/if}
+
+
+
+
주문
+ {#if orderMsg}
+
+ {orderMsg}
+
+ {/if}
+
+
+
+
+
+ 매수 ({(buyPrice * buyQty).toLocaleString()}원)
+
+
+
+
+
+
+
+
+ 수량
+
+
+ 시장가 매도
+
+
+
+
+
+
+
+
종목 정보를 불러올 수 없습니다
+
goto('/')} class="text-blue-400 hover:underline">← 돌아가기
+
+
+ 테마 분석 - 주식 시세
+
+
+테마 분석
+
+
+
+
+
+ {#if loading}
+
로딩 중...
+ {:else}
+
+
+
+
+
+
+
+
+
+ {#each sorted as theme (theme.code)}
+ selectTheme(theme)}
+ >
+
+ {theme.name}
+ {theme.mainStock}
+
+
+ {formatRate(theme.fluRt)}
+
+
+ {formatRate(theme.periodRt)}
+
+
+ {theme.risingCount}
+
+
+ {theme.stockCount}
+
+
+ {/each}
+
+
+
+ {/if}
+
+
+
+
+ {#if !selectedTheme}
+
테마를 선택하면 구성종목이 표시됩니다
+ {:else if detailLoading}
+
로딩 중...
+ {:else if detail}
+
+
{selectedTheme.name}
+
+ 등락률 {formatRate(detail.fluRt)}
+ 기간수익 {formatRate(detail.periodRt)}
+ {detail.stocks.length}종목
+
+
+
+
+
+
+
+
+
+ {#each sortedStocks as stock (stock.code)}
+ goto(`/stock/${stock.code}`)}
+ >
+
+ {stock.name}
+ {stock.code}
+
+
+ {stock.curPrc.toLocaleString()}
+
+
+ {sigToArrow(stock.fluSig)}{stock.predPre.toLocaleString()}
+
+
+ {formatRate(stock.fluRt)}
+
+
+ {/each}
+
+
+
+ {/if}
+
+
+
+ 로그인 - 주식 시세
+
+
+
diff --git a/frontend/static/robots.txt b/frontend/static/robots.txt
new file mode 100644
index 0000000..b6dd667
--- /dev/null
+++ b/frontend/static/robots.txt
@@ -0,0 +1,3 @@
+# allow crawling everything by default
+User-agent: *
+Disallow:
diff --git a/frontend/svelte.config.js b/frontend/svelte.config.js
new file mode 100644
index 0000000..a05e8de
--- /dev/null
+++ b/frontend/svelte.config.js
@@ -0,0 +1,25 @@
+import adapter from '@sveltejs/adapter-static';
+import { relative, sep } from 'node:path';
+
+/** @type {import('@sveltejs/kit').Config} */
+const config = {
+ compilerOptions: {
+ runes: ({ filename }) => {
+ const relativePath = relative(import.meta.dirname, filename);
+ const pathSegments = relativePath.toLowerCase().split(sep);
+ const isExternalLibrary = pathSegments.includes('node_modules');
+ return isExternalLibrary ? undefined : true;
+ }
+ },
+ kit: {
+ adapter: adapter({
+ pages: 'build',
+ assets: 'build',
+ fallback: 'index.html', // SPA fallback
+ precompress: false,
+ strict: false
+ })
+ }
+};
+
+export default config;
diff --git a/frontend/tsconfig.json b/frontend/tsconfig.json
new file mode 100644
index 0000000..2c2ed3c
--- /dev/null
+++ b/frontend/tsconfig.json
@@ -0,0 +1,20 @@
+{
+ "extends": "./.svelte-kit/tsconfig.json",
+ "compilerOptions": {
+ "rewriteRelativeImportExtensions": true,
+ "allowJs": true,
+ "checkJs": true,
+ "esModuleInterop": true,
+ "forceConsistentCasingInFileNames": true,
+ "resolveJsonModule": true,
+ "skipLibCheck": true,
+ "sourceMap": true,
+ "strict": true,
+ "moduleResolution": "bundler"
+ }
+ // Path aliases are handled by https://svelte.dev/docs/kit/configuration#alias
+ // except $lib which is handled by https://svelte.dev/docs/kit/configuration#files
+ //
+ // To make changes to top-level options such as include and exclude, we recommend extending
+ // the generated config; see https://svelte.dev/docs/kit/configuration#typescript
+}
diff --git a/frontend/vite.config.ts b/frontend/vite.config.ts
new file mode 100644
index 0000000..2262c52
--- /dev/null
+++ b/frontend/vite.config.ts
@@ -0,0 +1,15 @@
+import { sveltekit } from '@sveltejs/kit/vite';
+import tailwindcss from '@tailwindcss/vite';
+import { defineConfig } from 'vite';
+
+export default defineConfig({
+ plugins: [tailwindcss(), sveltekit()],
+ server: {
+ proxy: {
+ '/api': { target: 'http://localhost:8080', changeOrigin: true },
+ '/ws': { target: 'ws://localhost:8080', ws: true },
+ '/login': { target: 'http://localhost:8080', changeOrigin: true },
+ '/logout': { target: 'http://localhost:8080', changeOrigin: true },
+ }
+ }
+});
diff --git a/handlers/auth_handler.go b/handlers/auth_handler.go
index d89bce6..d5cfd54 100644
--- a/handlers/auth_handler.go
+++ b/handlers/auth_handler.go
@@ -55,9 +55,9 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
return
}
- id := r.FormValue("id")
+ id := r.FormValue("id")
password := r.FormValue("password")
- next := r.FormValue("next")
+ next := r.FormValue("next")
if next == "" {
next = "/"
}
@@ -87,6 +87,18 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
http.Redirect(w, r, next, http.StatusFound)
}
+// CheckSession GET /api/auth/check — 세션 유효성 확인 (200 OK / 401 Unauthorized)
+func (h *AuthHandler) CheckSession(w http.ResponseWriter, r *http.Request) {
+ cookie, err := r.Cookie(middleware.SessionCookieName)
+ if err != nil || !h.sessionSvc.Validate(cookie.Value) {
+ w.Header().Set("Content-Type", "application/json")
+ w.WriteHeader(http.StatusUnauthorized)
+ _, _ = w.Write([]byte(`{"error":"unauthorized"}`))
+ return
+ }
+ w.WriteHeader(http.StatusOK)
+}
+
// Logout POST /logout — 세션 삭제 후 /login 리다이렉트
func (h *AuthHandler) Logout(w http.ResponseWriter, r *http.Request) {
if cookie, err := r.Cookie(middleware.SessionCookieName); err == nil {
diff --git a/handlers/autotrade_handler.go b/handlers/autotrade_handler.go
index f1bd7cc..429ff29 100644
--- a/handlers/autotrade_handler.go
+++ b/handlers/autotrade_handler.go
@@ -141,6 +141,20 @@ func (h *AutoTradeHandler) Emergency(w http.ResponseWriter, r *http.Request) {
jsonResponse(w, map[string]bool{"ok": true})
}
+// ClosePosition POST /api/autotrade/positions/{code}/close — 개별 포지션 청산
+func (h *AutoTradeHandler) ClosePosition(w http.ResponseWriter, r *http.Request) {
+ code := r.PathValue("code")
+ if code == "" {
+ http.Error(w, "종목코드 필요", http.StatusBadRequest)
+ return
+ }
+ if err := h.svc.ClosePosition(code); err != nil {
+ http.Error(w, err.Error(), http.StatusBadRequest)
+ return
+ }
+ jsonResponse(w, map[string]bool{"ok": true})
+}
+
// jsonResponse JSON 응답 헬퍼
func jsonResponse(w http.ResponseWriter, data interface{}) {
w.Header().Set("Content-Type", "application/json")
diff --git a/main.go b/main.go
index ba9e4e3..acb1783 100644
--- a/main.go
+++ b/main.go
@@ -3,6 +3,7 @@ package main
import (
"log"
"net/http"
+ "os"
"stocksearch/config"
"stocksearch/handlers"
"stocksearch/middleware"
@@ -37,9 +38,9 @@ func main() {
}
// 서비스 추가
- sessionSvc := services.GetSessionService()
- watchlistSvc := services.GetWatchlistService()
- autoTradeSvc := services.GetAutoTradeService()
+ sessionSvc := services.GetSessionService()
+ watchlistSvc := services.GetWatchlistService()
+ autoTradeSvc := services.GetAutoTradeService()
// 스캐너 구독 종목 → WebSocket 내부 구독 연결
services.GetScannerService().SetSubscribeCallback(func(codes []string) {
@@ -52,11 +53,11 @@ func main() {
})
// 핸들러 초기화
- pageHandler := handlers.NewPageHandler()
- stockHandler := handlers.NewStockHandler(watchlistSvc)
- wsHandler := handlers.NewWSHandler(hub)
- authHandler := handlers.NewAuthHandler(sessionSvc)
- orderHandler := handlers.NewOrderHandler()
+ pageHandler := handlers.NewPageHandler()
+ stockHandler := handlers.NewStockHandler(watchlistSvc)
+ wsHandler := handlers.NewWSHandler(hub)
+ authHandler := handlers.NewAuthHandler(sessionSvc)
+ orderHandler := handlers.NewOrderHandler()
autoTradeHandler := handlers.NewAutoTradeHandler(autoTradeSvc)
// 라우터 설정 (Go 1.22 패턴 매칭)
@@ -66,6 +67,7 @@ func main() {
mux.HandleFunc("GET /login", authHandler.LoginPage)
mux.HandleFunc("POST /login", authHandler.Login)
mux.HandleFunc("POST /logout", authHandler.Logout)
+ mux.HandleFunc("GET /api/auth/check", authHandler.CheckSession)
// --- 페이지 라우트 ---
mux.HandleFunc("GET /", pageHandler.IndexPage)
@@ -105,19 +107,20 @@ func main() {
mux.HandleFunc("GET /api/account/orderable", orderHandler.GetOrderable)
// --- 자동매매 API 라우트 ---
- mux.HandleFunc("GET /api/autotrade/status", autoTradeHandler.GetStatus)
- mux.HandleFunc("GET /api/autotrade/rules", autoTradeHandler.GetRules)
- mux.HandleFunc("POST /api/autotrade/rules", autoTradeHandler.AddRule)
- mux.HandleFunc("PUT /api/autotrade/rules/{id}", autoTradeHandler.UpdateRule)
- mux.HandleFunc("DELETE /api/autotrade/rules/{id}", autoTradeHandler.DeleteRule)
+ mux.HandleFunc("GET /api/autotrade/status", autoTradeHandler.GetStatus)
+ mux.HandleFunc("GET /api/autotrade/rules", autoTradeHandler.GetRules)
+ mux.HandleFunc("POST /api/autotrade/rules", autoTradeHandler.AddRule)
+ mux.HandleFunc("PUT /api/autotrade/rules/{id}", autoTradeHandler.UpdateRule)
+ mux.HandleFunc("DELETE /api/autotrade/rules/{id}", autoTradeHandler.DeleteRule)
mux.HandleFunc("POST /api/autotrade/rules/{id}/toggle", autoTradeHandler.ToggleRule)
- mux.HandleFunc("GET /api/autotrade/positions", autoTradeHandler.GetPositions)
- mux.HandleFunc("GET /api/autotrade/logs", autoTradeHandler.GetLogs)
- mux.HandleFunc("GET /api/autotrade/watch-source", autoTradeHandler.GetWatchSource)
- mux.HandleFunc("PUT /api/autotrade/watch-source", autoTradeHandler.SetWatchSource)
- mux.HandleFunc("POST /api/autotrade/start", autoTradeHandler.Start)
- mux.HandleFunc("POST /api/autotrade/stop", autoTradeHandler.Stop)
- mux.HandleFunc("POST /api/autotrade/emergency", autoTradeHandler.Emergency)
+ mux.HandleFunc("GET /api/autotrade/positions", autoTradeHandler.GetPositions)
+ mux.HandleFunc("GET /api/autotrade/logs", autoTradeHandler.GetLogs)
+ mux.HandleFunc("GET /api/autotrade/watch-source", autoTradeHandler.GetWatchSource)
+ mux.HandleFunc("PUT /api/autotrade/watch-source", autoTradeHandler.SetWatchSource)
+ mux.HandleFunc("POST /api/autotrade/start", autoTradeHandler.Start)
+ mux.HandleFunc("POST /api/autotrade/stop", autoTradeHandler.Stop)
+ mux.HandleFunc("POST /api/autotrade/emergency", autoTradeHandler.Emergency)
+ mux.HandleFunc("POST /api/autotrade/positions/{code}/close", autoTradeHandler.ClosePosition)
// --- WebSocket 라우트 ---
mux.HandleFunc("GET /ws", wsHandler.ServeWS)
@@ -125,8 +128,22 @@ func main() {
// --- 정적 파일 ---
mux.Handle("GET /static/", http.StripPrefix("/static/", http.FileServer(http.Dir("static"))))
- // 미들웨어 체인 적용 (Auth → Logger → Recovery 순)
- handler := middleware.Chain(mux, middleware.Recovery, middleware.Logger, middleware.Auth(sessionSvc))
+ // --- SvelteKit 빌드 정적 서빙 (SPA fallback 포함) ---
+ if _, err := os.Stat("frontend/build"); err == nil {
+ spa := http.FileServer(http.Dir("frontend/build"))
+ mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
+ path := "frontend/build" + r.URL.Path
+ if _, err := os.Stat(path); os.IsNotExist(err) {
+ // SPA fallback: 파일 없으면 index.html 서빙
+ http.ServeFile(w, r, "frontend/build/index.html")
+ return
+ }
+ spa.ServeHTTP(w, r)
+ })
+ }
+
+ // 미들웨어 체인 적용 (CORS → Auth → Logger → Recovery 순)
+ handler := middleware.Chain(mux, middleware.Recovery, middleware.Logger, middleware.Auth(sessionSvc), middleware.CORS)
addr := "0.0.0.0:" + config.App.ServerPort
log.Printf("서버 시작: http://%s", addr)
diff --git a/middleware/auth.go b/middleware/auth.go
index d03c427..b735c93 100644
--- a/middleware/auth.go
+++ b/middleware/auth.go
@@ -41,6 +41,7 @@ var publicPaths = []string{
"/api/kospi200",
"/api/news",
"/api/disclosure",
+ "/api/auth/check",
"/ws",
}
diff --git a/middleware/cors.go b/middleware/cors.go
new file mode 100644
index 0000000..07f4d07
--- /dev/null
+++ b/middleware/cors.go
@@ -0,0 +1,29 @@
+package middleware
+
+import (
+ "net/http"
+ "stocksearch/config"
+)
+
+// CORS SvelteKit 개발 서버(localhost:5173)에서의 크로스오리진 요청 허용 미들웨어
+func CORS(next http.Handler) http.Handler {
+ return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+ origin := r.Header.Get("Origin")
+ allowed := config.App.CORSOrigin
+
+ if allowed != "" && origin == allowed {
+ w.Header().Set("Access-Control-Allow-Origin", origin)
+ w.Header().Set("Access-Control-Allow-Credentials", "true")
+ w.Header().Set("Access-Control-Allow-Methods", "GET,POST,PUT,DELETE,OPTIONS")
+ w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
+ }
+
+ // Preflight 요청 즉시 응답
+ if r.Method == http.MethodOptions {
+ w.WriteHeader(http.StatusNoContent)
+ return
+ }
+
+ next.ServeHTTP(w, r)
+ })
+}
diff --git a/models/autotrade.go b/models/autotrade.go
index d8e4440..6b42b90 100644
--- a/models/autotrade.go
+++ b/models/autotrade.go
@@ -20,7 +20,12 @@ type AutoTradeRule struct {
MaxPositions int `json:"maxPositions"` // 동시 최대 보유 종목 수 (기본 3)
// 청산 조건
- StopLossPct float64 `json:"stopLossPct"` // 손절 % (예: -3.0)
+ // 2중 손절 구조:
+ // 1차 - StopLoss1Pct 에 StopLoss1Count 회 터치 시 매도
+ // 2차 - StopLossPct 에 닿으면 즉시 매도 (StopLoss1Count==0 이면 단일 손절)
+ StopLoss1Pct float64 `json:"stopLoss1Pct"` // 1차 손절 % (예: -2.0, 0=비활성)
+ StopLoss1Count int `json:"stopLoss1Count"` // 1차 손절 터치 횟수 (예: 3)
+ StopLossPct float64 `json:"stopLossPct"` // 2차 손절 % (예: -4.0, 즉시 매도)
TakeProfitPct float64 `json:"takeProfitPct"` // 익절 % (예: 5.0)
MaxHoldMinutes int `json:"maxHoldMinutes"` // 최대 보유 시간(분, 0=무제한)
ExitBeforeClose bool `json:"exitBeforeClose"` // 장 마감 전 청산(15:20 기준)
@@ -30,15 +35,17 @@ type AutoTradeRule struct {
// AutoTradePosition 자동매매 포지션
type AutoTradePosition struct {
- Code string `json:"code"`
- Name string `json:"name"`
- BuyPrice int64 `json:"buyPrice"` // 매수 체결가
- Qty int64 `json:"qty"` // 수량
- OrderNo string `json:"orderNo"` // 매수 주문번호
- EntryTime time.Time `json:"entryTime"` // 진입 시각
- RuleID string `json:"ruleId"` // 규칙 ID
- StopLoss int64 `json:"stopLoss"` // 절대 손절가
- TakeProfit int64 `json:"takeProfit"` // 절대 익절가
+ Code string `json:"code"`
+ Name string `json:"name"`
+ BuyPrice int64 `json:"buyPrice"` // 매수 체결가
+ Qty int64 `json:"qty"` // 수량
+ OrderNo string `json:"orderNo"` // 매수 주문번호
+ EntryTime time.Time `json:"entryTime"` // 진입 시각
+ RuleID string `json:"ruleId"` // 규칙 ID
+ StopLoss1 int64 `json:"stopLoss1"` // 절대 1차 손절가 (0=비활성)
+ StopLoss1Touches int `json:"stopLoss1Touches"` // 1차 손절가 터치 누적 횟수
+ StopLoss int64 `json:"stopLoss"` // 절대 2차 손절가 (즉시 매도)
+ TakeProfit int64 `json:"takeProfit"` // 절대 익절가
// 상태: "pending"=체결 대기 | "open"=보유중 | "closed"=청산완료
Status string `json:"status"`
@@ -51,9 +58,9 @@ type AutoTradePosition struct {
// AutoTradeLog 자동매매 이벤트 로그
type AutoTradeLog struct {
At time.Time `json:"at"`
- Level string `json:"level"` // "info"|"warn"|"error"
+ Level string `json:"level"` // "info"|"warn"|"error"
Message string `json:"message"`
- Code string `json:"code"` // 관련 종목코드 (없으면 "")
+ Code string `json:"code"` // 관련 종목코드 (없으면 "")
}
// ThemeRef 감시 소스로 선택된 테마 참조
diff --git a/services/autotrade_service.go b/services/autotrade_service.go
index 933a8cc..7cc82cf 100644
--- a/services/autotrade_service.go
+++ b/services/autotrade_service.go
@@ -380,11 +380,11 @@ func (s *AutoTradeService) exitLoop() {
// checkEntries 진입 조건 체크 및 매수 주문
func (s *AutoTradeService) checkEntries() {
- signals := s.getWatchSignals()
-
+ // 규칙 및 현재 포지션 수 선조회
s.mu.RLock()
rules := make([]models.AutoTradeRule, len(s.rules))
copy(rules, s.rules)
+ posCount := s.countActivePositions()
s.mu.RUnlock()
// 활성 규칙 수 계산
@@ -395,6 +395,21 @@ func (s *AutoTradeService) checkEntries() {
}
}
+ // 모든 활성 규칙이 최대 포지션에 도달했으면 신호 조회 생략 → 보유 종목 감시만 진행
+ hasRoom := false
+ for _, r := range rules {
+ if r.Enabled && posCount < r.MaxPositions {
+ hasRoom = true
+ break
+ }
+ }
+ if !hasRoom && activeRules > 0 {
+ s.addLog("debug", "", fmt.Sprintf("진입 스캔 생략: 최대 포지션 도달 (%d개 보유 중, 청산 감시만 진행)", posCount))
+ return
+ }
+
+ signals := s.getWatchSignals()
+
s.addLog("debug", "", fmt.Sprintf("진입 스캔: 신호 %d개, 활성규칙 %d개", len(signals), activeRules))
if len(signals) == 0 {
@@ -497,13 +512,13 @@ func (s *AutoTradeService) checkEntries() {
}
// 포지션 등록 (현재가 기준 예상 손절/익절가 미리 계산 → UI에 0원 방지)
- estStop := int64(float64(sig.CurrentPrice) * (1 + rule.StopLossPct/100))
- estProfit := int64(float64(sig.CurrentPrice) * (1 + rule.TakeProfitPct/100))
+ estStop1, estStop, estProfit := calcStopTargets(sig.CurrentPrice, &rule)
pos := &models.AutoTradePosition{
Code: code,
Name: sig.Name,
Qty: qty,
BuyPrice: sig.CurrentPrice,
+ StopLoss1: estStop1,
StopLoss: estStop,
TakeProfit: estProfit,
OrderNo: result.OrderNo,
@@ -561,21 +576,13 @@ func (s *AutoTradeService) checkExits() {
// 포지션 모니터링 debug 로그
if posCopy.BuyPrice > 0 {
pl := (float64(curPrice) - float64(posCopy.BuyPrice)) / float64(posCopy.BuyPrice) * 100
- s.addLog("debug", code, fmt.Sprintf("모니터링 [%s] 현재가=%s원 손익=%+.2f%% (손절=%s 익절=%s)",
- posCopy.Name, formatComma(curPrice), pl, formatComma(posCopy.StopLoss), formatComma(posCopy.TakeProfit)))
+ s.addLog("debug", code, fmt.Sprintf("모니터링 [%s] 현재가=%s원 손익=%+.2f%% (1차손절=%s[%d/%d회] 2차손절=%s 익절=%s)",
+ posCopy.Name, formatComma(curPrice), pl,
+ formatComma(posCopy.StopLoss1), posCopy.StopLoss1Touches, s.stopLoss1Limit(posCopy.RuleID),
+ formatComma(posCopy.StopLoss), formatComma(posCopy.TakeProfit)))
}
- var reason string
- switch {
- case curPrice <= posCopy.StopLoss:
- reason = "손절"
- case curPrice >= posCopy.TakeProfit:
- reason = "익절"
- case exitBeforeCloseRule(s.rules, &posCopy) && kstNow.After(closeTime):
- reason = "장마감"
- case maxHoldExpired(s.rules, &posCopy, now):
- reason = "시간초과"
- }
+ reason := s.evalExitReason(code, &posCopy, curPrice, kstNow, closeTime, now)
if reason != "" {
if err := s.executeSell(&posCopy, reason); err != nil {
@@ -629,23 +636,27 @@ func (s *AutoTradeService) checkPending() {
}
rule := s.findRule(pos.RuleID)
- var stopLoss, takeProfit int64
+ var stopLoss1, stopLoss, takeProfit int64
if rule != nil && buyPrice > 0 {
- stopLoss = int64(float64(buyPrice) * (1 + rule.StopLossPct/100))
- takeProfit = int64(float64(buyPrice) * (1 + rule.TakeProfitPct/100))
+ stopLoss1, stopLoss, takeProfit = calcStopTargets(buyPrice, rule)
}
s.mu.Lock()
if p, ok := s.positions[pos.Code]; ok && p.Status == "pending" {
p.BuyPrice = buyPrice
+ p.StopLoss1 = stopLoss1
p.StopLoss = stopLoss
p.TakeProfit = takeProfit
p.Status = "open"
}
s.mu.Unlock()
- s.addLog("info", pos.Code, fmt.Sprintf("매수 체결 확인: %s %d주 @ %d원 (손절: %d, 익절: %d)",
- pos.Name, pos.Qty, buyPrice, stopLoss, takeProfit))
+ sl1Count := 0
+ if rule != nil {
+ sl1Count = rule.StopLoss1Count
+ }
+ s.addLog("info", pos.Code, fmt.Sprintf("매수 체결 확인: %s %d주 @ %d원 (1차손절: %d[%d회], 2차손절: %d, 익절: %d)",
+ pos.Name, pos.Qty, buyPrice, stopLoss1, sl1Count, stopLoss, takeProfit))
}
}
@@ -706,6 +717,20 @@ func (s *AutoTradeService) executeSell(pos *models.AutoTradePosition, reason str
return nil
}
+// ClosePosition 개별 포지션 수동 청산
+func (s *AutoTradeService) ClosePosition(code string) error {
+ s.mu.RLock()
+ pos, ok := s.positions[code]
+ s.mu.RUnlock()
+ if !ok {
+ return fmt.Errorf("포지션을 찾을 수 없습니다: %s", code)
+ }
+ if pos.Status != "open" && pos.Status != "pending" {
+ return fmt.Errorf("이미 청산된 포지션입니다: %s", code)
+ }
+ return s.executeSell(pos, "수동청산")
+}
+
// countActivePositions pending+open 포지션 수
func (s *AutoTradeService) countActivePositions() int {
count := 0
@@ -799,3 +824,80 @@ func maxHoldExpired(rules []models.AutoTradeRule, p *models.AutoTradePosition, n
}
return false
}
+
+// calcStopTargets 매수가 기준으로 1차 손절가 / 2차 손절가 / 익절가 계산
+func calcStopTargets(buyPrice int64, rule *models.AutoTradeRule) (stopLoss1, stopLoss, takeProfit int64) {
+ if rule == nil || buyPrice <= 0 {
+ return 0, 0, 0
+ }
+ if rule.StopLoss1Count > 0 && rule.StopLoss1Pct != 0 {
+ stopLoss1 = int64(float64(buyPrice) * (1 + rule.StopLoss1Pct/100))
+ }
+ stopLoss = int64(float64(buyPrice) * (1 + rule.StopLossPct/100))
+ takeProfit = int64(float64(buyPrice) * (1 + rule.TakeProfitPct/100))
+ return
+}
+
+// stopLoss1Limit 규칙의 1차 손절 터치 임계 반환 (규칙 없으면 0)
+func (s *AutoTradeService) stopLoss1Limit(ruleID string) int {
+ s.mu.RLock()
+ defer s.mu.RUnlock()
+ for _, r := range s.rules {
+ if r.ID == ruleID {
+ return r.StopLoss1Count
+ }
+ }
+ return 0
+}
+
+// evalExitReason 청산 조건 평가 — 2중 손절 포함
+// 2차 손절(즉시) → 1차 손절(터치 카운트) → 익절 → 장마감 → 시간초과 순으로 체크
+func (s *AutoTradeService) evalExitReason(code string, pos *models.AutoTradePosition, curPrice int64,
+ kstNow time.Time, closeTime time.Time, now time.Time) string {
+
+ // 2차 손절: 즉시 매도
+ if curPrice <= pos.StopLoss {
+ return "2차손절"
+ }
+
+ // 1차 손절: X회 터치 시 매도
+ if pos.StopLoss1 > 0 && curPrice <= pos.StopLoss1 {
+ rule := s.findRule(pos.RuleID)
+ limit := 0
+ if rule != nil {
+ limit = rule.StopLoss1Count
+ }
+
+ s.mu.Lock()
+ var touches int
+ if p, ok := s.positions[code]; ok && p.Status == "open" {
+ p.StopLoss1Touches++
+ touches = p.StopLoss1Touches
+ }
+ s.mu.Unlock()
+
+ if limit > 0 && touches >= limit {
+ return "1차손절"
+ }
+ s.addLog("warn", code, fmt.Sprintf("1차손절 터치 %d/%d회 (현재가: %s원, 1차손절가: %s원)",
+ touches, limit, formatComma(curPrice), formatComma(pos.StopLoss1)))
+ return ""
+ }
+
+ // 익절
+ if curPrice >= pos.TakeProfit {
+ return "익절"
+ }
+
+ // 장마감 전 청산
+ s.mu.RLock()
+ rules := s.rules
+ s.mu.RUnlock()
+ if exitBeforeCloseRule(rules, pos) && kstNow.After(closeTime) {
+ return "장마감"
+ }
+ if maxHoldExpired(rules, pos, now) {
+ return "시간초과"
+ }
+ return ""
+}
diff --git a/static/js/autotrade.js b/static/js/autotrade.js
index cada25a..2c10c9b 100644
--- a/static/js/autotrade.js
+++ b/static/js/autotrade.js
@@ -129,7 +129,7 @@ function renderRules(rules) {
진입: RiseScore≥${r.minRiseScore} / 체결강도≥${r.minCntrStr}${r.requireBullish ? ' / AI호재' : ''}
-
청산: 손절${r.stopLossPct}% / 익절+${r.takeProfitPct}%${r.maxHoldMinutes > 0 ? ' / ' + r.maxHoldMinutes + '분' : ''}${r.exitBeforeClose ? ' / 장마감전' : ''}
+
청산: ${r.stopLoss1Count > 0 ? `1차손절${r.stopLoss1Pct}%[${r.stopLoss1Count}회] / 2차손절${r.stopLossPct}%` : `손절${r.stopLossPct}%`} / 익절+${r.takeProfitPct}%${r.maxHoldMinutes > 0 ? ' / ' + r.maxHoldMinutes + '분' : ''}${r.exitBeforeClose ? ' / 장마감전' : ''}
주문금액: ${formatMoney(r.orderAmount)}원 / 최대${r.maxPositions}종목
@@ -173,7 +173,9 @@ function showAddRuleModal() {
document.getElementById('fRequireBullish').checked = false;
document.getElementById('fOrderAmount').value = 500000;
document.getElementById('fMaxPositions').value = 3;
- document.getElementById('fStopLoss').value = -3;
+ document.getElementById('fStopLoss1').value = -2;
+ document.getElementById('fStopLoss1Count').value = 3;
+ document.getElementById('fStopLoss').value = -4;
document.getElementById('fTakeProfit').value = 5;
document.getElementById('fMaxHold').value = 60;
document.getElementById('fExitBeforeClose').checked = true;
@@ -190,6 +192,8 @@ function showEditRuleModal(r) {
document.getElementById('fRequireBullish').checked = r.requireBullish;
document.getElementById('fOrderAmount').value = r.orderAmount;
document.getElementById('fMaxPositions').value = r.maxPositions;
+ document.getElementById('fStopLoss1').value = r.stopLoss1Pct ?? -2;
+ document.getElementById('fStopLoss1Count').value = r.stopLoss1Count ?? 3;
document.getElementById('fStopLoss').value = r.stopLossPct;
document.getElementById('fTakeProfit').value = r.takeProfitPct;
document.getElementById('fMaxHold').value = r.maxHoldMinutes;
@@ -211,6 +215,8 @@ async function submitRule() {
requireBullish: document.getElementById('fRequireBullish').checked,
orderAmount: parseInt(document.getElementById('fOrderAmount').value),
maxPositions: parseInt(document.getElementById('fMaxPositions').value),
+ stopLoss1Pct: parseFloat(document.getElementById('fStopLoss1').value),
+ stopLoss1Count: parseInt(document.getElementById('fStopLoss1Count').value) || 0,
stopLossPct: parseFloat(document.getElementById('fStopLoss').value),
takeProfitPct: parseFloat(document.getElementById('fTakeProfit').value),
maxHoldMinutes: parseInt(document.getElementById('fMaxHold').value),
@@ -268,7 +274,8 @@ function renderPositions(positions) {
종목
매수가
수량
-
손절가
+
1차손절
+
2차손절
상태
@@ -284,7 +291,8 @@ function renderPositions(positions) {
${formatMoney(p.buyPrice)}
${p.qty}
-
${formatMoney(p.stopLoss)}
+
${p.stopLoss1 > 0 ? formatMoney(p.stopLoss1) + `[${p.stopLoss1Touches||0}회] ` : '-'}
+
${formatMoney(p.stopLoss)}
${statusTxt}
`;
diff --git a/static/js/watchlist.js b/static/js/watchlist.js
index 47da819..ef4542c 100644
--- a/static/js/watchlist.js
+++ b/static/js/watchlist.js
@@ -351,27 +351,39 @@
// ─────────────────────────────────────────────
function renderSidebar() {
const list = loadList();
- Array.from(sidebarEl.children).forEach(el => {
- if (el.id !== 'watchlistEmpty') el.remove();
- });
- list.forEach(s => sidebarEl.appendChild(makeSidebarItem(s.code, s.name)));
+ // 테이블 생성
+ let tableEl = sidebarEl.querySelector('table');
+ if (tableEl) tableEl.remove();
+ if (list.length > 0) {
+ tableEl = document.createElement('table');
+ tableEl.className = 'w-full text-xs';
+ const tbody = document.createElement('tbody');
+ tbody.className = 'divide-y divide-gray-50';
+ list.forEach(s => tbody.appendChild(makeSidebarItem(s.code, s.name)));
+ tableEl.appendChild(tbody);
+ sidebarEl.insertBefore(tableEl, emptyEl);
+ }
updateEmptyStates();
}
function makeSidebarItem(code, name) {
- const li = document.createElement('li');
- li.id = `si-${code}`;
- li.className = 'flex items-center justify-between px-3 py-2.5 hover:bg-gray-50 group';
- li.innerHTML = `
-
- ${name}
- ${code}
-
-
- ×
- `;
- return li;
+ const tr = document.createElement('tr');
+ tr.id = `si-${code}`;
+ tr.className = 'hover:bg-gray-50 group cursor-pointer';
+ tr.onclick = () => { window.location.href = `/stock/${code}`; };
+ tr.innerHTML = `
+
+ ${name}
+ ${code}
+
+
-
+
-
+
-
+
+ ×
+ `;
+ return tr;
}
// ─────────────────────────────────────────────
@@ -437,17 +449,21 @@
const rateEl = document.getElementById(`wc-rate-${code}`);
const volEl = document.getElementById(`wc-vol-${code}`);
const cntrEl = document.getElementById(`wc-cntr-${code}`);
- if (!priceEl) return;
const rate = data.changeRate ?? 0;
const colorCls = rateClass(rate);
const bgCls = rateBadgeClass(rate);
const sign = rate > 0 ? '+' : '';
- priceEl.textContent = fmtNum(data.currentPrice) + '원';
- priceEl.className = `text-xl font-bold mb-2 ${colorCls}`;
- rateEl.textContent = sign + rate.toFixed(2) + '%';
- rateEl.className = `text-xs px-2 py-0.5 rounded-full font-semibold ${bgCls}`;
+ // 패널 카드 업데이트
+ if (priceEl) {
+ priceEl.textContent = fmtNum(data.currentPrice) + '원';
+ priceEl.className = `text-xl font-bold mb-2 ${colorCls}`;
+ }
+ if (rateEl) {
+ rateEl.textContent = sign + rate.toFixed(2) + '%';
+ rateEl.className = `text-xs px-2 py-0.5 rounded-full font-semibold ${bgCls}`;
+ }
if (volEl) volEl.textContent = fmtNum(data.volume);
if (cntrEl && data.cntrStr !== undefined) {
const cs = data.cntrStr;
@@ -455,6 +471,24 @@
cntrEl.className = `font-bold ${cs >= 100 ? 'text-orange-500' : 'text-blue-400'}`;
}
+ // 사이드바 행 업데이트
+ const siPrice = document.getElementById(`si-price-${code}`);
+ const siRate = document.getElementById(`si-rate-${code}`);
+ const siCntr = document.getElementById(`si-cntr-${code}`);
+ if (siPrice) {
+ siPrice.textContent = fmtNum(data.currentPrice);
+ siPrice.className = `px-2 py-2 text-right font-mono ${colorCls}`;
+ }
+ if (siRate) {
+ siRate.textContent = fmtRate(rate);
+ siRate.className = `px-2 py-2 text-right ${colorCls}`;
+ }
+ if (siCntr && data.cntrStr !== undefined) {
+ const cs = data.cntrStr;
+ siCntr.textContent = fmtCntr(cs);
+ siCntr.className = `px-2 py-2 text-right ${cs >= 100 ? 'text-orange-500 font-bold' : cs > 0 ? 'text-blue-400' : 'text-gray-400'}`;
+ }
+
// 체결강도 히스토리 기록 + 미니 차트 갱신
if (data.cntrStr != null && data.cntrStr !== 0) {
recordCntr(code, data.cntrStr);
@@ -536,7 +570,7 @@
// ─────────────────────────────────────────────
function updateEmptyStates() {
const hasItems = cachedList.length > 0;
- emptyEl.classList.toggle('hidden', hasItems);
+ if (emptyEl) emptyEl.classList.toggle('hidden', hasItems);
panelEmpty?.classList.toggle('hidden', hasItems);
}
diff --git a/templates/pages/autotrade.html b/templates/pages/autotrade.html
index 6c144ad..e97f9c6 100644
--- a/templates/pages/autotrade.html
+++ b/templates/pages/autotrade.html
@@ -220,11 +220,32 @@
청산 조건
+
+
+
+ 2중 손절:
+ 1차 손절가에 설정 횟수만큼 터치 시 매도,
+ 2차 손절가 도달 시 즉시 매도.
+ 1차 터치 횟수를 0으로 설정하면 단순 손절.
+
+
{{ end }}