From 8570af7c6051c3d9a516f39d597ff49e1e1e2840 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Thu, 25 Jan 2018 09:31:37 +0800
Subject: [PATCH] 设备模块 坐标 校准值 配置 等功能

---
 src/app/business/services/http/monitor-point.service.ts |   20 ++++++++++++++------
 1 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/app/business/services/http/monitor-point.service.ts b/src/app/business/services/http/monitor-point.service.ts
index 2dc0c02..90a65d2 100644
--- a/src/app/business/services/http/monitor-point.service.ts
+++ b/src/app/business/services/http/monitor-point.service.ts
@@ -1,4 +1,4 @@
-import { PageBean } from '@business/entity/grid';
+import { PageBean, ResultBean } from '@business/entity/grid';
 import { ExampleService } from '@business/services/util/example.service';
 import { _HttpClient } from '@delon/theme';
 import { environment } from 'environments/environment';
@@ -6,14 +6,16 @@
 import { Injectable } from '@angular/core';
 import { equal } from 'assert';
 import { Observable } from 'rxjs/Observable';
+import { MonitorPoint } from '@business/entity/data';
 
 @Injectable()
 export class MonitorPointService {
 
   private urls = {
-    edit: environment.SERVER_BASH_URL + '/monitor-point/page-list',
+    list: environment.SERVER_BASH_URL + '/monitor-point/page-list',
     save: environment.SERVER_BASH_URL + '/monitor-point/add-or-modify',
-    delete: environment.SERVER_BASH_URL + '/monitor-point/delete-by-ids'
+    delete: environment.SERVER_BASH_URL + '/monitor-point/delete-by-ids',
+    getOne:environment.SERVER_BASH_URL + '/monitor-point/get-by-id'
 };
 constructor(private http: _HttpClient) { }
  public getPagingList(page: PageBean, queryText: string): Observable<PageBean> {
@@ -21,9 +23,13 @@
   if (queryText != null && queryText !== '') {
     example.or().andLike({name: 'name', value: '%' + queryText + '%'});
   }
+  let orderByClause = '';
+  if ( page.getOrderByClause != null && page.getOrderByClause instanceof Function) {
+    orderByClause = page.getOrderByClause();
+  }
   const param: PageBean = {pageSize: page.pageSize, pageIndex: page.pageIndex, 
-      queryParams: example.getSqlParam(), orderByClause: page.getOrderByClause()};
-      return this.http.get(this.urls.edit, param);
+      queryParams: example.getSqlParam(), orderByClause: orderByClause};
+      return this.http.get(this.urls.list, param);
 }
 public save(data: any): Observable<any> {
       return this.http.post(this.urls.save, data);
@@ -31,5 +37,7 @@
 public delete(...ids: number[]): Observable<any> {             
       return this.http.post(this.urls.delete, ids);
 }
-
+public getEntity(id:number):Observable<ResultBean<MonitorPoint>>{
+      return this.http.get(this.urls.getOne,{id:id});
+}
 }

--
Gitblit v1.8.0