summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app/myhttp.service.ts
diff options
context:
space:
mode:
authorTao Shen <shentao@chinamobile.com>2018-11-01 14:51:48 +0000
committerGerrit Code Review <gerrit@onap.org>2018-11-01 14:51:48 +0000
commitc43c31199e9024ae428b1f64d5df834eb04d7e7a (patch)
treee2d43fb47ffd386871c2f38827c01a1f24ebcb9a /usecaseui-portal/src/app/myhttp.service.ts
parentcb6ef4d57c41ef49b746554969fb7e123c402f82 (diff)
parente64eb88fdb13c6e679d1c88305bf190c4c3c2500 (diff)
Merge "Fix VNF Performance Query Bugs"
Diffstat (limited to 'usecaseui-portal/src/app/myhttp.service.ts')
-rw-r--r--usecaseui-portal/src/app/myhttp.service.ts52
1 files changed, 37 insertions, 15 deletions
diff --git a/usecaseui-portal/src/app/myhttp.service.ts b/usecaseui-portal/src/app/myhttp.service.ts
index 00e6bc42..1c36d881 100644
--- a/usecaseui-portal/src/app/myhttp.service.ts
+++ b/usecaseui-portal/src/app/myhttp.service.ts
@@ -40,7 +40,8 @@ export class MyhttpService {
// connectivity:this.baseUrl + "/sotn-connectivity2.json?",
// vpnBinding:this.baseUrl + "/vpnbinding.json?",
// alarmFormData:this.baseUrl + "/alarmFormData.json?",
- // alarmFormDetailData:this.baseUrl + "/alarmFormDetailData.json?"
+ // alarmFormDetailData:this.baseUrl + "/alarmFormDetailData.json?",
+ // sourceName:this.baseUrl+ "/SorceName.json?"
// }
// baseUrl = 'http://172.19.44.223/api/usecaseui-server/v1';
@@ -256,27 +257,48 @@ export class MyhttpService {
}
// Alarm table data
- getAlarmFormData(pageNumber:number,pageSaze:number,name?:string,Priority?:string,Status?:string,Report?:string){
- return this.http.post<any>(this.url.alarmFormData,{
- pageNumber:pageNumber,
- pageSaze:pageSaze,
- name:name,
- Priority:Priority,
- Status:Status,
- Report:Report
- });
- }
+ // getAlarmFormData(currentPage:number,pageSize:number,sourceName?:string,priority?:string,startTime?:string,endTime?:string,vfStatus?:string){
+ // return this.http.post<any>(this.url.alarmFormData,{
+ // currentPage:currentPage,
+ // pageSize:pageSize,
+ // sourceName:sourceName,
+ // priority:priority,
+ // startTime:startTime,
+ // endTime:endTime ,
+ // vfStatus:vfStatus
+ // });
+ // }
getSourceNames(){
- return this.http.get<any>('/alarm/getSourceNames/');
+ return this.http.get<any>('http://192.168.43.12:8082/alarm/getSourceNames/');
}
- // getAlarmFormData(pageNumber:number,pageSaze:number,name?:string,Priority?:string,Status?:string,Report?:string){
- // return this.http.get<any>(this.url.alarmFormData+'?pageNumber='+pageNumber+'?pageSaze'+pageSaze+'?name'+name+'?Priority'+Priority+'?Status'+Status+'?Report'+Report);
+
+ getstatuscount(){
+ let httpurl = 'http://192.168.43.12:8082/alarm/statusCount';
+ return this.http.get<any>(httpurl);
+ }
+ // getSourceNames(){
+ // let httpurl = this.baseUrl + "/SourceName.json?";
+ // console.log(httpurl);
+ // return this.http.get<any>(httpurl);
+ // }
+
+ // getAlarmFormData(currentPage:number,pageSize:number,sourceName?:string,priority?:string,startTime?:string,endTime?:string,vfStatus?:string){
+ // return this.http.get<any>(this.url.alarmFormData+'?currentPage='+currentPage+'?pageSize='+pageSize+'?sourceName='+sourceName+'?priority='+priority+'?startTime='+startTime+'?endTime='+endTime+'?vfStatus='+vfStatus);
// }
+ getAlarmFormData(currentPage:number,pageSize:number,sourceName?:string,priority?:string,startTime?:string,endTime?:string,vfStatus?:string){
+ return this.http.get<any>('http://192.168.43.12:8082/alarm/'+'/'+currentPage+'/'+pageSize+'/'+sourceName+'/'+priority+'/'+startTime+'/'+endTime+'/'+vfStatus);
+ }
+
// Alarm Detail page data
+ // getAlarmDetailData(id){
+ // let httpurl = this.baseUrl + "/alarmFormDetailData.json?id/" +id;
+ // console.log(httpurl)
+ // return this.http.get<any>(httpurl);
+ // }
getAlarmDetailData(id){
- let httpurl = this.baseUrl + "/alarmFormDetailData.json?id/" +id;
+ let httpurl = 'http://192.168.43.12:8082/alarm/getAlarmsHeaderDetail/'+id;
console.log(httpurl)
return this.http.get<any>(httpurl);
}