|
@@ -113,7 +113,7 @@ public class AdmManualRelCalServiceImpl implements AdmManualRelCalService {
|
|
|
.checkSensorCodes(relationTypeEnum.getCheckSensorCodes())
|
|
|
.sign("1")
|
|
|
.mainContent(request.getMainContent())
|
|
|
- .fromContent(request.getFromContent())
|
|
|
+ .slaveContent(request.getFromContent())
|
|
|
.build();
|
|
|
CommonResult<List<ObjectRelation>> commonResult = digitalRelationCaclClient
|
|
|
.createObjRelationsByKeywordAndObjType(context.getGroupCode(), context.getProjectId(),
|
|
@@ -140,8 +140,6 @@ public class AdmManualRelCalServiceImpl implements AdmManualRelCalService {
|
|
|
// eq2eq_EquipPower_1,eq2eq_EquipPower_2,eq2eq_EquipPower_3,eq2eq_EquipPower_4
|
|
|
// 主对象的class_code必须等于SETDLS,SETDHS,其他的报不符合主对象条件限制错误
|
|
|
// *******
|
|
|
-
|
|
|
-
|
|
|
// 2.3 根据对象信息点和对象内容(主/副)查询对象,然后添加关系及计算标记
|
|
|
// 1.obj_type,project_id,type(设备名称(name),设备ID(id),本地编码(localId),本地名称(localName))查询主对象
|
|
|
// 2.obj_type,project_id,type(设备名称(name),设备ID(id),本地编码(localId),本地名称(localName)),是否排除主对象id,是否主对象的class_code查询从对象
|
|
@@ -337,7 +335,7 @@ public class AdmManualRelCalServiceImpl implements AdmManualRelCalService {
|
|
|
requestData.setSize(Long.valueOf(admManualRelCalRequest.getPageSize()));
|
|
|
}
|
|
|
if (StrUtil.isNotBlank(admManualRelCalRequest.getVagueTo())){
|
|
|
- requestData.setFromContent(CollUtil.newHashSet(admManualRelCalRequest.getVagueTo()));
|
|
|
+ requestData.setSlaveContent(CollUtil.newHashSet(admManualRelCalRequest.getVagueTo()));
|
|
|
}
|
|
|
CommonResult<List<ObjectDigital>> commonResult = digitalObjectClient
|
|
|
.queryObjectListByGraphCodeAndRelCode(context.getGroupCode(), context.getProjectId(),
|