From 2d4cbcc4f92edbc4f926d9710bdda64520039c2b Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Fri, 05 Jan 2018 11:21:44 +0800
Subject: [PATCH] Merge branch 'develop' of http://blit.7drlb.com:8888/r/screen-frontend into develop
---
src/app/routes/devices/version/version.service.ts | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/app/routes/devices/version/version.service.ts b/src/app/routes/devices/version/version.service.ts
index 43988c2..b94059e 100644
--- a/src/app/routes/devices/version/version.service.ts
+++ b/src/app/routes/devices/version/version.service.ts
@@ -1,7 +1,6 @@
-import { DeviceVersion } from './version.service';
import { ExampleService } from './../../../core/services/example.service';
import { _HttpClient } from '@delon/theme';
-import { environment } from './../../../../environments/environment.prod';
+import { environment } from './../../../../environments/environment';
import { RouteConfigLoadStart } from '@angular/router';
import { Injectable } from '@angular/core';
import { equal } from 'assert';
@@ -9,18 +8,12 @@
import { PageBean } from '@core/entity/grid';
-export interface DeviceVersion {
- createTime?: any;
- description?: string;
- id?: number;
- name?: string;
- version?: number;
-}
-
@Injectable()
export class VersionService {
private urls = {
- edit: environment.SERVER_BASH_URL + '/device-version/page-list'
+ edit: environment.SERVER_BASH_URL + '/device-version/page-list',
+ save: environment.SERVER_BASH_URL + '/device-version/add-or-modify',
+ delete: environment.SERVER_BASH_URL + '/device-version/delete-by-ids'
};
constructor(private http: _HttpClient) { }
public getPagingList(page: PageBean, queryText: string): Observable<PageBean> {
@@ -29,7 +22,14 @@
example.or().andLike({name: 'name', value: '%' + queryText + '%'});
example.or().andEqualTo({name: 'version', value: queryText});
}
- const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex, queryParams: example.getSqlParam()};
+ const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex,
+ queryParams: example.getSqlParam(), orderByClause: page.getOrderByClause()};
return this.http.get(this.urls.edit, param);
}
+ public save(data: any): Observable<any> {
+ return this.http.post(this.urls.save, data);
+ }
+ public delete(...ids: number[]): Observable<any> {
+ return this.http.post(this.urls.delete, ids);
+ }
}
--
Gitblit v1.8.0