获取建筑内设备， 对接修改保存信息的api

src/app/babylon/controller/serve-manager.ts

@@ -1,5 +1,6 @@
 import { HttpErrorResponse } from "@angular/common/http";
 import { classToPlain } from "class-transformer";
+import { PlanComponent } from "src/app/pages/plan/plan.component";
 import { BuildingBasicInfosService } from "src/app/service/babylon/building-basic-infos.service";
 import { ObjectsService } from "src/app/service/objects.service";
 import { InsitutionDataSimple } from "../model/data/institution/institution-data-simple";
@@ -134,7 +135,7 @@ export class ServeManager {
                     if (onSuccess) {
                         onSuccess(allMarkPlanData.institutionID, data.result);
                     }
-                    // ThreeDimensionalHomeComponent.instance.openSnackBar("保存标绘信息成功");
+                    //PlanComponent.instance.openSnackBar("保存标绘信息成功");
                     // alert("保存标绘信息成功");
 
                     //暂时没有失败的回调 onError

src/app/babylon/view/facility-window/facility-window.ts

@@ -316,7 +316,7 @@ export class FacilityWindow extends UIBase {
     createNewFacilityByMesh(mesh: AbstractMesh, type: FacilityType) {
         let facilityData = this.createFacilityDataFromMesh(mesh, type);
         //let facilityInfo = this.createFacilityInfoFromMesh(facilityData, mesh, buildingInfo);
-
+        console.log("获取到干粉灭火器", mesh);
         this.createNewFacility(facilityData, mesh);
     }
 
@@ -330,7 +330,7 @@ export class FacilityWindow extends UIBase {
         let currentBuidngItem = StatusManager.getStatus<BuildingStatus>(BuildingStatus)
             .buildingWindow.currentBuidngItem;
         if (currentBuidngItem == null) {
-            // alert("请先选中目标建筑");
+            alert("请先选中目标建筑");
             // ThreeDimensionalHomeComponent.instance.openSnackBar("请先选中目标建筑");
             return
         }
@@ -412,8 +412,16 @@ export class FacilityWindow extends UIBase {
         }
 
 
-        let defaultMesh = MeshBuilder.CreateBox(facilityData.key, { size: 1 });
-        defaultMesh.isVisible = false;
+        let defaultMesh: AbstractMesh = null;
+
+        if (mesh == null) {
+            defaultMesh = MeshBuilder.CreateBox(facilityData.key, { size: 1 });
+            defaultMesh.isVisible = false;
+        }
+        else {
+            defaultMesh = mesh;
+        }
+
         let facilityInfo = InfoManager.newModelInfo_facility(
             facilityData.key,
             facilityData,
@@ -433,7 +441,7 @@ export class FacilityWindow extends UIBase {
 
         facilityInfo.belongToBuilding = buildingInfo;
 
-        if (facilityInfo.facilityShowType == FacilityShowType.ModelAndTag) {
+        if (facilityInfo.facilityShowType == FacilityShowType.ModelAndTag && mesh == null) {
 
             this.getFacilityPrefabSync(facilityData.resName).then((mesh) => {
                 let prefab = mesh;
@@ -480,7 +488,7 @@ export class FacilityWindow extends UIBase {
     }
 
     //设置设备transform信息
-    setFacilityTransform(isLocalPos: boolean, isNew: boolean, facilityData: ModelData_facility, buildingInfo: BuildingInfo, newFacility: Mesh, facilityInfo?: ModelInfo_facility) {
+    setFacilityTransform(isLocalPos: boolean, isNew: boolean, facilityData: ModelData_facility, buildingInfo: BuildingInfo, newFacility: AbstractMesh, facilityInfo?: ModelInfo_facility) {
         //如果是局部坐标，要先设置父节点
         if (isLocalPos) {
             buildingInfo.ModelInfo.setFacilityParent(facilityInfo);

src/app/service/babylon/building-basic-infos.service.ts

@@ -38,9 +38,9 @@ export class BuildingBasicInfosService {
   postBuildingBasicInfos(name: string, data: any): Observable<any> {
     let params = {
       name: name,
-      content: JSON.stringify(data),
+      // content: JSON.stringify(data),
     }
-    return this.http.post<any>(this.baseUrl + this.c_post, {}, { params })
+    return this.http.post<any>(this.baseUrl + this.c_post, JSON.stringify(data), { params })
       .pipe(
         catchError((err) => this.handleError(err))
       );
@@ -66,9 +66,9 @@ export class BuildingBasicInfosService {
   postMarkData(name: string, data: any): Observable<any> {
     let params = {
       name: name,
-      content: JSON.stringify(data),
+      //content: JSON.stringify(data),
     }
-    return this.http.post<any>(this.markUrl + this.c_post, {}, { params })
+    return this.http.post<any>(this.markUrl + this.c_post, JSON.stringify(data), { params })
       .pipe(
         catchError((err) => this.handleError(err))
       );