From 4e661aed67314d5fd1b5ead6e4495577dbacc564 Mon Sep 17 00:00:00 2001 From: liuxianghui <519646741@qq.com> Date: Sat, 30 Oct 2021 13:33:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E6=8E=A5api?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/babylon/controller/serve-manager.ts | 18 +++++++++--------- src/app/pages/plan/plan.component.ts | 3 ++- .../babylon/building-basic-infos.service.ts | 19 +++++++++++++++---- 3 files changed, 26 insertions(+), 14 deletions(-) diff --git a/src/app/babylon/controller/serve-manager.ts b/src/app/babylon/controller/serve-manager.ts index 882f507..e86c6a5 100644 --- a/src/app/babylon/controller/serve-manager.ts +++ b/src/app/babylon/controller/serve-manager.ts @@ -33,9 +33,9 @@ export class ServeManager { ) => void, onError?: (key: string, error: any) => void) { this.buildingBISrv.getBuildingBasicInfos(key) .subscribe(data => { - + console.log("获取结果" + key, (data as any).result); if (onSuccess) { - onSuccess(key, data); + onSuccess(key, JSON.parse((data as any).result)); } }, error => { console.error("From serve" + key + "===" + error); @@ -49,14 +49,14 @@ export class ServeManager { saveInstitutionData(institutionData: any, key: string = 'test', onSuccess?: (key: string, result: string ) => void, onError?: (key: string, error: string) => void) { - let data = classToPlain(institutionData); + let l_data = classToPlain(institutionData); - console.log("保存单位", data); - this.buildingBISrv.postBuildingBasicInfos(key, data) + console.log("保存单位", l_data); + this.buildingBISrv.postBuildingBasicInfos(key, l_data) .subscribe(data => { - ModeManager.log("保存单位成功：" + key); + console.log("保存单位成功：" + key, l_data); if (onSuccess) { - onSuccess(key, data); + onSuccess(key, data.result); } if (key != "InsList") { //ThreeDimensionalHomeComponent.instance.openSnackBar("保存单位成功"); @@ -96,7 +96,7 @@ export class ServeManager { .subscribe(data => { ModeManager.log(data); if (onSuccess) { - onSuccess(institutionID, data); + onSuccess(institutionID, JSON.parse((data as any).result)); } }, (error) => { if (error instanceof HttpErrorResponse) { @@ -133,7 +133,7 @@ export class ServeManager { .subscribe(data => { ModeManager.log("保存标绘信息成功：" + allMarkPlanData.institutionID); if (onSuccess) { - onSuccess(allMarkPlanData.institutionID, data); + onSuccess(allMarkPlanData.institutionID, data.result); } // ThreeDimensionalHomeComponent.instance.openSnackBar("保存标绘信息成功"); // alert("保存标绘信息成功"); diff --git a/src/app/pages/plan/plan.component.ts b/src/app/pages/plan/plan.component.ts index 83cea65..310ac5d 100644 --- a/src/app/pages/plan/plan.component.ts +++ b/src/app/pages/plan/plan.component.ts @@ -13,7 +13,7 @@ import { ObjectsService } from 'src/app/service/objects.service'; @Component({ selector: 'app-plan', templateUrl: './plan.component.html', - styleUrls: ['./plan.component.scss','./publicPop.scss'] + styleUrls: ['./plan.component.scss', './publicPop.scss'] }) export class PlanComponent implements OnInit { @@ -36,6 +36,7 @@ export class PlanComponent implements OnInit { loginStatus.getInstitutionListFromServe((result: InsitutionDataSimple[], data: any) => { if (ModeManager.institutionDemoKey == ModeManager.c_demoKey_null) { //无指定测试单位，则为正式启动，根据当前单位key寻找 let key = 'ceshi'; + console.log("获取数据", data); let find = data.find(item => { return item.key === key }) if (find) { //如果在data中找到了对应的单位key，则表示已经有三维数据，直接进入 console.log("找到已有单位" + key); diff --git a/src/app/service/babylon/building-basic-infos.service.ts b/src/app/service/babylon/building-basic-infos.service.ts index 799c9bb..269451f 100644 --- a/src/app/service/babylon/building-basic-infos.service.ts +++ b/src/app/service/babylon/building-basic-infos.service.ts @@ -7,6 +7,10 @@ import { catchError, retry } from 'rxjs/operators'; providedIn: 'root' }) export class BuildingBasicInfosService { + + readonly c_get = "/Get"; + readonly c_post = "/PostOrPut"; + //获取单位信息的api baseUrl = 'api/Services/3D/BuildingBasicInfo'; @@ -24,7 +28,7 @@ export class BuildingBasicInfosService { * 获取三维信息 */ getBuildingBasicInfos(name: string): Observable { - return this.http.get(this.baseUrl + '?name=' + name); + return this.http.get(this.baseUrl + this.c_get + '?name=' + name); } /** * 保存三维信息 @@ -32,7 +36,7 @@ export class BuildingBasicInfosService { * @param data */ postBuildingBasicInfos(name: string, data: any): Observable { - return this.http.post(this.baseUrl + '?name=' + name, data) + return this.http.post(this.baseUrl + this.c_post + '?name=' + name, data) .pipe( catchError((err) => this.handleError(err)) ); @@ -45,7 +49,7 @@ export class BuildingBasicInfosService { getMarkData(name: string): Observable { // name = "bb"; let id = { "name": name }; - return this.http.get(this.markUrl, { params: id }).pipe( //'?name=' + return this.http.get(this.markUrl + this.c_get, { params: id }).pipe( //'?name=' catchError((err) => this.handleError(err)) ); } @@ -56,7 +60,7 @@ export class BuildingBasicInfosService { * @param data */ postMarkData(name: string, data: any): Observable { - return this.http.post(this.markUrl + '?name=' + name, data) + return this.http.post(this.markUrl + this.c_post + '?name=' + name, data) .pipe( catchError((err) => this.handleError(err)) ); @@ -85,3 +89,10 @@ export class BuildingBasicInfosService { error); } } + +/** + * 服务器返回的结果 + */ +class HttpResult { + +} \ No newline at end of file