Browse Source

********************WX******************
关系查询搜索

zhangweixin 4 years ago
parent
commit
b53005c002

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

@@ -420,11 +420,13 @@ object GeneralSystemService : Service<GeneralSystem>(SMybatisDao(GeneralSystem::
         }else if(!floorId.isNullOrEmpty()&&floorId.equals("1")&&!buildingId.isNullOrEmpty()&&!buildingId.equals("1")){
             /** 楼层id为空,建筑id不为空且不为1 ---> 系统和建筑关系表 取系统id */
             /** 未明确楼层的 */
-            val syinFloorList = syinFlService.select(SFilter.eq("projectId",projectId)).distinct().projection("sysId").exec()
+            val syinFloorList = syinFlService.select(SFilter.eq("projectId",projectId)).exec()
             val idSet = HashSet<String>()
             if (syinFloorList.size>0) {
                 for (syinFloor in syinFloorList) {
-                    idSet.add(syinFloor.floorId!!)
+                    if (!syinFloor.floorId.isNullOrEmpty()) {
+                        idSet.add(syinFloor.floorId!!)
+                    }
                 }
             }
            val listSFilter = ArrayList<SFilter>()

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

@@ -70,8 +70,12 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 rSy2Sp.projectId = projectId
                 val isInsert = rSy2SpService.insert(rSy2Sp)
                 if (isInsert){
-                    /** 发送消息 */
-                    rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","11",rSyInSpBase.sysId!!,rSyInSpBase.spaceId!!)
+                    try {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","11",rSyInSpBase.sysId!!,rSyInSpBase.spaceId!!)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
                 }
             }
             try {
@@ -265,13 +269,19 @@ object RSyInSpBaseService: RService<RSyInSpBase>(SMybatisDao(RSyInSpBase::class.
                 val replace = rSy2SpService.replace(rSy2Sp)
                 if (replace){
                     successList.add(sysId)
+                    try {
+                        /** 发送消息 */
+                        rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","11",rSy2Sp.id1!!,rSy2Sp.id2!!)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
                 }else{
                     failureList.add(rSy2Sp)
                 }
             }
             if (successList.size>0){
                 /** 发送消息 */
-                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","14",rSyInSpBase.spaceId!!,successList.toJson())
+//                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Sp","14",rSyInSpBase.spaceId!!,successList.toJson())
                 if (failureList.size>0){
                     val sCreateResponse = SCreateResponse<RSpInSyBaseList>(SResponseType.success)
                     sCreateResponse.message ="失败对象:"+failureList.toJson()

+ 7 - 3
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/RelationCalcService.kt

@@ -868,8 +868,12 @@ open class RelationCalcService {
             val result = mapper.calcSy2Fl(projectId)
             logger.debug("计算= ${result}")
             if (result != null && result == 0) {
-                /** 发送消息 */
-                rabbitMqService.sendRel(Opt.projectId!!, "Sy2Fl_in", "20", "123", "456")
+                try {
+                    /** 发送消息 */
+                    rabbitMqService.sendRel(Opt.projectId!!, "Sy2Fl_in", "20", "123", "456")
+                } catch (e: Exception) {
+                    e.printStackTrace()
+                }
                 upDate(projectId, "sy2fl")
                 upDate(projectId, "eq2fl")
                 return SBaseResponse(SResponseType.success)
@@ -880,7 +884,7 @@ open class RelationCalcService {
 //            }
             upDate(projectId, "sy2fl")
             upDate(projectId, "eq2fl")
-            return SBaseResponse(SResponseType.failure)
+            return SBaseResponse(SResponseType.success)
         } catch (e: Exception) {
             e.printStackTrace()
             return SBaseResponse(SResponseType.failure, e.message!!)

+ 6 - 6
datasyn/src/main/kotlin/com/persagy/server/syn/Opts.kt

@@ -50,13 +50,13 @@ open class Opts {
     /** 物理世界地址 */
     lateinit var dataPlatform: String
 
-//    lateinit var data_org: String
-//    lateinit var data_rwd: String
-//    lateinit var data_dic: String
+    lateinit var data_org: String
+    lateinit var data_rwd: String
+    lateinit var data_dic: String
 
-     var data_org: String = "http://172.16.46.33:8831"
-     var data_rwd: String = "http://172.16.46.33:8832"
-     var data_dic: String = "http://172.16.46.33:8830"
+//     var data_org: String = "http://172.16.46.33:8831"
+//     var data_rwd: String = "http://172.16.46.33:8832"
+//     var data_dic: String = "http://172.16.46.33:8830"
 
 
     val SUCCESS_CODE = "success"

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

@@ -766,15 +766,22 @@ class RelToFromController {
     fun sy2sp(@RequestParam projectId: String,@RequestParam graphCode: String,@RequestParam type: String,@RequestParam isDel: Boolean = false): SBaseResponse{
         try {
             val dictProject = dictProjectService.select(SFilter.eq("id", projectId)).entity()
+
+            var types = ""
+            if (graphCode == "MechInArch") {
+                types = "sy2sp"
+            } else {
+                types = "sy2spfor"
+            }
             if (graphCode == "MechInArch") {
                 val rSy2SpList = rSy2SpService.select(SFilter.eq("projectId", projectId),
-                        SFilter.eq("graphCode", graphCode),
-                        SFilter.eq("type", type)).exec()
+//                        SFilter.eq("graphCode", graphCode),
+                        SFilter.eq("type", types)).exec()
                 if (rSy2SpList.size>0) {
 
                     for (rSy2Sp in rSy2SpList) {
                         if (isDel) {
-                            val toJsonObj = Configure.toJsonObj(graphCode, type, rSy2Sp.id1!!, null)
+                            val toJsonObj = Configure.toJsonObj(graphCode, type, rSy2Sp.id1!!, rSy2Sp.id2)
                             EquipApi.delRel(dictProject!!.groupCode!!, projectId,toJsonObj)
                         }
                         val toJsonObjArray =