【SDK】【新增】【增加DataStore/PostGIS的拉框，点查询，多边形查询，WKT查询】

Author: 潘卓然Y7000P

src/service/datastore/postgis/PostgisCatlogService.js

@@ -6,8 +6,18 @@ import { DataStoreService } from '../ServiceBase';
  * @class module:PostGIS.PostgisCatlogService
  * @param {PostgisQueryParameter} option 查询条件
  * @param {String} [option.path] 库名称
- * @param {Boolean} [option.classify = true] 类别，地址库、时空库等
+ * @param {String} [option.classify] 类别，地址库、时空库、数据集等
  * @param {String} [option.keyWords] 关键字
+ * @example
+ * let param = {
+        networkProtocol: 'http',
+        ip: '192.168.96.101',
+        port: 9091,
+        path: 'bigdata03',
+        classify: '数据集',
+        keyWords: 'big'
+    };
+    let catlog = new Zondy.DataStore.PostGIS.PostgisCatlogService(param);
  */
 export class PostgisCatlogService extends DataStoreService {
     constructor(option) {
@@ -26,6 +36,7 @@ export class PostgisCatlogService extends DataStoreService {
         /**
          * @member module:PostGIS.PostgisCatlogService.prototype.classify
          * @description 类别，地址库、时空库等
+         * @enum datasets
          */
         this.classify = option.classify;
         /**

src/service/datastore/postgis/PostgisQueryParameter.js

@@ -16,7 +16,7 @@ export class PostgisQueryService extends DataStoreService {
          * @member module:PostGIS.PostgisQueryService.prototype.serviceUrl
          * @description 服务地址
          */
-        this.serviceUrl = '/datastore/rest/dataset/pg/query';
+        this.serviceUrl = '/datastore/rest/dataset/pg/query/';
         /**
          * @member module:PostGIS.PostgisQueryService.prototype.path
          * @description 库名称/工作空间
@@ -105,11 +105,34 @@ export class PostgisQueryService extends DataStoreService {
      * @param {Function} onError 查询失败回调函数。
      */
     query(onSuccess, onError) {
-        let { serviceUrl, path, option } = this;
-        serviceUrl += path;  
+        let { serviceUrl, path, option, geometry, geoFormat } = this;
+        serviceUrl += path;
         let url = this.getFullUrl(serviceUrl, option);
         this.get(url, onSuccess, onError);
     }
+
+    /**
+     * @description 通过wkt查询数据
+     * @param {String} wkt
+     */
+    queryByWkt(wkt) {}
+
+    /**
+     * @description 通过geojson查询数据
+     * @param {String} geojson
+     */
+    queryByGeojson(geojson) {}
+
+    /**
+     * @description 通过circle查询数据
+     * @param {String} circle 格式: x坐标,y坐标,半径
+     */
+    queryByCircle(circle) {}
+    /**
+     * @description 通过rect查询数据
+     * @param {String} rect 格式: xmin,ymin,xmax,ymax
+     */
+    queryByRect(rect) {}
 }
 
 export default PostgisQueryService;

src/service/datastore/postgis/PostgisQueryService.js

@@ -7,6 +7,15 @@ import { DataStoreService } from '../ServiceBase';
  * @param {PostgisQueryParameter} option 查询条件
  * @param {String} option.path 库名称/工作空间
  * @param {String} option.tableNames 表名，多个用逗号分隔，如：X431102TDXZ2005GDLTB,dltb2005
+ * @example 
+ * let param = {
+        networkProtocol: 'http',
+        ip: '192.168.96.101',
+        port: 9091,
+        path: 'bigdata03/bigdata03',
+        tableNames: 'mpf24091'
+    };
+    let catlog = new Zondy.DataStore.PostGIS.PostgisTableService(param);
  */
 export class PostgisTableService extends DataStoreService {
     constructor(option) {
@@ -36,9 +45,7 @@ export class PostgisTableService extends DataStoreService {
      */
     fixOption(option) {
         this.option = {
-            tableNames: option.tableNames,
-            pageSize: option.pageSize,
-            pageNo: option.pageNo
+            tableNames: option.tableNames
         };
     }
 
@@ -50,7 +57,7 @@ export class PostgisTableService extends DataStoreService {
      */
     query(onSuccess, onError) {
         let { serviceUrl, path, option } = this;
-        serviceUrl += path;  
+        serviceUrl += path;
         let url = this.getFullUrl(serviceUrl, option);
         this.get(url, onSuccess, onError);
     }