|
@@ -185,39 +185,6 @@ public class AdmEquipmentController {
|
|
|
if(CollUtil.isEmpty(vos)) {
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|
|
|
- for(AdmEquipment vo:vos) {
|
|
|
- if(StrUtil.isNotBlank(vo.getFlowBuild())) {
|
|
|
- // 处理建筑-楼层信息点
|
|
|
- List<String> flows = StrUtil.splitTrim(vo.getFlowBuild(), "-");
|
|
|
- for(String flow:flows) {
|
|
|
- if(StrUtil.startWith(flow, "Bd")) {
|
|
|
- vo.setBuildingId(flow);
|
|
|
- } else if(StrUtil.startWith(flow, "fl")) {
|
|
|
- vo.setFloorId(flow);
|
|
|
- }
|
|
|
- }
|
|
|
- vo.setFlowBuild(null);
|
|
|
- }
|
|
|
- // 设置remove信息
|
|
|
- Set<String> nullList = CollUtil.newHashSet();
|
|
|
- CollUtil.addAll(nullList, vo.getNullList());
|
|
|
- if(StrUtil.isBlank(vo.getFloorId())) {
|
|
|
- nullList.add("floorId");
|
|
|
- }
|
|
|
- if(StrUtil.isBlank(vo.getBuildingId())) {
|
|
|
- nullList.add("buildingId");
|
|
|
- }
|
|
|
- vo.setNullList(CollUtil.newArrayList(nullList));
|
|
|
- //特殊处理位置信息
|
|
|
- Map<String,Object> infos = vo.getInfos();
|
|
|
- if(infos == null) {
|
|
|
- infos = new HashMap<String, Object>();
|
|
|
- vo.setInfos(infos);
|
|
|
- }
|
|
|
- if(StrUtil.isNotEmpty(vo.getBimLocation())){
|
|
|
- infos.put("bimLocation", vo.getBimLocation());
|
|
|
- }
|
|
|
- }
|
|
|
vos = service.doUpdate(AdmContextUtil.toDmpContext(), AdmEquipment.class, vos);
|
|
|
return AdmResponse.success(vos);
|
|
|
}
|