From 6fdacca914ef38e6cc91292ef07c5af32bd92991 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 03 十二月 2024 11:12:40 +0800 Subject: [PATCH] 1. BgTask增加onStatusChange参数,通过外界传递如何发送状态改变的消息 2. BackgroundTaskCtrl.kt 创建了BgTask对象并传递了onStatusChange参数 3. WebSocketMessageUtil 类名修改为 WebSocketMessageDecoder 4. SendWebSocketMessageUtil 类名修改为 WebSocketSendMessageUtil --- src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt | 13 ++++--------- 1 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt index 10faf8d..a7447ff 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/business/autooutput/score/restaurant/ReScoreItem10.kt @@ -38,31 +38,26 @@ * 3.鏀跺埌鎵ф硶鎰忚涔� * 4.鏈夌幆澧冭繚娉曡涓轰笖鍙楀埌琛屾斂澶勭綒 */ - override fun otherProblem(size: Int): Int? { + override fun otherProblem(size: Int): List<Int>? { val time = evaluationScene.subTask.value?.planstarttime val lt = LocalDateTime.ofInstant(time?.toInstant(), ZoneId.systemDefault()) val s = lt.withDayOfMonth(1).withHour(0).withMinute(0).withSecond(0) val e = s.plusMonths(1) - var i = 1 + var i = 0 when { condition3(s, e) -> { i = 3 - if (i > size - 1) i = size - 1 - return i } condition2(s, e) -> { i = 2 - if (i > size - 1) i = size - 1 - return i } condition1(s, e) -> { i = 1 - if (i > size - 1) i = size - 1 - return i } - else -> return null } + if (i > size - 1) i = size - 1 + return listOf(i) } /** -- Gitblit v1.9.3