Browse Source

**********************************wx*************************
修复查询 设备常规电源

weixinVSjinlai 4 years ago
parent
commit
090e758f45

+ 1 - 1
data-core/src/main/kotlin/com/persagy/server/datacenter/models/entities/graphtype/rel/electricity/RelEquipmentRoutinePower.kt

@@ -43,7 +43,7 @@ open class RelEquipmentRoutinePower : EquipmentBase() {
 
     /** 级联-设备 */
     @Schema(description = "级联-设备")
-    @SCascade(table="r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_1'")
+    @SCascade(table="relationship.r_eq2eq", idColumn="id1", childIdColumn="id2",self = false,filter = "type = 'eq2eq_EquipPower_1'")
     var objectInfo: ArrayList<RelEquipmentFloor>? = null
 
 }

+ 16 - 1
datacenter/src/main/kotlin/com/persagy/server/services/relation_calc/ManualRelationAddService.kt

@@ -1023,12 +1023,13 @@ class ManualRelationAddService {
         }else if (relationAddRequest.relType == "eq2eq_LUDistribution_1"||relationAddRequest.relType == "eq2eq_LUDistribution_2"||relationAddRequest.relType == "eq2eq_HUDistribution_1"
             ||relationAddRequest.relType == "eq2eq_HUDistribution_2"||relationAddRequest.relType == "eq2eq_EquipPower_1"||relationAddRequest.relType == "eq2eq_EquipPower_2"
             ||relationAddRequest.relType == "eq2eq_EquipPower_3"||relationAddRequest.relType == "eq2eq_EquipPower_4"){
+
             /** 强电类 */
             val equipmentList = EquipmentService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
             if (equipmentList.size<1){
                 /** 主对象不存在 */
                 sCreateResponse.result = SResponseType.failure
-                sCreateResponse.message = relationAddRequest.mainContent+":不存在"
+                sCreateResponse.message = relationAddRequest.mainContent+":不存在或不符合主对象条件限制"
                 sCreateResponse.errorType = "1"
                 return sCreateResponse
             }
@@ -1039,6 +1040,20 @@ class ManualRelationAddService {
                 sCreateResponse.errorType = "1"
                 return sCreateResponse
             }
+            if (relationAddRequest.relType =="eq2eq_EquipPower_1") {
+                if (equipmentList[0].classCode!! == "SETDLS"||equipmentList[0].classCode!! == "SETDHS") {
+                    /** 符合条件不做操作 */
+                }else {
+                    /** 不符合主对象条件限制 */
+                    sCreateResponse.result = SResponseType.failure
+                    sCreateResponse.message = relationAddRequest.mainContent+":不符合主对象条件限制"
+                    sCreateResponse.errorType = "1"
+                    return sCreateResponse
+                }
+            }
+
+
+
             val equipment = equipmentList[0]
             for (fromContent in relationAddRequest.fromContent!!){
                 /** 去除主对象空间id */