修改所有端services

Author: xilanhuaweidapao

src/common/iServer/AddressMatchService.js

@@ -20,6 +20,7 @@ export class AddressMatchService extends CommonServiceBase {
     constructor(url, options) {
         super(url, options);
         this.options = options || {};
+        this.eventCount = 0;
         this.CLASS_NAME = 'SuperMap.AddressMatchService';
     }
 
@@ -36,23 +37,23 @@ export class AddressMatchService extends CommonServiceBase {
      * @param {string} url - 正向地址匹配服务地址。
      * @param {GeoCodingParameter} params - 正向地址匹配服务参数。
      */
-    code(url, params) {
+    code(url, params, callback) {
         if (!(params instanceof GeoCodingParameter)) {
             return;
         }
-        this.processAsync(url, params);
+        this.processAsync(url, params, callback);
     }
 
     /**
      * @function AddressMatchService.prototype.decode
      * @param {string} url - 反向地址匹配服务地址。
      * @param {GeoDecodingParameter} params - 反向地址匹配服务参数。
      */
-    decode(url, params) {
+    decode(url, params, callback) {
         if (!(params instanceof GeoDecodingParameter)) {
             return;
         }
-        this.processAsync(url, params);
+        this.processAsync(url, params, callback);
     }
 
     /**
@@ -62,17 +63,37 @@ export class AddressMatchService extends CommonServiceBase {
      * @param {Object} params - 参数。
      */
 
-    processAsync(url, params) {
-        this.request({
-            method: 'GET',
-            url,
-            params,
-            scope: this,
-            success: this.serviceProcessCompleted,
-            failure: this.serviceProcessFailed
-        });
+    processAsync(url, params, callback) {
+      let eventId = ++this.eventCount;
+      let eventListeners = {
+        scope: this,
+        processCompleted: function(result) {
+          if (eventId === result.result.eventId) {
+            callback(result);
+          }
+        },
+        processFailed: function(result) {
+          if (eventId === result.result.eventId) {
+            callback(result);
+          }
+        }
+      }
+      this.events.on(eventListeners);
+      this.request({
+          method: 'GET',
+          url,
+          params,
+          scope: this,
+          success(result) {
+            result.eventId = eventId;
+            this.serviceProcessCompleted(result, eventId);
+          },
+          failure(result) {
+            result.eventId = eventId;
+            this.serviceProcessFailed(result, eventId);
+          }
+      });
     }
-
     /**
      * @function AddressMatchService.prototype.serviceProcessCompleted
      * @param {Object} result - 服务器返回的结果对象。

src/common/iServer/ChartService.js

@@ -0,0 +1,88 @@
+/* Copyright© 2000 - 2022 SuperMap Software Co.Ltd. All rights reserved.
+ * This program are made available under the terms of the Apache License, Version 2.0
+ * which accompanies this distribution and is available at http://www.apache.org/licenses/LICENSE-2.0.html.*/
+ import { Util as CommonUtil} from '@supermap/iclient-common/commontypes/Util';
+ import { DataFormat } from '@supermap/iclient-common/REST';
+ import { ChartQueryService } from '@supermap/iclient-common/iServer/ChartQueryService';
+ import { ChartFeatureInfoSpecsService } from '@supermap/iclient-common/iServer/ChartFeatureInfoSpecsService';
+ 
+ /**
+  * @class ChartService
+  * @category  iServer Map Chart
+  * @classdesc 海图服务。
+  * @extends {ServiceBase}
+  * @example
+  *      new ChartService(url).queryChart(param,function(result){
+  *          //doSomething
+  *      })
+  * @param {string} url - 服务地址。
+  * @param {Object} options - 参数。
+  * @param {string} [options.proxy] - 服务代理地址。
+  * @param {boolean} [options.withCredentials=false] - 请求是否携带 cookie。
+  * @param {boolean} [options.crossOrigin] - 是否允许跨域请求。
+  * @param {Object} [options.headers] - 请求头。
+  * @usage
+  */
+ export class ChartService {
+ 
+     constructor(url, options) {
+      this.url = url;
+      this.options = options || {};
+     }
+ 
+     /**
+      * @function ChartService.prototype.queryChart
+      * @description 查询海图服务。
+      * @param {ChartQueryParameters} params - 海图查询所需参数类。
+      * @param {RequestCallback} callback - 回调函数。
+      * @param {DataFormat} resultFormat - 返回结果类型。
+      */
+     queryChart(params, callback, resultFormat) {
+         var me = this,
+             param = params,
+             format = me._processFormat(resultFormat);
+         var chartQueryService = new ChartQueryService(me.url, {
+             proxy: me.options.proxy,
+             withCredentials: me.options.withCredentials,
+             crossOrigin: me.options.crossOrigin,
+             headers: me.options.headers,
+ 
+             eventListeners: {
+                 scope: me,
+                 processCompleted: callback,
+                 processFailed: callback
+             },
+             format: format
+         });
+ 
+         chartQueryService.processAsync(param);
+     }
+ 
+     /**
+      * @function ChartService.prototype.getChartFeatureInfo
+      * @description 获取海图物标信息服务。
+      * @param {RequestCallback} callback 回调函数。
+      */
+     getChartFeatureInfo(callback) {
+         var me = this;
+         var url = CommonUtil.urlPathAppend(me.url, 'chartFeatureInfoSpecs');
+         var chartFeatureInfoSpecsService = new ChartFeatureInfoSpecsService(url, {
+             proxy: me.options.proxy,
+             withCredentials: me.options.withCredentials,
+             crossOrigin: me.options.crossOrigin,
+             headers: me.options.headers,
+ 
+             eventListeners: {
+                 scope: me,
+                 processCompleted: callback,
+                 processFailed: callback
+             }
+         });
+         chartFeatureInfoSpecsService.processAsync();
+     }
+ 
+     _processFormat(resultFormat) {
+         return (resultFormat) ? resultFormat : DataFormat.GEOJSON;
+     }
+ }
+ 

src/common/iServer/DatasetService.js

@@ -36,7 +36,7 @@ export class DatasetService extends CommonServiceBase {
          *  @description 要查询的数据集名称。
          */
         this.dataset = null;
-
+        this.eventCount = 0;
         if (options) {
             Util.extend(this, options);
         }
@@ -59,66 +59,67 @@ export class DatasetService extends CommonServiceBase {
      * @function DatasetService.prototype.getDatasetsService
      * @description 执行服务，查询数据集服务。
      */
-    getDatasetsService(params) {
-        var me = this;
-        me.url = Util.urlPathAppend(me.url,`datasources/name/${params}/datasets`);
-        me.request({
-            method: "GET",
-            data: null,
-            scope: me,
-            success: me.serviceProcessCompleted,
-            failure: me.serviceProcessFailed
-        });
+    getDatasetsService(params, callback) {
+        const url = Util.urlPathAppend(this.url,`datasources/name/${params}/datasets`);
+        this.processAsync(url, 'GET', callback);
     }
 
     /**
      * @function DatasetService.prototype.getDatasetService
      * @description 执行服务，查询数据集信息服务。
      */
-    getDatasetService(datasourceName, datasetName) {
-        var me = this;
-        me.url = Util.urlPathAppend(me.url,`datasources/name/${datasourceName}/datasets/name/${datasetName}`);
-        me.request({
-            method: "GET",
-            data: null,
-            scope: me,
-            success: me.serviceProcessCompleted,
-            failure: me.serviceProcessFailed
-        });
+    getDatasetService(datasourceName, datasetName, callback) {
+        const url = Util.urlPathAppend(this.url,`datasources/name/${datasourceName}/datasets/name/${datasetName}`);
+        this.processAsync(url, 'GET', callback);
     }
 
     /**
      * @function DatasetService.prototype.setDatasetService
      * @description 执行服务，更改数据集信息服务。
      */
-    setDatasetService(params) {
+    setDatasetService(params, callback) {
         if (!params) {
             return;
         }
-        var me = this;
-        var jsonParamsStr = Util.toJSON(params);
-        me.request({
-            method: "PUT",
-            data: jsonParamsStr,
-            scope: me,
-            success: me.serviceProcessCompleted,
-            failure: me.serviceProcessFailed
-        });
+        this.processAsync(this.url, 'PUT', callback, params);
     }
 
      /**
      * @function DatasetService.prototype.deleteDatasetService
      * @description 执行服务，删除数据集信息服务。
      */
-    deleteDatasetService() {
-        var me = this;
-        me.request({
-            method: "DELETE",
-            data: null,
-            scope: me,
-            success: me.serviceProcessCompleted,
-            failure: me.serviceProcessFailed
-        });
+    deleteDatasetService(datasourceName, datasetName, callback) {
+      const url = Util.urlPathAppend(this.url, `datasources/name/${datasourceName}/datasets/name/${datasetName}`);
+       this.processAsync(url, 'DELETE', callback);
     }
 
+    processAsync(url, method, callback, params) {
+      let eventId = ++this.eventCount;
+      let eventListeners = {
+        scope: this,
+        processCompleted: function(result) {
+          if (eventId === result.result.eventId) {
+            callback(result);
+          }
+        },
+        processFailed: callback
+      }
+      this.events.on(eventListeners);
+       var me = this;
+       let requestConfig = {
+          url,
+          method,
+          scope: me,
+          success(result) {
+            result.eventId = eventId;
+            me.serviceProcessCompleted(result);
+          },
+          failure(result) {
+            result.eventId = eventId;
+            me.serviceProcessFailed(result);
+          }
+        }
+        params && (requestConfig.data = Util.toJSON(params));
+        me.request(requestConfig);
+    }
 }

src/common/iServer/DatasourceService.js

@@ -28,6 +28,7 @@ export class DatasourceService extends CommonServiceBase {
         if (options) {
             Util.extend(this, options);
         }
+        this.eventCount = 0;
         this.CLASS_NAME = "SuperMap.DatasourceService";
     }
 
@@ -37,6 +38,7 @@ export class DatasourceService extends CommonServiceBase {
      * @override
      */
     destroy() {
+        this.eventCount = 0;
         super.destroy();
     }
 
@@ -45,49 +47,58 @@ export class DatasourceService extends CommonServiceBase {
      * @function DatasourceService.prototype.getDatasourceService
      * @description 获取指定数据源信息。
      */
-    getDatasourceService(datasourceName) {
-        var me = this;
-        me.url = Util.urlPathAppend(me.url,`datasources/name/${datasourceName}`);
-        me.request({
-            method: "GET",
-            data: null,
-            scope: me,
-            success: me.serviceProcessCompleted,
-            failure: me.serviceProcessFailed
-        });
+    getDatasourceService(datasourceName, callback) {
+        let url = Util.urlPathAppend(this.url,`datasources/name/${datasourceName}`);
+        this.processAsync(url, "GET", callback);
     }
 
     /**
      * @function DatasourceService.prototype.getDatasourcesService
      * @description 获取所有数据源信息。
      */
-    getDatasourcesService() {
-        var me = this;
-        me.url = Util.urlPathAppend(me.url,`datasources`);
-        me.request({
-            method: "GET",
-            data: null,
-            scope: me,
-            success: me.serviceProcessCompleted,
-            failure: me.serviceProcessFailed
-        });
+    getDatasourcesService(callback) {
+        let url = Util.urlPathAppend(this.url,`datasources`);
+        this.processAsync(url, "GET", callback);
     }
     /**
      * @function DatasourceService.prototype.setDatasourceService
      * @description 更新数据源信息。
      */
-    setDatasourceService(params) {
+    setDatasourceService(params, callback) {
         if (!params) {
             return;
         }
-        var me = this;
-        var jsonParamsStr = Util.toJSON(params);
-        me.request({
-            method: "PUT",
-            data: jsonParamsStr,
-            scope: me,
-            success: me.serviceProcessCompleted,
-            failure: me.serviceProcessFailed
-        });
+        const url = Util.urlPathAppend(this.url,`datasources/name/${params.datasourceName}`);
+        this.processAsync(url, "PUT", callback, params);
+    }
+
+    processAsync(url, method, callback, params) {
+      let eventId = ++this.eventCount;
+      let eventListeners = {
+        scope: this,
+        processCompleted: function(result) {
+          if (eventId === result.result.eventId) {
+            callback(result);
+          }
+        },
+        processFailed: callback
+      }
+      this.events.on(eventListeners);
+       var me = this;
+       let requestConfig = {
+          url,
+          method,
+          scope: me,
+          success(result) {
+            result.eventId = eventId;
+            this.serviceProcessCompleted(result);
+          },
+          failure(result) {
+            result.eventId = eventId;
+            this.serviceProcessFailed(result);
+          }
+        }
+        params && (requestConfig.data = Util.toJSON(params));
+        me.request(requestConfig);
     }
 }