|
@@ -199,7 +199,7 @@ public class AdmEquipmentController {
|
|
|
if(CollUtil.isNotEmpty(relationDTOList)){
|
|
|
relationService.doSave(AdmContextUtil.toDmpContext(), relationDTOList);
|
|
|
}
|
|
|
-
|
|
|
+ //处理设备更新特殊数据
|
|
|
List<AdmEquipment> equipmentList = new ArrayList<>(vos.size());
|
|
|
vos.stream().forEach(equipment -> {
|
|
|
if(CollUtil.isNotEmpty(equipment.getInfos())){
|
|
@@ -208,6 +208,15 @@ public class AdmEquipmentController {
|
|
|
admEquipment.setInfos(equipment.getInfos());
|
|
|
ObjectNode objectNode = JsonNodeUtils.toObjectNode(admEquipment, "infos", null);
|
|
|
AdmEquipment admEquipmentNew = JsonNodeUtils.toEntity(objectNode, AdmEquipment.class, "infos");
|
|
|
+ if(CollUtil.isNotEmpty(equipment.getNullList())){
|
|
|
+ admEquipmentNew.setNullList(equipment.getNullList());
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotEmpty(equipment.getFloorId())){
|
|
|
+ admEquipmentNew.setFloorId(equipment.getFloorId());
|
|
|
+ }
|
|
|
+ if(StrUtil.isNotEmpty(equipment.getBuildingId())){
|
|
|
+ admEquipmentNew.setBuildingId(equipment.getBuildingId());
|
|
|
+ }
|
|
|
equipmentList.add(admEquipmentNew);
|
|
|
}
|
|
|
});
|