[完善]毗邻存在相同方向时保存失败

src/app/ui/collection-tools/collection-tools.component.ts

@@ -398,6 +398,9 @@ export class CollectionToolsComponent implements OnInit {
   //复制素材
   copyAsset(){
     this.canvas.copy()
+    // console.log(1,this.canvasData.originalcompanyBuildingData)
+    // console.log(2,this.canvasData.originaleveryStoreyData)
+    // console.log(3,this.selectingSitePlan.id)
   }
   //粘贴素材
   pasteAsset(){
@@ -448,53 +451,80 @@ export class CollectionToolsComponent implements OnInit {
     let CompanyData = JSON.parse(JSON.stringify(this.canvasData.originalcompanyBuildingData));
     CompanyData.data = JSON.stringify(CompanyData.data)
 
-    if(this.checkedBuildingIndex==-1){
+    let object = this.canvasData.originalcompanyBuildingData.data
-      this.http.post("/api/CompanyAccount/SitePlanData",SitePlanData).subscribe(data => {
+    let adjoinArr = [] //毗邻数组
-        let config = new MatSnackBarConfig();
+
-        config.verticalPosition = 'top';
+    for (const key in object) {
-        config.duration = 3000
+      if (object[key].FloorId == this.selectingSitePlan.id && object[key].Name == "毗邻") {//如果是相同楼层，则筛选出毗邻
-        this.snackBar.open('平面图数据保存成功','确定',config);
+        
-      },err=>{
+        object[key].PropertyInfos.forEach(element => {
-        let config = new MatSnackBarConfig();
+          if(element.PropertyName == "方向"){
-        config.verticalPosition = 'top';
+            adjoinArr.push(element.PropertyValue)
-        config.duration = 3000
+          }
-        this.snackBar.open('平面图数据保存失败','确定',config);
+        });
-      })
+      }
-      this.http.post("/api/CompanyAccount/CompanyData",CompanyData).subscribe(data => {
+    }
-        let config = new MatSnackBarConfig();
+    
-        config.verticalPosition = 'top';
+    if((new Set(adjoinArr)).size != adjoinArr.length){
-        config.duration = 3000
+      let config = new MatSnackBarConfig();
-        this.snackBar.open('单位数据保存成功','确定',config);
+      config.verticalPosition = 'top';
-      },err=>{
+      config.duration = 3000
-        let config = new MatSnackBarConfig();
+      this.snackBar.open('保存失败，毗邻存在相同方向','确定',config);
-        config.verticalPosition = 'top';
+      return false
-        config.duration = 3000
-        this.snackBar.open('单位数据保存失败','确定',config);
-      })
     }else{
-      this.http.post("/api/CompanyAccount/BuildingAreaData",SitePlanData).subscribe(data => {
+      if(this.checkedBuildingIndex==-1){
-        let config = new MatSnackBarConfig();
+        this.http.post("/api/CompanyAccount/SitePlanData",SitePlanData).subscribe(data => {
-        config.verticalPosition = 'top';
+          let config = new MatSnackBarConfig();
-        config.duration = 3000
+          config.verticalPosition = 'top';
-        this.snackBar.open('平面图数据保存成功','确定',config);
+          config.duration = 3000
-      },err=>{
+          this.snackBar.open('保存成功','确定',config);
-        let config = new MatSnackBarConfig();
+        },err=>{
-        config.verticalPosition = 'top';
+          let config = new MatSnackBarConfig();
-        config.duration = 3000
+          config.verticalPosition = 'top';
-        this.snackBar.open('平面图数据保存失败','确定',config);
+          config.duration = 3000
-      })
+          this.snackBar.open('平面图数据保存失败','确定',config);
-      this.http.post("/api/CompanyAccount/BuildingData",CompanyData).subscribe(data => {
+        })
-        let config = new MatSnackBarConfig();
+
-        config.verticalPosition = 'top';
+        this.http.post("/api/CompanyAccount/CompanyData",CompanyData).subscribe(data => {
-        config.duration = 3000
+          let config = new MatSnackBarConfig();
-        this.snackBar.open('单位数据保存成功','确定',config);
+          config.verticalPosition = 'top';
-      },err=>{
+          config.duration = 3000
-        let config = new MatSnackBarConfig();
+          this.snackBar.open('保存成功','确定',config);
-        config.verticalPosition = 'top';
+        },err=>{
-        config.duration = 3000
+          let config = new MatSnackBarConfig();
-        this.snackBar.open('单位数据保存失败','确定',config);
+          config.verticalPosition = 'top';
-      })
+          config.duration = 3000
+          this.snackBar.open('单位数据保存失败','确定',config);
+        })
+      }else{
+        this.http.post("/api/CompanyAccount/BuildingAreaData",SitePlanData).subscribe(data => {
+          let config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open('保存成功','确定',config);
+        },err=>{
+          let config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open('平面图数据保存失败','确定',config);
+        })
+
+        this.http.post("/api/CompanyAccount/BuildingData",CompanyData).subscribe(data => {
+          let config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open('保存成功','确定',config);
+        },err=>{
+          let config = new MatSnackBarConfig();
+          config.verticalPosition = 'top';
+          config.duration = 3000
+          this.snackBar.open('单位数据保存失败','确定',config);
+        })
+      }
     }
+
+
+    
     
   }
 
@@ -626,7 +656,6 @@ export class CollectionToolsComponent implements OnInit {
       if (!element.parentId) { treeData.push(element) }
     });
     this.dataSource.data = treeData
-    // console.log(this.dataSource.data)
     this.treeControl.expandAll()
   }