|
@@ -161,7 +161,7 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
return rwdClient.queryRelation(context, dmpRequest);
|
|
return rwdClient.queryRelation(context, dmpRequest);
|
|
}
|
|
}
|
|
|
|
|
|
- private DmpResult<JSONArray> queryObject(InstanceUrlParam context, Map<String, AdmEquipment> peMap){
|
|
|
|
|
|
+ private DmpResult<JSONArray> queryObjectById(InstanceUrlParam context, Map<String, AdmEquipment> peMap){
|
|
QueryCriteria criteriaObject = new QueryCriteria();
|
|
QueryCriteria criteriaObject = new QueryCriteria();
|
|
ObjectNode criteriaPe = JsonNodeFactory.instance.objectNode();
|
|
ObjectNode criteriaPe = JsonNodeFactory.instance.objectNode();
|
|
ArrayNode array = criteriaPe.putObject("id").putArray("$in");
|
|
ArrayNode array = criteriaPe.putObject("id").putArray("$in");
|
|
@@ -258,7 +258,7 @@ public class AdmEquipmentServiceImpl extends AbstractAdmBaseServiceImpl<AdmEquip
|
|
boolean isDealDataSucc = false;
|
|
boolean isDealDataSucc = false;
|
|
Map<String, AdmEquipment> peMap = CollUtil.fieldValueMap(voList, "propertyId");
|
|
Map<String, AdmEquipment> peMap = CollUtil.fieldValueMap(voList, "propertyId");
|
|
//查询资产
|
|
//查询资产
|
|
- DmpResult<JSONArray> resultPe = queryObject(context, peMap);
|
|
|
|
|
|
+ DmpResult<JSONArray> resultPe = queryObjectById(context, peMap);
|
|
if (CollUtil.isNotEmpty(resultPe.getData())) {
|
|
if (CollUtil.isNotEmpty(resultPe.getData())) {
|
|
//更新资产 创建资产设备关系
|
|
//更新资产 创建资产设备关系
|
|
List<AdmProperty> propertyList = AdmEntityTransferUtil.toAdmMultiEntity(resultPe.getData(), null, AdmProperty.class);
|
|
List<AdmProperty> propertyList = AdmEntityTransferUtil.toAdmMultiEntity(resultPe.getData(), null, AdmProperty.class);
|