refactor(schedule): unify global time logic and market phases into MarketScheduleManager

This commit is contained in:
2026-11-17 17:21:26 +09:00
parent 87b958b722
commit cea7a4dafe
7 changed files with 207 additions and 57 deletions
+8 -22
View File
@@ -62,27 +62,19 @@ object KisSession {
} }
} }
fun startTime(): LocalTime { fun startTime(): LocalTime = service.MarketScheduleManager.userStartTime
return getStartTimeAsLocalTime(tradeConfig.auto_start_time)
}
fun endTime(): LocalTime { fun endTime(): LocalTime = service.MarketScheduleManager.userEndTime
return getStartTimeAsLocalTime(tradeConfig.auto_end_time)
}
fun startBuyTime(): LocalTime { fun startBuyTime(): LocalTime = service.MarketScheduleManager.userStartBuyTime
return getStartTimeAsLocalTime(tradeConfig.start_buy_time)
}
fun endBuyTime(): LocalTime { fun endBuyTime(): LocalTime = service.MarketScheduleManager.userEndBuyTime
return getStartTimeAsLocalTime(tradeConfig.end_buy_time)
}
fun getStartTimeAsLocalTime(config: String): LocalTime { fun getStartTimeAsLocalTime(config: String): LocalTime {
return try { return try {
LocalTime.parse(config) LocalTime.parse(config)
} catch (e: Exception) { } catch (e: Exception) {
LocalTime.of(9, 0) // 파싱 실패 시 기본값 LocalTime.of(9, 0)
} }
} }
@@ -95,15 +87,9 @@ object KisSession {
return (hour * 3600 + min * 60) * 1000L return (hour * 3600 + min * 60) * 1000L
} }
fun isAvailBuyTime(now: LocalTime): Boolean { fun isAvailBuyTime(now: LocalTime): Boolean = service.MarketScheduleManager.isAvailBuyTime(now)
return now.isBefore(endBuyTime()) && now.isAfter(startBuyTime())
}
fun isMarketOpenTime(now: LocalTime): Boolean { fun isMarketOpenTime(now: LocalTime): Boolean = service.MarketScheduleManager.isMarketOpenTime(now)
return now.isBefore(LocalTime.of(15, 30)) && now.isAfter(LocalTime.of(9, 0))
}
fun isMarketAnalyzerTime(now: LocalTime): Boolean { fun isMarketAnalyzerTime(now: LocalTime): Boolean = service.MarketScheduleManager.isMarketAnalyzerTime(now)
return now.isBefore(LocalTime.of(19, 0)) && now.isAfter(LocalTime.of(8, 0))
}
} }
+3 -4
View File
@@ -340,7 +340,7 @@ object KisTradeService {
parameter("FID_INPUT_DATE_1", startDate) parameter("FID_INPUT_DATE_1", startDate)
parameter("FID_INPUT_DATE_2", endDate) parameter("FID_INPUT_DATE_2", endDate)
parameter("FID_COND_MRKT_DIV_CODE", if(LocalTime.now(ZoneId.of("Asia/Seoul")).isAfter(LocalTime.of(16,0))) "UN" else "J") parameter("FID_COND_MRKT_DIV_CODE", service.MarketScheduleManager.getMarketDivisionCode())
parameter("FID_INPUT_ISCD", stockCode) parameter("FID_INPUT_ISCD", stockCode)
parameter("FID_PERIOD_DIV_CODE", periodCode) // D, W, M parameter("FID_PERIOD_DIV_CODE", periodCode) // D, W, M
parameter("FID_ORG_ADJ_PRC", "0") parameter("FID_ORG_ADJ_PRC", "0")
@@ -438,7 +438,7 @@ object KisTradeService {
marketCode.equals("SOR") || price == "0" || price.isEmpty() -> "01" // 시장가 marketCode.equals("SOR") || price == "0" || price.isEmpty() -> "01" // 시장가
else -> "00" // 지정가 else -> "00" // 지정가
} }
if (marketCode.equals("KRX") && LocalTime.now(ZoneId.of("Asia/Seoul")).isAfter(LocalTime.of(16,0))) { if (marketCode.equals("KRX") && service.MarketScheduleManager.getMarketDivisionCode() == "UN") {
finalOrderDivision = "41" finalOrderDivision = "41"
} }
@@ -575,8 +575,7 @@ object KisTradeService {
header("Content-Type", "application/json; charset=utf-8") header("Content-Type", "application/json; charset=utf-8")
// 파라미터 설정 // 파라미터 설정
// parameter("FID_COND_MRKT_DIV_CODE", "J") // J: 주식 parameter("FID_COND_MRKT_DIV_CODE", service.MarketScheduleManager.getMarketDivisionCode())
parameter("FID_COND_MRKT_DIV_CODE", if(LocalTime.now(ZoneId.of("Asia/Seoul")).isAfter(LocalTime.of(16,0))) "UN" else "J")
parameter("FID_INPUT_ISCD", stockCode) // 종목코드 parameter("FID_INPUT_ISCD", stockCode) // 종목코드
} }
+8 -11
View File
@@ -1544,7 +1544,7 @@ object AutoTradingManager {
private val executionCountMap = ConcurrentHashMap<String, Int>() private val executionCountMap = ConcurrentHashMap<String, Int>()
suspend fun sellSchedule() { suspend fun sellSchedule() {
if (KisSession.config.take_profit == false) return if (KisSession.config.take_profit == false) return
val now = LocalTime.now() val now = MarketScheduleManager.now()
val timeKey = String.format("%02d:%02d", now.hour, now.minute) // 예: "09:05" val timeKey = String.format("%02d:%02d", now.hour, now.minute) // 예: "09:05"
val currentCount = executionCountMap.getOrDefault(timeKey, 0) val currentCount = executionCountMap.getOrDefault(timeKey, 0)
if (currentCount >= KisSession.tradeConfig.excuteCountOnMin) { if (currentCount >= KisSession.tradeConfig.excuteCountOnMin) {
@@ -1553,10 +1553,12 @@ object AutoTradingManager {
var isExecuted = false var isExecuted = false
val currentMinute = now.minute val currentMinute = now.minute
if (now.isBefore(LocalTime.of(8, 50)) && now.isAfter(LocalTime.of(8, 45))) { if (MarketScheduleManager.isPreMarketCancelTime(now)) {
// 08:45 ~ 08:50 장전 미체결 매도 주문 취소
cancelAllPendingSellOrders() cancelAllPendingSellOrders()
isExecuted = true isExecuted = true
} else if ((now.isBefore(LocalTime.of(15, 40)) && now.isAfter(KisSession.endBuyTime()))) { } else if (MarketScheduleManager.isClosingCancelTime(now)) {
// endBuyTime ~ 15:40 정규장 마감 후 모든 매수 미체결 취소
val unfilledResult = KisTradeService.fetchUnfilledOrders() val unfilledResult = KisTradeService.fetchUnfilledOrders()
unfilledResult.onSuccess { response -> unfilledResult.onSuccess { response ->
response.filter { it.sll_buy_dvsn_cd == "02" }.forEach { order -> response.filter { it.sll_buy_dvsn_cd == "02" }.forEach { order ->
@@ -1580,13 +1582,8 @@ object AutoTradingManager {
isExecuted = true isExecuted = true
} else if ( } else if (
( (
(now.hour == 8 && KisSession.tradeConfig.before_nxt && currentMinute < 45) || (KisSession.tradeConfig.before_nxt && MarketScheduleManager.isPreNxtTime(now)) ||
(now.isAfter(LocalTime.of(15, 40)) && now.isBefore( (KisSession.tradeConfig.after_nxt && MarketScheduleManager.isAfterMarketTime(now))
LocalTime.of(
20,
0
)
) && KisSession.tradeConfig.after_nxt)
) && (currentMinute % 2 == 0) ) && (currentMinute % 2 == 0)
) { ) {
TradingLogStore.addAnalyzer( TradingLogStore.addAnalyzer(
@@ -1605,7 +1602,7 @@ object AutoTradingManager {
} }
} }
isExecuted = true isExecuted = true
} else if (KisSession.tradeConfig.useReservationSell && (now.hour == KisSession.tradeConfig.reservationSellHour && currentMinute >= KisSession.tradeConfig.reservationSellMinute)) { } else if (MarketScheduleManager.isOvernightReservationTime(now)) {
TradingLogStore.addAnalyzer( TradingLogStore.addAnalyzer(
" - ", " - ",
" - ", " - ",
@@ -0,0 +1,182 @@
package service
import model.KisSession
import java.time.LocalTime
import java.time.ZoneId
/**
* 🏛️ 시장 운영 구간 상태 머신 (Market Phase)
*/
enum class MarketPhase(val label: String) {
SLEEP("야간 휴식 대기"), // 20:00 ~ 07:40
PREPARE_TOKEN("장전 토큰 및 시스템 사전 준비"), // 07:40 ~ 08:00
PRE_NXT("장전 대체거래소(NXT)"), // 08:00 ~ 08:45
PRE_CANCEL("장전 미체결 주문 정리"), // 08:45 ~ 08:55
REGULAR_EARLY("정규장 개장초 (현재가 매도 대응)"), // 08:55 ~ 09:30
REGULAR_MAIN("정규장 메인 AI 매매"), // 09:30 ~ 15:10
REGULAR_CLOSING("정규장 마감 (매수중단/포지션정리)"),// 15:10 ~ 15:30
AFTER_HOURS("장후 시간외 종가매매"), // 15:40 ~ 16:00
AFTER_SINGLE("시간외 단일가 및 대체마켓"), // 16:00 ~ 18:00
AFTER_EXTENDED("장후 단일가 마감 대기"), // 18:00 ~ 19:30
OVERNIGHT_RESERVATION("야간 보유주식 자동 예약 매도"),// 19:30 ~ 20:00
CLOSED("당일 전체 업무 종료") // 20:00 ~
}
/**
* 🕒 프로젝트 전역 통합 시장 스케줄 및 시간 제어 관리자
*
* - 한국거래소(KRX) 공식 고정 규정 시간과 사용자의 커스텀 설정(TradeConfig)을 결합하여
* 일관된 시장 상태(MarketPhase) 및 시간 판정 기능을 제공합니다.
* - 타임존을 Asia/Seoul로 100% 일원화하여 시스템 로컬 타임존 오류를 원천 차단합니다.
*/
object MarketScheduleManager {
val seoulZone: ZoneId = ZoneId.of("Asia/Seoul")
// 현재 서울 기준 시각
fun now(): LocalTime = LocalTime.now(seoulZone)
// ==========================================
// 1. 사용자 커스텀 설정 시간 (TradeConfig 연동)
// ==========================================
val userStartTime: LocalTime
get() = parseTimeOrDefault(KisSession.tradeConfig.auto_start_time, LocalTime.of(8, 0))
val userStartBuyTime: LocalTime
get() = parseTimeOrDefault(KisSession.tradeConfig.start_buy_time, LocalTime.of(8, 55))
val userEndBuyTime: LocalTime
get() = parseTimeOrDefault(KisSession.tradeConfig.end_buy_time, LocalTime.of(15, 10))
val userEndTime: LocalTime
get() = parseTimeOrDefault(KisSession.tradeConfig.auto_end_time, LocalTime.of(20, 0))
val userReservationTime: LocalTime
get() = try {
LocalTime.of(
KisSession.tradeConfig.reservationSellHour.coerceIn(0, 23),
KisSession.tradeConfig.reservationSellMinute.coerceIn(0, 59)
)
} catch (e: Exception) {
LocalTime.of(19, 30)
}
private fun parseTimeOrDefault(timeStr: String, defaultTime: LocalTime): LocalTime {
return try {
LocalTime.parse(timeStr.trim())
} catch (e: Exception) {
defaultTime
}
}
// ==========================================
// 2. 통합 시장 구간(Phase) 판정
// ==========================================
fun getCurrentPhase(currentTime: LocalTime = now()): MarketPhase {
return when {
currentTime.isBefore(LocalTime.of(7, 40)) -> MarketPhase.SLEEP
currentTime.isBefore(userStartTime) -> MarketPhase.PREPARE_TOKEN
currentTime.isBefore(LocalTime.of(8, 45)) -> MarketPhase.PRE_NXT
currentTime.isBefore(userStartBuyTime) -> MarketPhase.PRE_CANCEL
currentTime.isBefore(LocalTime.of(9, 30)) -> MarketPhase.REGULAR_EARLY
currentTime.isBefore(userEndBuyTime) -> MarketPhase.REGULAR_MAIN
currentTime.isBefore(LocalTime.of(15, 30)) -> MarketPhase.REGULAR_CLOSING
currentTime.isBefore(LocalTime.of(15, 40)) -> MarketPhase.REGULAR_CLOSING
currentTime.isBefore(LocalTime.of(16, 0)) -> MarketPhase.AFTER_HOURS
currentTime.isBefore(LocalTime.of(18, 0)) -> MarketPhase.AFTER_SINGLE
currentTime.isBefore(userReservationTime) -> MarketPhase.AFTER_EXTENDED
currentTime.isBefore(userEndTime) -> MarketPhase.OVERNIGHT_RESERVATION
else -> MarketPhase.CLOSED
}
}
// ==========================================
// 3. 주요 정책별 판정 불리언 헬퍼
// ==========================================
/**
* 신규 AI 매수 주문이 허용되는 시간인지 검사 (start_buy_time ~ end_buy_time)
*/
fun isAvailBuyTime(currentTime: LocalTime = now()): Boolean {
return currentTime.isAfter(userStartBuyTime) && currentTime.isBefore(userEndBuyTime)
}
/**
* 한국 정규장(09:00 ~ 15:30) 운영 중인지 검사
*/
fun isMarketOpenTime(currentTime: LocalTime = now()): Boolean {
return currentTime.isAfter(LocalTime.of(9, 0)) && currentTime.isBefore(LocalTime.of(15, 30))
}
/**
* 한국 정규장 운영 여부 (MarketUtil 호환)
*/
fun isKoreanMarketOpen(currentTime: LocalTime = now()): Boolean = isMarketOpenTime(currentTime)
/**
* AI 종목 분석이 허용되는 시간인지 검사 (08:00 ~ 19:00)
*/
fun isMarketAnalyzerTime(currentTime: LocalTime = now()): Boolean {
return currentTime.isAfter(LocalTime.of(8, 0)) && currentTime.isBefore(LocalTime.of(19, 0))
}
/**
* 장 시작 전 미체결 매도 취소 구간 (08:45 ~ 08:50)
*/
fun isPreMarketCancelTime(currentTime: LocalTime = now()): Boolean {
return currentTime.isAfter(LocalTime.of(8, 45)) && currentTime.isBefore(LocalTime.of(8, 50))
}
/**
* 정규장 마감 후 매수 미체결 취소 구간 (endBuyTime ~ 15:40)
*/
fun isClosingCancelTime(currentTime: LocalTime = now()): Boolean {
return currentTime.isAfter(userEndBuyTime) && currentTime.isBefore(LocalTime.of(15, 40))
}
/**
* 장전 대체거래소(NXT) 가동 구간 (08:00 ~ 08:45)
*/
fun isPreNxtTime(currentTime: LocalTime = now()): Boolean {
return currentTime.hour == 8 && currentTime.minute < 45
}
/**
* 장후 대체/시간외 단일가 가동 구간 (15:40 ~ 20:00)
*/
fun isAfterMarketTime(currentTime: LocalTime = now()): Boolean {
return currentTime.isAfter(LocalTime.of(15, 40)) && currentTime.isBefore(userEndTime)
}
/**
* 야간 보유주식 자동 예약 매도 구간 (reservationSellHour:Minute ~ userEndTime)
*/
fun isOvernightReservationTime(currentTime: LocalTime = now()): Boolean {
return KisSession.tradeConfig.useReservationSell &&
(currentTime.hour == KisSession.tradeConfig.reservationSellHour &&
currentTime.minute >= KisSession.tradeConfig.reservationSellMinute &&
currentTime.isBefore(userEndTime))
}
/**
* 한투 API 마켓 구분 코드: 16:00 이전 "J" (정규장), 16:00 이후 "UN" (시간외 단일가)
*/
fun getMarketDivisionCode(currentTime: LocalTime = now()): String {
return if (currentTime.isAfter(LocalTime.of(16, 0))) "UN" else "J"
}
/**
* UI 상단 상태바 표시용 시장 상태 텍스트
*/
fun getMarketStatusText(currentTime: LocalTime = now()): String {
return when {
currentTime.isBefore(LocalTime.of(8, 30)) -> "장 시작 전"
currentTime.isBefore(LocalTime.of(9, 0)) -> "장전 시간외 (08:30~09:00)"
currentTime.isBefore(LocalTime.of(15, 30)) -> "정규장 (09:00~15:30)"
currentTime.isBefore(LocalTime.of(16, 0)) -> "장후 시간외 (15:40~16:00)"
currentTime.isBefore(LocalTime.of(18, 0)) -> "시간외 단일가 (16:00~18:00)"
currentTime.isBefore(userReservationTime) -> "장후 시간외 마감"
currentTime.isBefore(userEndTime) -> "야간 예약 매도 구간"
else -> "장 마감"
}
}
}
@@ -96,9 +96,9 @@ object SystemSleepPreventer {
} }
private fun isWorkingTime(): Boolean { private fun isWorkingTime(): Boolean {
val now = LocalTime.now() val now = MarketScheduleManager.now()
val start = KisSession.startTime().minusMinutes(10) val start = MarketScheduleManager.userStartTime.minusMinutes(10)
val end = KisSession.endTime() val end = MarketScheduleManager.userEndTime
return now.isAfter(start) && now.isBefore(end) return now.isAfter(start) && now.isBefore(end)
} }
+1 -9
View File
@@ -830,13 +830,5 @@ private fun DecisionTag(decision: String) {
* 현재 시간 기준 시장 운영 상태 계산 헬퍼 * 현재 시간 기준 시장 운영 상태 계산 헬퍼
*/ */
private fun getMarketStatus(): String { private fun getMarketStatus(): String {
val now = LocalTime.now(ZoneId.of("Asia/Seoul")) return service.MarketScheduleManager.getMarketStatusText()
return when {
now.isBefore(LocalTime.of(8, 30)) -> "장 시작 전"
now.isBefore(LocalTime.of(9, 0)) -> "장전 시간외 (08:30~09:00)"
now.isBefore(LocalTime.of(15, 30)) -> "정규장 (09:00~15:30)"
now.isBefore(LocalTime.of(16, 0)) -> "장후 시간외 (15:40~16:00)"
now.isBefore(LocalTime.of(18, 0)) -> "시간외 단일가 (16:00~18:00)"
else -> "장 마감"
}
} }
+1 -7
View File
@@ -42,13 +42,7 @@ object MarketUtil {
} }
fun isKoreanMarketOpen(): Boolean { fun isKoreanMarketOpen(): Boolean {
// 한국 시간대 기준 현재 시간 가져오기 return service.MarketScheduleManager.isKoreanMarketOpen()
val now = LocalTime.now(ZoneId.of("Asia/Seoul"))
val start = LocalTime.of(9, 0)
val end = LocalTime.of(15, 30)
// 주말 제외 로직은 필요시 추가 (일단 시간대 우선)
return now.isAfter(start) && now.isBefore(end)
} }
fun getTickSize(price: Double): Double { fun getTickSize(price: Double): Double {