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 | 123 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 119 insertions(+), 4 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 7856093..f6c61e5 100644
--- a/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt
+++ b/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt
@@ -2,8 +2,12 @@
class Constant{
//鐢ㄦ埛
- enum class UserType(val text: String){
- ALLUSER("0")//鎵�鏈夌敤鎴�
+ enum class UserType(val value: Int, val des: String){
+ ALL_USER(-1,"0"),//鎵�鏈夌敤鎴�
+ ADMIN(0, "绠＄悊鍛�"),
+ INSIDER(1, "鍐呴儴浜哄憳"),
+ GOV(2, "鏀垮簻閮ㄩ棬"),
+ ENTERPRISE(3, "浼佷笟")
}
//瑙勮寖绫诲埆
enum class RuleType(val value: Byte, val text: String){
@@ -16,7 +20,7 @@
RUNINGSTATUS3("3","宸茬粨鏉�")
}
//鍦烘櫙绫诲瀷
- enum class ScenseType(val value: String, val text: String){
+ enum class SceneType(val value: String, val text: String){
TYPE1("1","宸ュ湴"), TYPE2("2","鐮佸ご"),
TYPE3("3","姘存偿鎼呮媽绔�"), TYPE4("4","宸ヤ笟浼佷笟"),
TYPE5("5","椁愰ギ"), TYPE6("6","姹戒慨"),
@@ -40,8 +44,108 @@
TYPE14.value -> 4
else -> sceneTypeId
}
+
+ fun getDes(value: Int?): String {
+ return getByValue(value?.toString()).text
+ }
+
+ fun getByValue(value: String?) = when (value.toString()) {
+ "1" -> TYPE1
+ "2" -> TYPE2
+ "3" -> TYPE3
+ "4" -> TYPE4
+ "5" -> TYPE5
+ "6" -> TYPE6
+ "7" -> TYPE7
+ "8" -> TYPE8
+ "9" -> TYPE9
+ "10" -> TYPE10
+ "11" -> TYPE11
+ "12" -> TYPE12
+ "13" -> TYPE13
+ "14" -> TYPE14
+ "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 {
//闂瀹℃牳
@@ -52,14 +156,25 @@
const val CHANGE_CHECK_PASS = "change_pass"//鏁存敼閫氳繃
const val CHANGE_CHECK_FAIL = "change_fail"//鏁存敼鏈�氳繃
+ //闂鏁存敼
+ const val LOCAL_CHANGE = "鐜板満鏁存敼"
+ const val PROMISE_CHANGE = "鎵胯鏁存敼"
+ const val UN_PROMISE_CHANGE = "鏈壙璇烘暣鏀�"
+
const val PROBLEM_DELETED = "deleted"//闂鍒犻櫎
// const val DEFAULT_FILE_PATH = "E:/02product/04supervision_ii"
-// const val DEFAULT_FILE_PATH = "D:/02product/04supervision_ii"
+// const val DEFAULT_FILE_PATH = "target"
const val DEFAULT_FILE_PATH = "D:/02product/04supervision"
// 宸ュ湴闂浣嶇疆
const val INDUSTRY_LOCATION_ID = "JxTIFYjzUsAiOmqT"
+ // 鐮佸ご銆佸爢鍦洪棶棰樹綅缃�
+ const val WHARF_LOCATION_ID = "mUeYoflgS4mOVBA2"
+ // 姘存偿鎼呮媽绔�
+ const val MIX_LOCATION_ID = "yKbiSAja1CyyBjlS"
+ // 鍫嗗満
+ const val STORAGE_YARD_LOCATION_ID = "AxYp8idrARnnep4H"
// 椁愰ギ闂浣嶇疆
const val RESTAURANT_LOCATION_ID = "bMpvxuqHlB1CTYfh"
// 姹戒慨闂浣嶇疆
--
Gitblit v1.9.3