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/report/template/ProAnalysisSummary.kt | 9 ++++----- 1 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt index 0899468..fdec9ce 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/business/report/template/ProAnalysisSummary.kt @@ -12,7 +12,6 @@ import cn.flightfeather.supervision.domain.ds1.entity.SceneMixingPlant import cn.flightfeather.supervision.domain.ds1.entity.SceneStorageYard import cn.flightfeather.supervision.domain.ds1.entity.SceneWharf -import kotlin.math.round /** * 鍒嗚闀囬棶棰樻暣鏀瑰垎鏋愭眹鎬昏〃 @@ -47,16 +46,16 @@ districtMap[k]?.apply { sceneCount++ val status = when (dataSource.config.sceneType.toString()) { - Constant.ScenseType.TYPE1.value -> { + Constant.SceneType.TYPE1.value -> { (rowData.baseScene as SceneConstructionSite?)?.csStatus } - Constant.ScenseType.TYPE2.value -> { + Constant.SceneType.TYPE2.value -> { (rowData.baseScene as SceneWharf?)?.getwStatus() } - Constant.ScenseType.TYPE3.value -> { + Constant.SceneType.TYPE3.value -> { (rowData.baseScene as SceneMixingPlant?)?.mpStatus } - Constant.ScenseType.TYPE14.value -> { + Constant.SceneType.TYPE14.value -> { (rowData.baseScene as SceneStorageYard?)?.syStatus } else -> "" -- Gitblit v1.9.3