From b8cc591541b88dd2bb93f111f8e8075842dce7ca Mon Sep 17 00:00:00 2001
From: feiyu02 <risaku@163.com>
Date: 星期二, 13 八月 2024 17:21:06 +0800
Subject: [PATCH] 1. 新增设备信息相关功能 2. 修正自评估中数据自动评分的部分逻辑
---
src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt | 96 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 79 insertions(+), 17 deletions(-)
diff --git a/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt b/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt
index bc73931..f6c61e5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt
@@ -45,23 +45,8 @@
else -> sceneTypeId
}
- fun getDes(value: Int?) = when (value.toString()) {
- "1" -> TYPE1.text
- "2" -> TYPE2.text
- "3" -> TYPE3.text
- "4" -> TYPE4.text
- "5" -> TYPE5.text
- "6" -> TYPE6.text
- "7" -> TYPE7.text
- "8" -> TYPE8.text
- "9" -> TYPE9.text
- "10" -> TYPE10.text
- "11" -> TYPE11.text
- "12" -> TYPE12.text
- "13" -> TYPE13.text
- "14" -> TYPE14.text
- "99" -> TYPE99.text
- else -> ""
+ fun getDes(value: Int?): String {
+ return getByValue(value?.toString()).text
}
fun getByValue(value: String?) = when (value.toString()) {
@@ -82,9 +67,86 @@
"99" -> TYPE99
else -> TYPE99
}
+
+ fun getByName(name: String?) = when (name) {
+ TYPE1.text -> TYPE1
+ TYPE2.text -> TYPE2
+ TYPE3.text -> TYPE3
+ TYPE4.text -> TYPE4
+ TYPE5.text -> TYPE5
+ TYPE6.text -> TYPE6
+ TYPE7.text -> TYPE7
+ TYPE8.text -> TYPE8
+ TYPE9.text -> TYPE9
+ TYPE10.text -> TYPE10
+ TYPE11.text -> TYPE11
+ TYPE12.text -> TYPE12
+ TYPE13.text -> TYPE13
+ TYPE14.text -> TYPE14
+ TYPE99.text -> TYPE99
+ else -> null
+ }
}
}
+ enum class SceneTypeTZ(val value: Int, val des: String) {
+ NoType(0, "鏃犵被鍨�"),
+ Restaurant(1, "椁愰ギ"),
+ Construction(2, "宸ュ湴"),
+ Wharf(3, "鐮佸ご"),
+ StorageYard(4, "鍫嗗満"),
+ MixingPlant(5, "鎼呮媽绔�"),
+ Industrial(6, "宸ヤ笟浼佷笟"),
+ VehicleRepair(7, "姹戒慨"),
+ Laboratory(8, "瀹為獙瀹�"),
+ MedicalInstitution(9, "鍖荤枟鏈烘瀯");
+
+ companion object {
+ fun getNameByValue(value: Int?): String = when (value) {
+ 0 -> NoType.des
+ 1 -> Restaurant.des
+ 2 -> Construction.des
+ 3 -> Wharf.des
+ 4 -> StorageYard.des
+ 5 -> MixingPlant.des
+ 6 -> Industrial.des
+ 7 -> VehicleRepair.des
+ 8 -> Laboratory.des
+ 9 -> MedicalInstitution.des
+ else -> NoType.des
+ }
+
+ fun toPairList() = listOf(
+ Pair(Restaurant.value.toString(), Restaurant.des),
+ Pair(Construction.value.toString(), Construction.des),
+ Pair(Wharf.value.toString(), Wharf.des),
+ Pair(StorageYard.value.toString(), StorageYard.des),
+ Pair(MixingPlant.value.toString(), MixingPlant.des),
+ Pair(Industrial.value.toString(), Industrial.des),
+ Pair(VehicleRepair.value.toString(), VehicleRepair.des),
+ Pair(Laboratory.value.toString(), Laboratory.des),
+ Pair(MedicalInstitution.value.toString(), MedicalInstitution.des),
+ )
+ }
+ }
+
+ //璁惧绫诲瀷
+ enum class DeviceType(val value: Byte, val text: String){
+ MONITOR_DEVICE(0, "鐩戞帶璁惧"),
+ TREATMENT_DEVICE(1, "娌荤悊璁惧"),
+ PRODUCTION_DEVICE(2, "鐢熶骇璁惧");
+
+ companion object {
+ fun fromValue(value: Byte) = when (value.toInt()) {
+ 0 -> MONITOR_DEVICE
+ 1 -> TREATMENT_DEVICE
+ 2 -> PRODUCTION_DEVICE
+ else -> MONITOR_DEVICE
+ }
+ }
+ }
+
+
companion object {
//闂瀹℃牳
const val PROBLEM_CHECK_PASS = "pass"//闂瀹℃牳閫氳繃
--
Gitblit v1.9.3