|
@@ -193,40 +193,6 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /**
|
|
|
- * 设备按照楼层id建筑id查询
|
|
|
- * @param dmpRequest : 中台查询参数
|
|
|
- */
|
|
|
- @Override
|
|
|
- public void processDmpCriteria(QueryCriteria dmpRequest) {
|
|
|
- ObjectNode criteria = dmpRequest.getCriteria();
|
|
|
- if (null==criteria){
|
|
|
- return;
|
|
|
- }
|
|
|
- if (criteria.has("floorId") && criteria.has("buildingId")){
|
|
|
- // 有建筑id过滤
|
|
|
- ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
|
|
|
- ObjectNode relationFrom = objectMapper.createObjectNode();
|
|
|
- relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
|
|
|
- relationFrom.put("relCode", RelCodeEnum.Eq2Fl.name());
|
|
|
- relationFrom.set("objTo",criteria.get("floorId"));
|
|
|
- criteria.set("relationFrom",relationFrom);
|
|
|
- criteria.remove("floorId");
|
|
|
- criteria.remove("buildingId");
|
|
|
- return;
|
|
|
- }
|
|
|
- if (criteria.has("buildingId")){
|
|
|
- // 有建筑id过滤
|
|
|
- ObjectMapper objectMapper = SpringHelper.getBean(ObjectMapper.class);
|
|
|
- ObjectNode relationFrom = objectMapper.createObjectNode();
|
|
|
- relationFrom.put("graphCode", GraphCodeEnum.MechInArch.name());
|
|
|
- relationFrom.put("relCode", RelCodeEnum.Eq2Bd.name());
|
|
|
- relationFrom.set("objTo",criteria.get("buildingId"));
|
|
|
- criteria.set("relationFrom",relationFrom);
|
|
|
- criteria.remove("buildingId");
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
private DmpResult<List<ObjRelationDTO>> queryRelation(InstanceUrlParam context, Map<String, AdmEquipment> voMap){
|
|
|
QueryCriteria dmpRequest = new QueryCriteria();
|
|
|
ObjectNode criteria = JsonNodeFactory.instance.objectNode();
|