소스 검색

********************WX***********************
添加调度器

zhangweixin 4 년 전
부모
커밋
e832fced1b

+ 11 - 0
datacenter/src/main/kotlin/com/persagy/server/services/objects/FloorService.kt

@@ -135,6 +135,17 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                         val insert = insert(floor)
                         if (insert){
                             try {
+                                if (!floor.outline.isNullOrEmpty()) {
+                                    val floorOutline = FloorOutline()
+                                    floorOutline.id = floor.id
+                                    floorOutline.outline = floor.outline
+                                    floorOutlineService.replace(floorOutline)
+                                }
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                            }
+
+                            try {
                                 rabbitMqService.sendObjects(Opt.projectId!!, Opt.CREATE,floor.id!!)
                             } catch (e: Exception) {
                                 e.printStackTrace()

+ 12 - 0
datacenter/src/main/kotlin/com/persagy/server/services/objects/ZoneSpaceBaseService.kt

@@ -533,6 +533,18 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
         } catch (e: Exception) {
             e.printStackTrace()
         }
+
+        try {
+            if (!entity.outline.isNullOrEmpty()) {
+                val spaceOutline = SpaceOutline()
+                spaceOutline.id = entity.id
+                spaceOutline.outline = entity.outline
+                spaceOutlineService.replace(spaceOutline)
+            }
+        } catch (e: Exception) {
+            e.printStackTrace()
+        }
+
         return true
     }
 

+ 2 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/ObjectFromToControllers.kt

@@ -421,6 +421,7 @@ class ObjectFromToControllers {
                                     rSpinFl.projectId = projectId
                                     rSpinFl.sign = 1
                                     rSpinFl.spaceId = spaceDataConversion.id
+                                    logger.debug("空間和楼层关系 = ${rSpinFl.toJson()} *************************************************************************************************************")
                                     rSpinFlService.replace(rSpinFl)
                                 }
                             }
@@ -428,7 +429,7 @@ class ObjectFromToControllers {
 
                             val containsKey = spaceSyn.containsKey("outline")
                             if (containsKey){
-                                val id = spaceSyn["id"].toString()
+                                val id = spaceDataConversion.id
 //                                val replace1 = spaceSyn["outline"].toString().replace("X", "x")
 //                                val replace2 = replace1.replace("Y", "y")
 //                                val replace3 = replace2.replace("Z", "z")