|
@@ -313,16 +313,16 @@ open class ManualRelationCalcService {
|
|
|
val relPropertyList = relPropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
|
|
|
if (relPropertyList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relPropertyList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -330,16 +330,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -381,16 +381,16 @@ open class ManualRelationCalcService {
|
|
|
val relPropertyList = relPropertyService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
|
|
|
if (relPropertyList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relPropertyList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -398,16 +398,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = relShaftService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -448,16 +448,16 @@ open class ManualRelationCalcService {
|
|
|
val relPropertyList = relEquipmentShaftService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
|
|
|
if (relPropertyList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relPropertyList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -465,16 +465,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = relShaftService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -520,16 +520,16 @@ open class ManualRelationCalcService {
|
|
|
val relPropertyList = relEquipmentShaftService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
|
|
|
if (relPropertyList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relPropertyList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -537,16 +537,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = FloorService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -591,16 +591,16 @@ open class ManualRelationCalcService {
|
|
|
val relPropertyList = EquipmentService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
|
|
|
if (relPropertyList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relPropertyList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -608,16 +608,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = BuildingService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -657,16 +657,16 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val generalSystemList = GeneralSystemService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
if (generalSystemList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (generalSystemList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -674,16 +674,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -725,32 +725,32 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val generalSystemList = GeneralSystemService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
if (generalSystemList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (generalSystemList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = relShaftService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -793,16 +793,16 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val generalSystemList = GeneralSystemService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
if (generalSystemList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (generalSystemList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -810,16 +810,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = FloorService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -863,16 +863,16 @@ open class ManualRelationCalcService {
|
|
|
|
|
|
val generalSystemList = GeneralSystemService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
if (generalSystemList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (generalSystemList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -880,16 +880,16 @@ open class ManualRelationCalcService {
|
|
|
for (fromContent in relationAddRequest.fromContent!!){
|
|
|
val relZoneSpaceList = BuildingService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -947,16 +947,16 @@ open class ManualRelationCalcService {
|
|
|
*/
|
|
|
val relZoneSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", projectId!!), SFilter.eq(relationAddRequest.type!!, relationAddRequest.mainContent!!)).exec()
|
|
|
if (relZoneSpaceList.size<1){
|
|
|
- /** 主对象编码不存在 */
|
|
|
+ /** 主对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码不存在"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":不存在"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneSpaceList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -967,16 +967,16 @@ open class ManualRelationCalcService {
|
|
|
val relZoneToSpaceList = relZoneSpaceService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!),
|
|
|
SFilter.not(SFilter.eq("id",relZoneSpace.id!!)),SFilter.eq("objectType",relZoneSpace.objectType!!)).exec()
|
|
|
if (relZoneToSpaceList.size == 0){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (relZoneToSpaceList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1195,16 +1195,16 @@ open class ManualRelationCalcService {
|
|
|
/** 强电类 */
|
|
|
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
|
|
|
}
|
|
|
if (equipmentList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1214,16 +1214,16 @@ open class ManualRelationCalcService {
|
|
|
val equipmentToList = EquipmentService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!),
|
|
|
SFilter.not(SFilter.eq("id",equipment.id!!))).exec()
|
|
|
if (equipmentToList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (equipmentToList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1353,16 +1353,16 @@ open class ManualRelationCalcService {
|
|
|
/** 暖通空调类 */
|
|
|
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
|
|
|
}
|
|
|
if (equipmentList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1372,16 +1372,16 @@ open class ManualRelationCalcService {
|
|
|
val equipmentToList = EquipmentService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!),
|
|
|
SFilter.not(SFilter.eq("id",equipment.id!!))).exec()
|
|
|
if (equipmentToList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (equipmentToList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1658,16 +1658,16 @@ open class ManualRelationCalcService {
|
|
|
/** 给排水类 和 消防类 */
|
|
|
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
|
|
|
}
|
|
|
if (equipmentList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1678,16 +1678,16 @@ open class ManualRelationCalcService {
|
|
|
val equipmentToList = EquipmentService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!),
|
|
|
SFilter.not(SFilter.eq("id",equipment.id!!))).exec()
|
|
|
if (equipmentToList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (equipmentToList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1892,16 +1892,16 @@ open class ManualRelationCalcService {
|
|
|
/** 给排水类 和 消防类 */
|
|
|
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
|
|
|
}
|
|
|
if (equipmentList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -1912,16 +1912,16 @@ open class ManualRelationCalcService {
|
|
|
val equipmentToList = EquipmentService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!),
|
|
|
SFilter.not(SFilter.eq("id",equipment.id!!))).exec()
|
|
|
if (equipmentToList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (equipmentToList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -2011,16 +2011,16 @@ open class ManualRelationCalcService {
|
|
|
/** 给排水类 和 消防类 */
|
|
|
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
|
|
|
}
|
|
|
if (equipmentList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -2030,16 +2030,16 @@ open class ManualRelationCalcService {
|
|
|
/** 去除主对象空间id */
|
|
|
val equipmentToList = GeneralSystemService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (equipmentToList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (equipmentToList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -2103,16 +2103,16 @@ open class ManualRelationCalcService {
|
|
|
/** 给排水类 和 消防类 */
|
|
|
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
|
|
|
}
|
|
|
if (equipmentList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -2123,16 +2123,16 @@ open class ManualRelationCalcService {
|
|
|
/** 去除主对象空间id */
|
|
|
val equipmentToList = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (equipmentToList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (equipmentToList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -2171,16 +2171,16 @@ open class ManualRelationCalcService {
|
|
|
/** 给排水类 和 消防类 */
|
|
|
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
|
|
|
}
|
|
|
if (equipmentList.size>1){
|
|
|
/** 主对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = relationAddRequest.mainContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = relationAddRequest.mainContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "1"
|
|
|
return sCreateResponse
|
|
|
}
|
|
@@ -2191,16 +2191,16 @@ open class ManualRelationCalcService {
|
|
|
/** 去除主对象空间id */
|
|
|
val equipmentToList = ZoneSpaceBaseService.select(SFilter.eq("projectId", projectId), SFilter.eq(relationAddRequest.type!!, fromContent!!)).exec()
|
|
|
if (equipmentToList.size<1){
|
|
|
- /** 从对象编码不存在 */
|
|
|
+ /** 从对象不存在 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码不存在"
|
|
|
+ sCreateResponse.message = fromContent+":不存在"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|
|
|
if (equipmentToList.size>1){
|
|
|
/** 从对象编码识别到多个实例 */
|
|
|
sCreateResponse.result = SResponseType.failure
|
|
|
- sCreateResponse.message = fromContent+":编码存在多个实例"
|
|
|
+ sCreateResponse.message = fromContent+":存在多个实例"
|
|
|
sCreateResponse.errorType = "2"
|
|
|
return sCreateResponse
|
|
|
}
|