From 9c9b8250b973eea72f6970e1ceb46facca9f0a99 Mon Sep 17 00:00:00 2001
From: 沈斌 <bluelazysb@hotmail.com>
Date: Tue, 13 Mar 2018 15:18:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop' into develop
---
src/app/business/services/http/device.service.ts | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/src/app/business/services/http/device.service.ts b/src/app/business/services/http/device.service.ts
index 9771877..9ad5d43 100644
--- a/src/app/business/services/http/device.service.ts
+++ b/src/app/business/services/http/device.service.ts
@@ -1,7 +1,7 @@
import { _HttpClient } from '@delon/theme';
import { environment } from 'environments/environment';
import { Injectable } from '@angular/core';
-import { ResultBean } from '@business/entity/grid';
+import { ResultBean, PageBean } from '@business/entity/grid';
import { Observable } from 'rxjs/Observable';
import { ExampleService } from '@business/services/util/example.service';
import { Device } from '@business/entity/data';
@@ -13,10 +13,10 @@
save: environment.SERVER_BASH_URL + 'device/add-or-modify',
delete: environment.SERVER_BASH_URL + 'device/delete-by-ids'
};
- public getListUrl (){
+ public getListUrl () {
return this.urls.list;
}
- public getSqlParams(queryText:string){
+ public getSqlParams(queryText: string) {
const example = new ExampleService();
if (queryText != null && queryText !== '') {
example.or().andLike({name: 'name', value: '%' + queryText + '%'});
@@ -28,7 +28,21 @@
delete(...ids: number[]): Observable< ResultBean<any> > {
return this.http.post(this.urls.delete, ids);
}
- public save(data:Device): Observable<any> {
+ public save(data: Device): Observable<any> {
return this.http.post(this.urls.save, data);
}
+ public getPageByExample(page: PageBean, example: ExampleService): Observable<PageBean> {
+ let orderByClause = '';
+ const _queryParams = !!example ? example.getSqlParam() : '';
+ if (!!page) {
+ if ( page.getOrderByClause != null && page.getOrderByClause instanceof Function) {
+ orderByClause = page.getOrderByClause();
+ }
+ } else {
+ page = {pageIndex: 0, pageSize: 20};
+ }
+ const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex,
+ queryParams: _queryParams, orderByClause: orderByClause};
+ return this.http.get(this.urls.list, param);
+ }
}
--
Gitblit v1.8.0