|
@@ -53,7 +53,7 @@ public class AdmRelCalController {
|
|
|
HttpServletRequest request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(getAdmRelationTypeEnum(request)),objectTypeStr,relationTypeStr);
|
|
|
+ admRelCalService.calcRelation(context,CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
|
|
@@ -82,7 +82,7 @@ public class AdmRelCalController {
|
|
|
HttpServletRequest request) throws Exception {
|
|
|
// 组装上下文条件
|
|
|
InstanceUrlParam context = new InstanceUrlParam(groupCode, null, projectId, AdmCommonConstant.APP_ID);
|
|
|
- admRelCalService.calcRelation(context, CollUtil.newArrayList(getAdmRelationTypeEnum(request)),objectTypeStr,relationTypeStr);
|
|
|
+ admRelCalService.calcRelation(context, CollUtil.newArrayList(getAdmRelationTypeEnum(request)),null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
|
|
@@ -184,7 +184,7 @@ public class AdmRelCalController {
|
|
|
InstanceUrlParam context = new InstanceUrlParam(StrUtil.isNotBlank(groupCode)?groupCode:this.groupCode,
|
|
|
null, projectId, StrUtil.isNotBlank(appId)?appId:AdmCommonConstant.APP_ID,
|
|
|
StrUtil.isNotBlank(userId)?userId:AdmCommonConstant.USER_ID);
|
|
|
- admRelCalService.calcRelation(context,CollUtil.newArrayList(AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP),null,null);
|
|
|
+ admRelCalService.calcRelation(context,CollUtil.newArrayList(AdmRelationTypeEnum.EQ2SP_SENSORRELATIONSHIP_SS2SP),"AirConditioningZone");
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|
|
@@ -282,7 +282,7 @@ public class AdmRelCalController {
|
|
|
}
|
|
|
ArrayList<AdmRelationTypeEnum> admRelationTypeEnums =
|
|
|
CollUtil.newArrayList(relationTypeMap.get("eq2bd"), relationTypeMap.get("sy2bd"));
|
|
|
- admRelCalService.calcRelation(context,admRelationTypeEnums,objectTypeStr,relationTypeStr);
|
|
|
+ admRelCalService.calcRelation(context,admRelationTypeEnums,null);
|
|
|
return AdmResponse.success(new ArrayList<>());
|
|
|
}
|
|
|
/***
|