|
@@ -10,19 +10,18 @@ import com.persagy.proxy.adm.model.AdmSpace;
|
|
|
import com.persagy.proxy.adm.request.AdmCreateRequest;
|
|
|
import com.persagy.proxy.adm.request.AdmQueryCriteria;
|
|
|
import com.persagy.proxy.adm.request.AdmResponse;
|
|
|
-import com.persagy.proxy.adm.service.IAdmEquipmentService;
|
|
|
-import com.persagy.proxy.adm.service.IAdmFloorService;
|
|
|
-import com.persagy.proxy.adm.service.IAdmISpaceService;
|
|
|
-import com.persagy.proxy.adm.service.IAdmSpaceService;
|
|
|
+import com.persagy.proxy.adm.service.*;
|
|
|
import com.persagy.proxy.adm.utils.AdmContextUtil;
|
|
|
import com.persagy.proxy.adm.utils.ObjectNameUtil;
|
|
|
import com.persagy.proxy.common.entity.DmpResult;
|
|
|
+import com.persagy.proxy.common.entity.RelationDTO;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.PostMapping;
|
|
|
import org.springframework.web.bind.annotation.RequestBody;
|
|
|
import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import org.springframework.web.bind.annotation.RestController;
|
|
|
|
|
|
+import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
|
|
@@ -43,6 +42,8 @@ public class AdmFloorController {
|
|
|
private IAdmISpaceService iAdmISpaceService;
|
|
|
@Autowired
|
|
|
private IAdmSpaceService spaceService;
|
|
|
+ @Autowired
|
|
|
+ private IAdmRelationService relationService;
|
|
|
|
|
|
/**
|
|
|
* 创建
|
|
@@ -88,6 +89,19 @@ public class AdmFloorController {
|
|
|
}
|
|
|
}
|
|
|
List<AdmFloor> admFloors = service.doInsert(AdmContextUtil.toDmpContext(), AdmFloor.class, createRequest.getContent());
|
|
|
+ //更新关系
|
|
|
+ //TODO 楼层:新增楼层,添加floor和building的关系,如果后期关系计算支持,此部分去掉
|
|
|
+ if(CollUtil.isNotEmpty(admFloors)){
|
|
|
+ //建筑id一定存在
|
|
|
+ String buildingId = vos.get(0).getBuildingId();
|
|
|
+ List<RelationDTO> relationDTOS = new ArrayList<>(admFloors.size());
|
|
|
+ admFloors.forEach(admFloor -> {
|
|
|
+ String floorId = admFloor.getId();
|
|
|
+ relationDTOS.add(new RelationDTO(null, "ArchSubset", "Bd2Fl", null, buildingId , floorId));
|
|
|
+ });
|
|
|
+ relationService.doSave(AdmContextUtil.toDmpContext(), relationDTOS);
|
|
|
+ }
|
|
|
+
|
|
|
return AdmResponse.success(admFloors);
|
|
|
}
|
|
|
|