소스 검색

**********************************wx*************************
适配设备类型

weixinVSjinlai 4 년 전
부모
커밋
8c98b9634f
1개의 변경된 파일25개의 추가작업 그리고 0개의 파일을 삭제
  1. 25 0
      datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt

+ 25 - 0
datacenter/src/main/kotlin/com/persagy/server/services/objects/EquipmentService.kt

@@ -82,6 +82,18 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
         if (equip.classCode.isNullOrEmpty()) {
             return false
         }
+        if(equip.classCode!!.length>6){
+            val entity = defClassService.select(
+                    SFilter.eq("projectId", equip.projectId!!),
+                    SFilter.endWith("code", equip.classCode!!)
+            ).entity()
+            if (entity!=null){
+                equip.classCode = entity.code
+            } else {
+                return false
+            }
+        }
+
         /** 设备名字 */
         if (equip.name.isNullOrEmpty()) {
             val entity = defClassService.select(
@@ -129,6 +141,19 @@ object EquipmentService : Service<Equipment>(SMybatisDao(Equipment::class.java))
      */
     override fun onUpdateBefore(entity: Equipment): Boolean {
         try {
+
+            if(entity.classCode!!.length>6){
+                val defClass = defClassService.select(
+                        SFilter.eq("projectId", entity.projectId!!),
+                        SFilter.endWith("code", entity.classCode!!)
+                ).entity()
+                if (defClass!=null){
+                    entity.classCode = defClass.code
+                } else {
+                    return false
+                }
+            }
+
             if (entity.propertyId.isNullOrEmpty()) {
 
 //                val property = PropertyService.select(SFilter.eq("equipmentId", entity.id!!)).entity()