From b076f355b7b438b45e430cbd1c441ef5ff34b6fe Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Mon, 28 May 2018 17:14:19 +0800 Subject: [PATCH] 登录过期相应 --- src/app/business/services/http/device.service.ts | 28 +++++++++++++++++++++++----- 1 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/app/business/services/http/device.service.ts b/src/app/business/services/http/device.service.ts index 9771877..9fc6c5e 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'; @@ -11,12 +11,13 @@ private urls = { list: environment.SERVER_BASH_URL + 'device/page-list', save: environment.SERVER_BASH_URL + 'device/add-or-modify', - delete: environment.SERVER_BASH_URL + 'device/delete-by-ids' + delete: environment.SERVER_BASH_URL + 'device/delete-by-ids', + count: environment.SERVER_BASH_URL +'device/count-by-example' }; - 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 +29,24 @@ 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 countByExample(example: ExampleService): Observable<ResultBean<number>> { + return this.http.get(this.urls.count, { queryParams: example.getSqlParam()}); + }; + 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