Browse Source

******************WX *********************
类型

zhangweixin 4 years ago
parent
commit
18ce8c6b4a

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

@@ -81,7 +81,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
             val floorList = select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildingId", floor.buildingId!!)).exec()
             if (floorList.size>0){
                 for (floor001 in floorList){
-                    if (floor001.floorSequenceId == floor.floorSequenceId){
+                    if (floor001.floorSequenceID == floor.floorSequenceID){
                         return false
                     }
                 }
@@ -121,7 +121,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                         if (floor.name.isNullOrEmpty()){
                             floor.name = ShaftNameUtil.shaftName("楼层-")
                         }
-                        if (floor.floorSequenceId == null) {
+                        if (floor.floorSequenceID == null) {
                             val sCreateResponse = SCreateResponse<Floor>(SResponseType.failure)
                             sCreateResponse.message = "楼层顺序号不可以为空或类型错误"
                             return sCreateResponse
@@ -131,7 +131,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                                 SFilter.eq("buildingId", floor.buildingId!!)).exec()
                             if (floorList.size>0){
                                 for (floor001 in floorList){
-                                    if (floor001.floorSequenceId!=null&&floor001.floorSequenceId == floor.floorSequenceId){
+                                    if (floor001.floorSequenceID!=null&&floor001.floorSequenceID == floor.floorSequenceID){
                                         val sCreateResponse = SCreateResponse<Floor>(SResponseType.failure)
                                         sCreateResponse.message = "楼层顺序号不可以重复"
                                         return sCreateResponse
@@ -214,7 +214,7 @@ object FloorService : Service<Floor>(SMybatisDao(Floor::class.java)) {
                         if (floorList.size>0){
                             for (floor001 in floorList){
                                 try {
-                                    if (floor001.floorSequenceId == floor.floorSequenceId){
+                                    if (floor001.floorSequenceID == floor.floorSequenceID){
                                         val sBaseResponse = SBaseResponse(SResponseType.failure)
                                         sBaseResponse.message = "楼层顺序号不可以重复"
                                         return sBaseResponse

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

@@ -396,7 +396,7 @@ object ZoneSpaceBaseService : ServiceSpace<ZoneSpace>(SMybatisDao(ZoneSpace::cla
             if (buildingList.size>0){
                 for (building in buildingList){
 
-                   val floorList = FloorService.select(SFilter.eq("projectId", projectId),SFilter.eq("buildingId", building.id!!)).order("floorSequenceId desc").exec()
+                   val floorList = FloorService.select(SFilter.eq("projectId", projectId),SFilter.eq("buildingId", building.id!!)).order("floorSequenceID desc").exec()
                     if (floorList.size>0){
                         building .floor = floorList
                     }

+ 13 - 3
datacenter/src/main/kotlin/com/persagy/server/services/rel/REqForSpBaseService.kt

@@ -71,8 +71,12 @@ object REqForSpBaseService: RService<REqForSpBase>(SMybatisDao(REqForSpBase::cla
                     rEq2Sp.type = "eq2sp_for"
                     val isInsert = rEq2SpService.insert(rEq2Sp)
                     if (isInsert){
-                        /** 发送消息 */
-                        rabbitMqService.sendRel(Opt.projectId!!, "EquipforSpace","11",rEqForSp.equipId!!,rEqForSp.spaceId!!)
+                        try {
+                            /** 发送消息 */
+                            rabbitMqService.sendRel(Opt.projectId!!, "EquipforSpace","11",rEqForSp.equipId!!,rEqForSp.spaceId!!)
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
                     }else{
 
                     }
@@ -143,12 +147,18 @@ object REqForSpBaseService: RService<REqForSpBase>(SMybatisDao(REqForSpBase::cla
                 val replace = rEq2SpService.replace(rEq2Sp)
                 if (replace){
                     successList.add(equipId)
+                    try {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "EquipforSpace","11",rEq2Sp.id1!!,rEq2Sp.id2!!)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
                 }else{
                     failureList.add(rEq2Sp)
                 }
             }
             if (successList.size>0){
-                rabbitMqService.sendRel(Opt.projectId!!, "EquipforSpace","14",rEqForSpBaseList.spaceId!!,successList.toJson()!!)
+//                rabbitMqService.sendRel(Opt.projectId!!, "EquipforSpace","14",rEqForSpBaseList.spaceId!!,successList.toJson()!!)
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSpForEqBaseList>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()

+ 104 - 94
datacenter/src/main/kotlin/com/persagy/server/services/rel/REqInSpBaseService.kt

@@ -84,8 +84,12 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
 
                         /** 发送消息 */
 //                        messageHandler.sendMessage(jsonObject.toString())
-                        /** 发送消息 */
-                        rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","11",rEqInSpBase.equipId!!,rEqInSpBase.spaceId!!)
+                        try {
+                            /** 发送消息 */
+                            rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","11",rEqInSpBase.equipId!!,rEqInSpBase.spaceId!!)
+                        } catch (e: Exception) {
+                            e.printStackTrace()
+                        }
                     }
                 } catch (e: Exception) {
                     e.printStackTrace()
@@ -130,103 +134,103 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
      *
      * @param    rEqInSpBaseList    设备和业务空间关系的对象列表
      */
-    fun createEq(rEqInSpBaseList: REqInSpBaseList): SCreateResponse<REqInSpBase> {
-        return try {
-            /** 成功集合 */
-            val successList = ArrayList<Any>()
-            /** 失败集合 */
-            val failureList = ArrayList<Any>()
-            REq2SpService.delete("id1 = '${rEqInSpBaseList.equipId}'")
-            for (spaceId in rEqInSpBaseList.spaceIdList!!){
-                val rEqInSpBase = REqInSpBase()
-                rEqInSpBase.equipId = rEqInSpBaseList.equipId
-                rEqInSpBase.spaceId = spaceId
-                rEqInSpBase.projectId = Opt.projectId
-                val replace = replace(rEqInSpBase)
-                if (replace){
-                    successList.add(spaceId)
-                }else{
-                    failureList.add(rEqInSpBase)
-                }
-            }
-            if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "13")
-                jsonObject.put("projectId", Opt.projectId)
-                jsonObject.put("id", rEqInSpBaseList.equipId)
-                jsonObject.put("obj_type", "EquipinSpace")
-                jsonObject.put("linkId",successList.toJson())
-
-                /** 发送消息 */
-//                RService.messageHandler.sendMessage(jsonObject.toString())
-                /** 发送消息 */
-                rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","13",rEqInSpBaseList.equipId!!,successList.toJson()!!)
-                val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
-                if (failureList.size>0){
-                    sCreateResponse.message ="失败对象:"+failureList.toJson()
-                }
-                sCreateResponse
-            }else{
-                SCreateResponse(SResponseType.failure)
-            }
-        } catch (e: Exception) {
-            e.printStackTrace()
-            SCreateResponse(SResponseType.failure,e.message.toString())
-        }
-    } // Function createEq()
+//    fun createEq(rEqInSpBaseList: REqInSpBaseList): SCreateResponse<REqInSpBase> {
+//        return try {
+//            /** 成功集合 */
+//            val successList = ArrayList<Any>()
+//            /** 失败集合 */
+//            val failureList = ArrayList<Any>()
+//            REq2SpService.delete("id1 = '${rEqInSpBaseList.equipId}'")
+//            for (spaceId in rEqInSpBaseList.spaceIdList!!){
+//                val rEqInSpBase = REqInSpBase()
+//                rEqInSpBase.equipId = rEqInSpBaseList.equipId
+//                rEqInSpBase.spaceId = spaceId
+//                rEqInSpBase.projectId = Opt.projectId
+//                val replace = replace(rEqInSpBase)
+//                if (replace){
+//                    successList.add(spaceId)
+//                }else{
+//                    failureList.add(rEqInSpBase)
+//                }
+//            }
+//            if (successList.size>0){
+//                val jsonObject = JSONObject()
+//                jsonObject.put("type", "13")
+//                jsonObject.put("projectId", Opt.projectId)
+//                jsonObject.put("id", rEqInSpBaseList.equipId)
+//                jsonObject.put("obj_type", "EquipinSpace")
+//                jsonObject.put("linkId",successList.toJson())
+//
+//                /** 发送消息 */
+////                RService.messageHandler.sendMessage(jsonObject.toString())
+//                /** 发送消息 */
+//                rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","13",rEqInSpBaseList.equipId!!,successList.toJson()!!)
+//                val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
+//                if (failureList.size>0){
+//                    sCreateResponse.message ="失败对象:"+failureList.toJson()
+//                }
+//                sCreateResponse
+//            }else{
+//                SCreateResponse(SResponseType.failure)
+//            }
+//        } catch (e: Exception) {
+//            e.printStackTrace()
+//            SCreateResponse(SResponseType.failure,e.message.toString())
+//        }
+//    } // Function createEq()
 
     /**
      * 创建所在业务空间的设备关系
      *
      * @param    rEqInSpBaseList    设备和业务空间关系的对象列表
      */
-    fun createsSp(rEqInSpBaseList: RSpInEqBaseList): SCreateResponse<REqInSpBase> {
-        return try {
-            /** 成功集合 */
-            val successList = ArrayList<Any>()
-            /** 失败集合 */
-            val failureList = ArrayList<Any>()
-            REq2SpService.delete("id2 = '${rEqInSpBaseList.spaceId}'")
-            for (equipId in rEqInSpBaseList.equipIdList!!){
-                val rEqInSpBase = REqInSpBase()
-                rEqInSpBase.spaceId = rEqInSpBaseList.spaceId
-                rEqInSpBase.equipId = equipId
-                rEqInSpBase.projectId = Opt.projectId
-                val replace = replace(rEqInSpBase)
-                if (replace){
-                    successList.add(equipId)
-                }else{
-                    failureList.add(rEqInSpBase)
-                }
-            }
-            if (successList.size>0){
-                val jsonObject = JSONObject()
-                jsonObject.put("type", "13")
-                jsonObject.put("projectId", Opt.projectId)
-                jsonObject.put("id", rEqInSpBaseList.spaceId)
-                jsonObject.put("obj_type", "EquipinSpace")
-                jsonObject.put("linkId",successList.toJson())
-
-                /** 发送消息 */
-//                RService.messageHandler.sendMessage(jsonObject.toString())
-                /** 发送消息 */
-                rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","13",rEqInSpBaseList.spaceId!!,successList.toJson()!!)
-                if (failureList.size>0){
-                    val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
-                    sCreateResponse.message ="失败对象:"+failureList.toJson()
-                    sCreateResponse
-                }else{
-                    val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
-                    sCreateResponse
-                }
-            }else{
-                SCreateResponse(SResponseType.failure)
-            }
-        } catch (e:Exception){
-            e.printStackTrace()
-            SCreateResponse(SResponseType.failure,e.message.toString())
-        }
-    } // Function createsSp()
+//    fun createsSp(rEqInSpBaseList: RSpInEqBaseList): SCreateResponse<REqInSpBase> {
+//        return try {
+//            /** 成功集合 */
+//            val successList = ArrayList<Any>()
+//            /** 失败集合 */
+//            val failureList = ArrayList<Any>()
+//            REq2SpService.delete("id2 = '${rEqInSpBaseList.spaceId}'")
+//            for (equipId in rEqInSpBaseList.equipIdList!!){
+//                val rEqInSpBase = REqInSpBase()
+//                rEqInSpBase.spaceId = rEqInSpBaseList.spaceId
+//                rEqInSpBase.equipId = equipId
+//                rEqInSpBase.projectId = Opt.projectId
+//                val replace = replace(rEqInSpBase)
+//                if (replace){
+//                    successList.add(equipId)
+//                }else{
+//                    failureList.add(rEqInSpBase)
+//                }
+//            }
+//            if (successList.size>0){
+//                val jsonObject = JSONObject()
+//                jsonObject.put("type", "13")
+//                jsonObject.put("projectId", Opt.projectId)
+//                jsonObject.put("id", rEqInSpBaseList.spaceId)
+//                jsonObject.put("obj_type", "EquipinSpace")
+//                jsonObject.put("linkId",successList.toJson())
+//
+//                /** 发送消息 */
+////                RService.messageHandler.sendMessage(jsonObject.toString())
+//                /** 发送消息 */
+//                rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","13",rEqInSpBaseList.spaceId!!,successList.toJson()!!)
+//                if (failureList.size>0){
+//                    val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
+//                    sCreateResponse.message ="失败对象:"+failureList.toJson()
+//                    sCreateResponse
+//                }else{
+//                    val sCreateResponse = SCreateResponse<REqInSpBase>(SResponseType.success)
+//                    sCreateResponse
+//                }
+//            }else{
+//                SCreateResponse(SResponseType.failure)
+//            }
+//        } catch (e:Exception){
+//            e.printStackTrace()
+//            SCreateResponse(SResponseType.failure,e.message.toString())
+//        }
+//    } // Function createsSp()
 
     /**
      * 创建所在业务空间的设备关系
@@ -255,6 +259,12 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
                         val replace = rEq2SpService.replace(rEq2Sp)
                         if (replace){
                             successList.add(rEq2Sp.id1!!)
+                            try {
+                                /** 发送消息 */
+                                rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","11",rEq2Sp.id1!!,rEq2Sp.id2!!)
+                            } catch (e: Exception) {
+                                e.printStackTrace()
+                            }
                         }else{
                             failureList.add(rEq2Sp)
                         }
@@ -269,7 +279,7 @@ object REqInSpBaseService: RService<REqInSpBase>(SMybatisDao(REqInSpBase::class.
                         jsonObject.put("linkId",successList.toJson())
                         /** 发送消息 */
 //                        messageHandler.sendMessage(jsonObject.toString())
-                        rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","14",rEqInSpBaseList.spaceId!!,successList.toJson()!!)
+//                        rabbitMqService.sendRel(Opt.projectId!!, "EquipinSpace","14",rEqInSpBaseList.spaceId!!,successList.toJson()!!)
                         if (failureList.size>0){
                             val sCreateResponse = SCreateResponse<RSpInEqBaseList>(SResponseType.success)
                             sCreateResponse.message ="失败对象:"+failureList.toJson()

+ 1 - 1
datacenter/src/main/resources/application-prod.yml

@@ -36,7 +36,7 @@ spring:
 #    url:                                jdbc:postgresql://data-center:5432/datacenter
 #    username:                           postgres
 #    password:                           123qwe!@#
-    url:                                jdbc:postgresql://172.17.100.16:5432/datacenter
+    url:                                jdbc:postgresql://172.17.23.64:5432/datacenter
 #    url:                                jdbc:postgresql://172.17.11.228:5432/datacenterlabsl
 #    url:                                jdbc:postgresql://192.168.64.14:5432/datacenterlabsl
     username:                           postgres

+ 8 - 5
datasyn/src/main/kotlin/com/persagy/server/syn/controllers/obj/RelToFromController.kt

@@ -320,7 +320,7 @@ class RelToFromController {
      */
     @Operation(summary= "设备和空间关系-同步到中台", description = "设备所在的空间(图类型 MechInArch 边类型 Eq2Sp ),设备服务的空间(图类型 MechForArch 边类型 Eq2Sp), ")
     @PostMapping("/eq2sp")
-    fun eq2Sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam isDel: Boolean = false): SBaseResponse {
+    fun eq2Sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam zoneType: String?,@RequestParam isDel: Boolean = false): SBaseResponse {
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
 
@@ -331,10 +331,13 @@ class RelToFromController {
                 typer = "eq2sp_in"
             }
 
-            val rEq2SpList = rEq2SpService.select(
-                    SFilter.eq("projectId", projectId),
-                SFilter.eq("type", typer)
-            ).exec()
+            val listType = ArrayList<SFilter>()
+            listType.add(SFilter.eq("projectId", projectId))
+            listType.add(SFilter.eq("type", typer))
+            if (!zoneType.isNullOrEmpty()) {
+                listType.add(SFilter.eq("zoneType", zoneType))
+            }
+            val rEq2SpList = rEq2SpService.select(listType).exec()
             if (rEq2SpList.size>0) {
                 for (rEq2Sp in rEq2SpList) {
                     if (isDel) {

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTask.kt

@@ -53,7 +53,7 @@ class SchedulerTask {
     //cron表达式:每隔5秒执行一次
 //    @Scheduled(cron = "0 */5 * * * ?")
 //    @Scheduled(cron="0/30 * *  * * ? ")   //每5秒执行一次
-//    @Scheduled(cron = "0 */1 * * * ?")
+    @Scheduled(cron = "0 */1 * * * ?")
     fun scheduled() {
         logger.info("同步数据中心任务开始至中台")
         messageProcessing.syncDataCenter()

+ 1 - 1
datasyn/src/main/kotlin/com/persagy/server/syn/task/SchedulerTaskRel.kt

@@ -53,7 +53,7 @@ class SchedulerTaskRel {
     //cron表达式:每隔5秒执行一次
 //    @Scheduled(cron = "0 */5 * * * ?")
 //    @Scheduled(cron="0/5 * *  * * ? ")   //每5秒执行一次
-//    @Scheduled(cron = "0 */3 * * * ?")
+    @Scheduled(cron = "0 */3 * * * ?")
     fun scheduled() {
         logger.info("同步数据中心任务开始至数据中台-关系数据")
         messageProcessing.syncDataCenterRel()

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/labsl/CustomSqlLabslService.kt

@@ -258,7 +258,7 @@ class CustomSqlLabslService {
             for (building in buildingList) {
                 /** 查询楼层 */
                 val floorList =
-                    floorService.select(SFilter.eq("projectId", projectId), SFilter.eq("buildingId", building.id!!)).order("floorSequenceId desc").exec()
+                    floorService.select(SFilter.eq("projectId", projectId), SFilter.eq("buildingId", building.id!!)).order("floorSequenceID desc").exec()
                 /** 建筑下楼层为空赋值 */
                 if (building.floor.isNullOrEmpty()){
                     building.floor = ArrayList<Floor>()

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/objects/ShaftService.kt

@@ -154,7 +154,7 @@ object ShaftService : Service<Shaft>(SMybatisDao(Shaft::class.java)) {
 //           }
 
             /** 获取建筑下的楼层 */
-            val floorList = FloorService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("buildingId", buildingId)).order("floorSequenceId desc").exec()
+            val floorList = FloorService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("buildingId", buildingId)).order("floorSequenceID desc").exec()
             /** 项目下的竖井关联的空间  对应空间类型*/
             val rShContainSpBaseList = rShContainSpBaseService.select(SFilter.eq("projectId",projectId!!),SFilter.eq("id1", shaftId),SFilter.eq("zoneType", objectType), SFilter.eq("type","sh2sp")).exec()
             if (rShContainSpBaseList.isNotEmpty()&&rShContainSpBaseList.size>0){

+ 1 - 1
equip-component/src/main/kotlin/com/persagy/server/service/objects/TenantService.kt

@@ -67,7 +67,7 @@ object TenantService : Service<Tenant>(SMybatisDao(Tenant::class.java)) {
                 val tenantBuildingFloorList = customSqlService.tenantBuildingFloor(projectId, objectType, tenantId)
 
                 for (building in buildingList){
-                    val floorList = serviceFloor.select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildId", building.id!!)).order("sequenceId desc").exec()
+                    val floorList = serviceFloor.select(SFilter.eq("projectId", projectId!!), SFilter.eq("buildingId", building.id!!)).order("sequenceId desc").exec()
 
                     if (tenantBuildingFloorList.size>0){
                         for (floor in floorList){