From d69bb7703fa793bf397e00ccb81f90ab62bb84cc Mon Sep 17 00:00:00 2001 From: zhangab Date: Fri, 26 Oct 2018 11:20:25 +0800 Subject: Edit interface URL Change-Id: Ib952be5d8e7f8f76f6e8f6fb72aa39c176a62fe8 Issue-ID: USECASEUI-160 Signed-off-by: zhangab --- usecaseui-portal/src/app/myhttp.service.ts | 193 +++++++++++++++-------------- 1 file changed, 103 insertions(+), 90 deletions(-) diff --git a/usecaseui-portal/src/app/myhttp.service.ts b/usecaseui-portal/src/app/myhttp.service.ts index 09f13a49..8b872e64 100644 --- a/usecaseui-portal/src/app/myhttp.service.ts +++ b/usecaseui-portal/src/app/myhttp.service.ts @@ -10,74 +10,78 @@ export class MyhttpService { constructor(private http: HttpClient) { } - baseUrl = "./assets/json"; - url={ - allhome:this.baseUrl + "/homeAllData.json", - homeLineData:this.baseUrl + "/homePerformanceChartData.json", - serviceSelectList:this.baseUrl + "/servicesList.json", //customer、serviceType - servicesTableData:this.baseUrl + "/servicesTableData.json", - onboardTableData:this.baseUrl + "/onboardTableData.json", - - customers:this.baseUrl + "/customers.json?", - serviceType:this.baseUrl + "/serviceTypes.json?*_*", - servicesCategory:this.baseUrl + "/configuration_files/servicesCategory.json?", - serviceInstanceList:this.baseUrl + "/instanceTableData4.json?", - serviceTemplates:this.baseUrl + "/serviceTemplates2.json?", - templateCategory:this.baseUrl + "/configuration_files/templateCategory.json?", - templateParameters:this.baseUrl + "/*_*" + "ServiceTemplateParameters.json?", - addressData: this.baseUrl + "/siteAddressData.json?", - createService:this.baseUrl + "/createService.json?", - inputNamesTransform: this.baseUrl + "/configuration_files/inputNamesTranslate.json?", - deleteService: this.baseUrl + "/deleteService.json?", - progress:this.baseUrl + "/progress.json?", - - allottedResource:this.baseUrl + "/allotted-resources2.json?", - pnfDetail:this.baseUrl + "/pnfdetail-domain.json?", - connectivity:this.baseUrl + "/sotn-connectivity2.json?", - vpnBinding:this.baseUrl + "/vpnbinding.json?", - alarmFormData:this.baseUrl + "/alarmFormData.json?" - } - - // baseUrl = 'http://172.19.44.223/api/usecaseui-server/v1'; - // baseUrl = '/api/usecaseui-server/v1'; + // baseUrl = "./assets/json"; // url={ - // allhome:this.baseUrl + "/alarm/getAlarmDataByStatus/0", - // homeLineData:this.baseUrl + "/...........", - // serviceSelectList:this.baseUrl + "/xxxxxxxxxxxxx", - // servicesTableData:this.baseUrl + "/xxxxxxxx.json", - // onboardTableData:this.baseUrl + "/xxxxxxx.json", - - - // customers:this.baseUrl + "/uui-lcm/customers", - // serviceType:this.baseUrl + "/uui-lcm/customers/" + "*_*" + "/service-subscriptions", - // servicesCategory: "./assets/json/configuration_files/servicesCategory.json", - // serviceInstanceList:this.baseUrl + '/uui-sotn/getServiceInstanceList', - // serviceTemplates:this.baseUrl + "/uui-lcm/service-templates", - // templateCategory: "./assets/json/configuration_files/templateCategory.json", - // templateParameters:this.baseUrl + "/uui-lcm/service-templates/" + "*_*" +"?toscaModelPath=", - // addressData: this.baseUrl + "/uui-sotn/getOssInvenory", - // createService:this.baseUrl + "/uui-lcm/services", - // inputNamesTransform: "./assets/json/configuration_files/inputNamesTranslate.json?", - // deleteService: this.baseUrl + "/uui-lcm/services/", - // progress:this.baseUrl + "/uui-lcm/services/" + "*_*" + "/operations/", - - // allottedResource:this.baseUrl + "/uui-sotn/getAllottedResources", - // pnfDetail:this.baseUrl + "/uui-sotn/getPnfInfo/", - // connectivity:this.baseUrl + "/uui-sotn/getConnectivityInfo/", - // vpnBinding:this.baseUrl + "/uui-sotn/getPinterfaceByVpnId/" + // allhome:this.baseUrl + "/homeAllData.json", + // homeLineData:this.baseUrl + "/homePerformanceChartData.json", + // serviceSelectList:this.baseUrl + "/servicesList.json", //customer、serviceType + // servicesTableData:this.baseUrl + "/servicesTableData.json", + // onboardTableData:this.baseUrl + "/onboardTableData.json", + + // customers:this.baseUrl + "/customers.json?", + // serviceType:this.baseUrl + "/serviceTypes.json?*_*", + // servicesCategory:this.baseUrl + "/configuration_files/servicesCategory.json?", + // serviceInstanceList:this.baseUrl + "/instanceTableData4.json?", + // serviceTemplates:this.baseUrl + "/serviceTemplates2.json?", + // templateCategory:this.baseUrl + "/configuration_files/templateCategory.json?", + // templateParameters:this.baseUrl + "/*_*" + "ServiceTemplateParameters.json?", + // addressData: this.baseUrl + "/siteAddressData.json?", + // createService:this.baseUrl + "/createService.json?", + // inputNamesTransform: this.baseUrl + "/configuration_files/inputNamesTranslate.json?", + // deleteService: this.baseUrl + "/deleteService.json?", + // progress:this.baseUrl + "/progress.json?", + + // allottedResource:this.baseUrl + "/allotted-resources2.json?", + // pnfDetail:this.baseUrl + "/pnfdetail-domain.json?", + // connectivity:this.baseUrl + "/sotn-connectivity2.json?", + // vpnBinding:this.baseUrl + "/vpnbinding.json?", + // alarmFormData:this.baseUrl + "/alarmFormData.json?", + // alarmFormDetailData:this.baseUrl + "/alarmFormDetailData.json?" // } - // home页数据 + // baseUrl = 'http://172.19.44.223/api/usecaseui-server/v1'; + baseUrl = '/api/usecaseui-server/v1'; + url={ + allhome:this.baseUrl + "/alarm/getAlarmDataByStatus/0", + homeLineData:this.baseUrl + "/...........", + serviceSelectList:this.baseUrl + "/xxxxxxxxxxxxx", + servicesTableData:this.baseUrl + "/xxxxxxxx.json", + onboardTableData:this.baseUrl + "/xxxxxxx.json", + + + customers:this.baseUrl + "/uui-lcm/customers", + serviceType:this.baseUrl + "/uui-lcm/customers/" + "*_*" + "/service-subscriptions", + servicesCategory: "./assets/json/configuration_files/servicesCategory.json", + serviceInstanceList:this.baseUrl + '/uui-sotn/getServiceInstanceList', + serviceTemplates:this.baseUrl + "/uui-lcm/service-templates", + templateCategory: "./assets/json/configuration_files/templateCategory.json", + templateParameters:this.baseUrl + "/uui-lcm/service-templates/" + "*_*" +"?toscaModelPath=", + addressData: this.baseUrl + "/uui-sotn/getOssInvenory", + createService:this.baseUrl + "/uui-lcm/services", + inputNamesTransform: "./assets/json/configuration_files/inputNamesTranslate.json?", + deleteService: this.baseUrl + "/uui-lcm/services/", + progress:this.baseUrl + "/uui-lcm/services/" + "*_*" + "/operations/", + + allottedResource:this.baseUrl + "/uui-sotn/getAllottedResources", + pnfDetail:this.baseUrl + "/uui-sotn/getPnfInfo/", + connectivity:this.baseUrl + "/uui-sotn/getConnectivityInfo/", + vpnBinding:this.baseUrl + "/uui-sotn/getPinterfaceByVpnId/", + alarmFormData:this.baseUrl + "/alarm/{currentPage}/{pageSize}/{sourceName}/{priority}/{startTime}/{endTime}/{vfStatus}", + alarmFormDetailData:this.baseUrl + "/alarm/getAlarmsHeaderDetail/{id}", + alarmsourcename:'/alarm/getSourceNames/' + } + + // home getAllHomeData() { return this.http.get(this.url.allhome); } - //home页折线图数据 + //home lin getHomePerformanceChartData(paramsObj){ let params = new HttpParams({fromObject:paramsObj}); return this.http.get(this.url.homeLineData,{params}); } - // servicesList数据 + // servicesList data // getServicesSelectData():Observable>{ // return this.http.get(this.url.serviceSelectList,{observe:'response'}); // } @@ -86,7 +90,7 @@ export class MyhttpService { return this.http.get(this.url.servicesTableData,{observe:'response',params}); } - // onboard数据 + // onboard data getOnboardTableData(paramsObj):Observable>{ let params = new HttpParams({fromObject:paramsObj}); return this.http.get(this.url.onboardTableData,{observe:'response',params}); @@ -128,65 +132,65 @@ export class MyhttpService { //--------------------------------------------------------------------------------- - // 获取所有customers + // Get all customers getAllCustomers(){ return this.http.get(this.url.customers); - // return this.http.jsonp('http://127.0.0.1:5500/customers.json',"callback");// 测试用 ：请求数据需要用回调函数包裹 + // return this.http.jsonp('http://127.0.0.1:5500/customers.json',"callback");// } - // 获取相应的serviceType + // Get relevant serviceType getServiceTypes(customer){ let url = this.url.serviceType.replace("*_*",customer.id); return this.http.get(url); } - // 获取服务分类信息，本地配置文件 + // Get service classification information, local configuration file getServicesCategory(){ return this.http.get(this.url.servicesCategory); } - // list表格数据 + // list Tabular data getInstanceTableData(paramsObj){ let params = new HttpParams({fromObject:paramsObj}); return this.http.get(this.url.serviceInstanceList,{params}); } - // // 服务详情数据 + // // Service details data // getInstanceDetails(id){ // let url = this.baseUrl + "/detailsData.json?id=" + id; // return this.http.get(url); // } - // 获取所有模板类型 + // Get all template types getAllServiceTemplates(){ return this.http.get(this.url.serviceTemplates); } - // 获取模板分类信息，本地配置文件 + // Get template classification information, local configuration file getTemplateCategory(){ return this.http.get(this.url.servicesCategory); } - // 获取模板输入项参数 + //Get template input parameters getTemplateParameters(type,template){ let url = this.url.templateParameters.replace("*_*",type) + template.toscaModelURL; //本地模拟 // let url = this.url.templateParameters.replace("*_*",template.uuid) + template.toscaModelURL; return this.http.get(url); } - // siteAddress 地址 + // siteAddress address getSiteAddress(){ return this.http.get(this.url.addressData); } - // 创建接口 + // Create interface createInstance(requestBody){ return this.http.get(this.url.createService); //本地模拟 // return this.http.post(this.url.createService,requestBody); } - // 输入参数名字转换 + // Input parameter name conversion inputNamesTransform(){ return this.http.get(this.url.inputNamesTransform); } - // 删除接口 + // Delete interface deleteInstance(obj){ let httpOptions = { headers: new HttpHeaders({ @@ -199,38 +203,38 @@ export class MyhttpService { 'serviceType': obj.serviceType } }; - return this.http.get(this.url.deleteService); //本地模拟 + return this.http.get(this.url.deleteService); //Local simulation // return this.http.delete(this.url.deleteService + obj.serviceInstanceId, httpOptions); } - // 查询进度接口 + // Query progress interface getProgress(obj){ let url = this.url.progress.replace("*_*",obj.serviceId) + obj.operationId; return this.http.get(url); } - // 获取allotted-resource 能获取tp和pnf值 + // Get allotted-resource to get tp and pnf values getAllottedResource(obj){ let params = new HttpParams({fromObject:obj}); let url = this.url.allottedResource; return this.http.get(url,{params}); } - //通过pnf值获取对应的domain （network-resource） + //Get the corresponding domain (network-resource) by pnf value getPnfDetail(name){ let url = this.url.pnfDetail + name; return this.http.get(url); } - //通过sotn 获取connectivity ，查找vpn-id + //Get connectivity by sotn, find vpn-id getSotnConnectivity(id){ let url = this.url.connectivity + id; return this.http.get(url); } - //通过vpn-id 查找tp和pnf + //Find tp and pnf by vpn-id getVpnBinding(id){ let url = this.url.vpnBinding + id; return this.http.get(url); } - // 时间格式化 毫秒转正常值 + // Time formatting milliseconds to normal dateformater(vmstime){ if(!vmstime){ return '' @@ -247,20 +251,29 @@ export class MyhttpService { return formattime; } - // alarm表格数据 + // Alarm table data + getAlarmFormData(pageNumber:number,pageSaze:number,name?:string,Priority?:string,Status?:string,Report?:string){ + return this.http.post(this.url.alarmFormData,{ + pageNumber:pageNumber, + pageSaze:pageSaze, + name:name, + Priority:Priority, + Status:Status, + Report:Report + }); + } + + getSourceNames(){ + return this.http.get('/alarm/getSourceNames/'); + } // getAlarmFormData(pageNumber:number,pageSaze:number,name?:string,Priority?:string,Status?:string,Report?:string){ - // return this.http.post(this.url.alarmFormData,{ - // pageNumber:pageNumber, - // pageSaze:pageSaze, - // name:name, - // Priority:Priority, - // Status:Status, - // Report:Report - // }); + // return this.http.get(this.url.alarmFormData+'?pageNumber='+pageNumber+'?pageSaze'+pageSaze+'?name'+name+'?Priority'+Priority+'?Status'+Status+'?Report'+Report); // } - - getAlarmFormData(pageNumber:number,pageSaze:number,name?:string,Priority?:string,Status?:string,Report?:string){ - return this.http.get(this.url.alarmFormData+'?pageNumber='+pageNumber+'?pageSaze'+pageSaze+'?name'+name+'?Priority'+Priority+'?Status'+Status+'?Report'+Report); + // Alarm Detail page data + getAlarmDetailData(id){ + let httpurl = this.baseUrl + "/alarmFormDetailData.json?id/" +id; + console.log(httpurl) + return this.http.get(httpurl); } } -- cgit 1.2.3-korg