From 46872a311da9480d3edb19223aca2e0833fb1e31 Mon Sep 17 00:00:00 2001 From: hcong <1050828145@qq.com> Date: 星期二, 17 十二月 2024 11:41:00 +0800 Subject: [PATCH] 1. 完成数据产品中间结果基本信息和具体信息入库 2. 修改ColInspectionInfo.kt 监管时间格式修改为yyyy-mm-dd 3. 新增数据产品类型枚举类 DataProductType 4. 修改BaseTemplate实现类通过重写genData方法生成Template相关数据 5. TODO 其他未涉及到的产品对象的中间结果对象 --- src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt | 175 ++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 157 insertions(+), 18 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..86e1ae9 100644 --- a/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt +++ b/src/main/kotlin/cn/flightfeather/supervision/common/utils/Constant.kt @@ -7,7 +7,18 @@ ADMIN(0, "绠$悊鍛�"), INSIDER(1, "鍐呴儴浜哄憳"), GOV(2, "鏀垮簻閮ㄩ棬"), - ENTERPRISE(3, "浼佷笟") + ENTERPRISE(3, "浼佷笟"); + + companion object { + fun fromValue(value: Int?) = when (value) { + -1 -> ALL_USER + 0 -> ADMIN + 1 -> INSIDER + 2 -> GOV + 3 -> ENTERPRISE + else -> ALL_USER + } + } } //瑙勮寖绫诲埆 enum class RuleType(val value: Byte, val text: String){ @@ -45,23 +56,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,7 +78,143 @@ "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 + } + } + } + + // 澶氬獟浣撴枃浠� + enum class MediaFileType(val value: Int, val des: String){ + Problem(1, "闂"), + TechnicalPrevention(2, "鎶�闃叉帾鏂�"), + + MonitorDevice(3, "鐩戞祴璁惧"), + TreatmentDevice(4, "娌荤悊璁惧"), + + RoutineRecord(5, "甯歌璁板綍"), + Signature(6, "绛惧瓧"), + Nameplate(7, "閾墝"), + + TYPE_1(51, "鎵╁睍绫讳竴"), + TYPE_2(52, "鎵╁睍绫讳簩"), + TYPE_3(53, "鎵╁睍绫讳笁"), + TYPE_4(54, "鎵╁睍绫诲洓"), + TYPE_5(55, "鎵╁睍绫讳簲"), + TYPE_6(56, "鎵╁睍绫诲叚"), + TYPE_7(57, "鎵╁睍绫讳竷"), + TYPE_8(58, "鎵╁睍绫诲叓"), + TYPE_9(59, "鎵╁睍绫讳節"), + TYPE_10(60, "鎵╁睍绫诲崄"); + + companion object { + fun getList(sceneTypeId: Byte?): List<MediaFileType> { + val type = SceneType.getByValue(sceneTypeId?.toString()) + return getList(type) + } + fun getList(sceneType: SceneType) = when (sceneType) { + SceneType.TYPE5 -> listOf(RoutineRecord, TYPE_1, TYPE_2, TYPE_3, TYPE_4, TYPE_5, + TYPE_6, TYPE_7, TYPE_8, TYPE_9, TYPE_10) + else -> listOf(RoutineRecord, MonitorDevice, Nameplate) + } + } + } + + // 璇勫垎鏉$洰绫诲瀷 + enum class EvaScoreMode(val value: String, val des: String){ + BASIC_SCORE("basic_score", "鍩虹鍒�"), + ADDITION_SCORE("addition_score", "闄勫姞鍒�"), + } + + // 寰楀垎妯″紡 + enum class EvaGradeMode(val value: String, val des: String){ + MINUS_MODE("minus_mode", "鍑忓垎妯″紡"), + ADD_MODE("add_mode", "鍔犲垎妯″紡"), + } + + // 璇勪及閫夋嫨妯″紡 + enum class EvaSelectMode(val value: String, val des: String){ + SINGLE_MODE("single_mode", "鍗曢�夋ā寮�"), + MULTI_MODE("multi_mode", "澶氶�夋ā寮�"), + } + + // 鏁版嵁浜у搧绫诲瀷 + enum class DataProductType(val value: Byte, val des: String){ + PRO_DETAIL_SUMMARY(1, "闂涓庢暣鏀硅窡韪眹鎬昏〃"), + PRO_ANALYSIS_SUMMARY(2, "鍒嗚闀囬棶棰樻暣鏀瑰垎鏋愭眹鎬昏〃") } companion object { @@ -117,5 +249,12 @@ const val RESTAURANT_LOCATION_ID = "bMpvxuqHlB1CTYfh" // 姹戒慨闂浣嶇疆 const val Vehicle_LOCATION_ID = "PuToYNqdSLFQSSYk" + + // 浠诲姟绫诲瀷 + const val DOMAIN_GUID_TASK_TYPE = "qASRIAjgSfCuvJOi" + // 浠诲姟鏈熼檺绫诲瀷 + const val DOMAIN_GUID_TASK_DEADLINE_TYPE = "cS9MAkmXN1S37Tbv" + // 浠诲姟灞傛 + const val DOMAIN_GUID_TASK_LEVEL = "TzbIi3ckPWMzlsH6" } } \ No newline at end of file -- Gitblit v1.9.3