服务整合初步版本

@@ -44,6 +44,9 @@ def create_app():
     :return:app,flask实例
     :return:app,flask实例
     """
     """
 
 
+    # 上下文全局变量字典
+    global GLOBAL_DIC
+
     # app基本设置
     # app基本设置
     app = Flask(__name__)
     app = Flask(__name__)
     app.config['SQLALCHEMY_DATABASE_URI'] = configure.SQLALCHEMY_DATABASE_URI
     app.config['SQLALCHEMY_DATABASE_URI'] = configure.SQLALCHEMY_DATABASE_URI
@@ -96,15 +99,14 @@ def create_app():
     # 入库监测线程
     # 入库监测线程
     @app.before_first_request
     @app.before_first_request
     def data_entry_process():
     def data_entry_process():
-        StructurePrint.print("start listen")
+        StructurePrint().print("start listen")
         process = threading.Thread(target=data_entry_center)
         process = threading.Thread(target=data_entry_center)
         process.start()
         process.start()
 
 
     # 不检测https
     # 不检测https
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
     os.environ['OAUTHLIB_INSECURE_TRANSPORT'] = '1'
 
 
-    # 上下文全局变量字典
-    global GLOBAL_DIC
+
 
 
     return app
     return app
 
 

@@ -11,7 +11,7 @@ import datetime
 
 
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
 import glob
 import glob
-
+import traceback
 class DES():
 class DES():
     '''
     '''
     DES密码加解密
     DES密码加解密
@@ -33,21 +33,6 @@ class DES():
 
 
 db = SQLAlchemy()
 db = SQLAlchemy()
 
 
-# 动态加载Model
-current_dir = os.path.abspath(os.path.dirname(__file__))
-pkgs = list(glob.glob('%s/modules/*/models' % (current_dir)))
-pkgs.extend(list(glob.glob('%s/modules/*/*/models' % (current_dir))))
-
-for pkg in pkgs :
-    pkg = os.path.normpath(pkg)
-    node_list = pkg.split(os.path.sep)
-    pkg_name = ".".join(node_list[node_list.index("app"):])
-    try:
-        __import__(pkg_name)
-    except:
-        pass
-
-
 
 
 class Table(db.Model):
 class Table(db.Model):
     '''
     '''
@@ -268,4 +253,21 @@ class TileScheme(db.Model):
     dpi = Column(Integer)
     dpi = Column(Integer)
     rows = Column(Integer)
     rows = Column(Integer)
     cols = Column(Integer)
     cols = Column(Integer)
-    update_time = Column(DateTime)
+    update_time = Column(DateTime)
+
+    parameter = Column(Text)
+
+# 动态加载Model
+current_dir = os.path.abspath(os.path.dirname(__file__))
+pkgs = list(glob.glob('%s/modules/*/models' % (current_dir)))
+pkgs.extend(list(glob.glob('%s/modules/*/*/models' % (current_dir))))
+
+for pkg in pkgs :
+    pkg = os.path.normpath(pkg)
+    node_list = pkg.split(os.path.sep)
+    pkg_name = ".".join(node_list[node_list.index("app"):])
+    try:
+        __import__(pkg_name)
+    except Exception as e:
+        print(traceback.format_exc())
+        pass

@@ -121,7 +121,7 @@ class Api(ApiTemplate):
 
 
                 # 没有权限的表跳过
                 # 没有权限的表跳过
                 if not PGUtil.check_table_privilege(l_name,"SELECT",db_tuple[0],pg_ds):
                 if not PGUtil.check_table_privilege(l_name,"SELECT",db_tuple[0],pg_ds):
-                    StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0],l_name),"warn")
+                    StructurePrint().print("用户{}对表{}没有select权限！".format(db_tuple[0],l_name),"warn")
                     continue
                     continue
 
 
                 # 范围统计和数量统计以100w为界限
                 # 范围统计和数量统计以100w为界限
@@ -174,7 +174,7 @@ class Api(ApiTemplate):
 
 
                 spatial_table_name.append(layer.GetName())
                 spatial_table_name.append(layer.GetName())
             except:
             except:
-                StructurePrint.print("表{}注册失败！".format(l_name), "warn")
+                StructurePrint().print("表{}注册失败！".format(l_name), "warn")
                 continue
                 continue
         return spatial_table_name,tables
         return spatial_table_name,tables
 
 
@@ -193,7 +193,7 @@ class Api(ApiTemplate):
 
 
                 # 没有权限的表跳过
                 # 没有权限的表跳过
                 if not SQLUtil.check_table_privilege(table_name, "SELECT", db_tuple[0], db_session):
                 if not SQLUtil.check_table_privilege(table_name, "SELECT", db_tuple[0], db_session):
-                    StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0],table_name), "warn")
+                    StructurePrint().print("用户{}对表{}没有select权限！".format(db_tuple[0],table_name), "warn")
                     continue
                     continue
 
 
                 table_guid = uuid.uuid1().__str__()
                 table_guid = uuid.uuid1().__str__()
@@ -248,7 +248,7 @@ class Api(ApiTemplate):
 
 
                 # 没有权限的表跳过
                 # 没有权限的表跳过
                 # if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
                 # if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
-                #     StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
+                #     StructurePrint().print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
                 #     continue
                 #     continue
 
 
                 base_layer_name=l_name.split("_vacuate_")[1]
                 base_layer_name=l_name.split("_vacuate_")[1]

@@ -43,7 +43,7 @@ def data_entry_center():
             for process in remove_process:
             for process in remove_process:
                 running_dict.pop(process)
                 running_dict.pop(process)
 
 
-            # StructurePrint.print("listening...")
+            # StructurePrint().print("listening...")
 
 
             # 入库进程少于阈值，开启入库进程
             # 入库进程少于阈值，开启入库进程
 
 
@@ -58,7 +58,7 @@ def data_entry_center():
 
 
                     try:
                     try:
                         parameter = json.loads(ready_task.parameter)
                         parameter = json.loads(ready_task.parameter)
-                        StructurePrint.print("检测到入库任务")
+                        StructurePrint().print("检测到入库任务")
                         ready_task.state = 2
                         ready_task.state = 2
                         ready_task.process = "入库中"
                         ready_task.process = "入库中"
                         sys_session.commit()
                         sys_session.commit()
@@ -104,10 +104,10 @@ def data_entry_center():
                         sys_session.query(Task).filter_by(guid=ready_task.guid).update(
                         sys_session.query(Task).filter_by(guid=ready_task.guid).update(
                             {"state": -1, "process": "入库失败"})
                             {"state": -1, "process": "入库失败"})
                         sys_session.commit()
                         sys_session.commit()
-                        StructurePrint.print(e.__str__(), "error")
+                        StructurePrint().print(e.__str__(), "error")
                 else:
                 else:
                     # 解表啊
                     # 解表啊
                     sys_session.commit()
                     sys_session.commit()
         except Exception as e:
         except Exception as e:
             sys_session.commit()
             sys_session.commit()
-            StructurePrint.print(e.__str__(), "error")
+            StructurePrint().print(e.__str__(), "error")

@@ -199,7 +199,7 @@ class Api(ApiTemplate):
 
 
                     # 没有权限的表跳过
                     # 没有权限的表跳过
                     if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
                     if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
-                        StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
+                        StructurePrint().print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
                         continue
                         continue
 
 
 
 
@@ -224,11 +224,11 @@ class Api(ApiTemplate):
                         ext = [round(e, 2) for e in ext]
                         ext = [round(e, 2) for e in ext]
                     extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
                     extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
 
 
-                    StructurePrint.print("空间表增加！")
+                    StructurePrint().print("空间表增加！")
 
 
                     geom_type = GeometryAdapter.get_geometry_type(layer)
                     geom_type = GeometryAdapter.get_geometry_type(layer)
                 except:
                 except:
-                    StructurePrint.print("表{}注册失败！".format(l_name), "warn")
+                    StructurePrint().print("表{}注册失败！".format(l_name), "warn")
                     continue
                     continue
 
 
                 table_guid = uuid.uuid1().__str__()
                 table_guid = uuid.uuid1().__str__()
@@ -304,7 +304,7 @@ class Api(ApiTemplate):
 
 
             # 删除表
             # 删除表
             if table.name not in db_tables_names:
             if table.name not in db_tables_names:
-                StructurePrint.print("空间表减少！")
+                StructurePrint().print("空间表减少！")
                 sys_session.delete(table)
                 sys_session.delete(table)
             # 修改表
             # 修改表
             else:
             else:
@@ -320,7 +320,7 @@ class Api(ApiTemplate):
 
 
                 # 没有权限的表跳过
                 # 没有权限的表跳过
                 if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
                 if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
-                    StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
+                    StructurePrint().print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
                     sys_session.delete(table)
                     sys_session.delete(table)
                     continue
                     continue
 
 
@@ -336,7 +336,7 @@ class Api(ApiTemplate):
                     db_columns_names.append(field_name)
                     db_columns_names.append(field_name)
 
 
                     if field_name not in columns_names:
                     if field_name not in columns_names:
-                        StructurePrint.print("{}空间表属性增加！".format(table.name))
+                        StructurePrint().print("{}空间表属性增加！".format(table.name))
                         field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                         field_alias = field_name if field_defn.GetAlternativeName() is None or field_defn.GetAlternativeName().__eq__(
                             "") else field_defn.GetAlternativeName()
                             "") else field_defn.GetAlternativeName()
                         column = Columns(guid=uuid.uuid1().__str__(), table_guid=table.guid,
                         column = Columns(guid=uuid.uuid1().__str__(), table_guid=table.guid,
@@ -347,7 +347,7 @@ class Api(ApiTemplate):
                 # 删除列
                 # 删除列
                 for column in columns:
                 for column in columns:
                     if column.name not in db_columns_names:
                     if column.name not in db_columns_names:
-                        StructurePrint.print("{}空间表属性减少！".format(table.name))
+                        StructurePrint().print("{}空间表属性减少！".format(table.name))
                         sys_session.delete(column)
                         sys_session.delete(column)
 
 
                 # 范围统计和数量统计以100w为界限
                 # 范围统计和数量统计以100w为界限
@@ -373,7 +373,7 @@ class Api(ApiTemplate):
 
 
                 # 修改要素量
                 # 修改要素量
                 if not table.feature_count.__eq__(feature_count):
                 if not table.feature_count.__eq__(feature_count):
-                    StructurePrint.print("{}空间表要素！".format(table.name))
+                    StructurePrint().print("{}空间表要素！".format(table.name))
                     sys_session.query(Table).filter_by(guid=table.guid).update({"feature_count": feature_count,
                     sys_session.query(Table).filter_by(guid=table.guid).update({"feature_count": feature_count,
                                                                    "extent": extent})
                                                                    "extent": extent})
 
 
@@ -381,13 +381,13 @@ class Api(ApiTemplate):
     def add_common_table(self,data_session,sys_session,database_guid,real_common_tables_name,origin_common_tables_name,this_time,db_tuple):
     def add_common_table(self,data_session,sys_session,database_guid,real_common_tables_name,origin_common_tables_name,this_time,db_tuple):
         for table_name in real_common_tables_name:
         for table_name in real_common_tables_name:
             if table_name not in origin_common_tables_name:
             if table_name not in origin_common_tables_name:
-                StructurePrint.print("{}非空间表增加！".format(table_name))
+                StructurePrint().print("{}非空间表增加！".format(table_name))
                 table_guid = uuid.uuid1().__str__()
                 table_guid = uuid.uuid1().__str__()
 
 
 
 
                 # 没有权限的表跳过
                 # 没有权限的表跳过
                 if not SQLUtil.check_table_privilege(table_name, "SELECT", db_tuple[0], data_session):
                 if not SQLUtil.check_table_privilege(table_name, "SELECT", db_tuple[0], data_session):
-                    StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0], table_name), "warn")
+                    StructurePrint().print("用户{}对表{}没有select权限！".format(db_tuple[0], table_name), "warn")
                     continue
                     continue
 
 
                 count = data_session.execute('select count(*) from "{}"'.format(table_name)).fetchone()[0]
                 count = data_session.execute('select count(*) from "{}"'.format(table_name)).fetchone()[0]
@@ -435,14 +435,14 @@ class Api(ApiTemplate):
             tables = sys_session.query(Table).filter_by(name=table_name).filter_by(database_guid=database_guid).all()
             tables = sys_session.query(Table).filter_by(name=table_name).filter_by(database_guid=database_guid).all()
             for table in tables:
             for table in tables:
                 if table_name not in real_common_tables_name:
                 if table_name not in real_common_tables_name:
-                    StructurePrint.print("{}非空间表减少！".format(table_name))
+                    StructurePrint().print("{}非空间表减少！".format(table_name))
                     sys_session.delete(table)
                     sys_session.delete(table)
                 # 修改表
                 # 修改表
                 else:
                 else:
 
 
                     # 没有权限的表删除
                     # 没有权限的表删除
                     if not SQLUtil.check_table_privilege(table_name, "SELECT", db_tuple[0], data_session):
                     if not SQLUtil.check_table_privilege(table_name, "SELECT", db_tuple[0], data_session):
-                        StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0], table_name), "warn")
+                        StructurePrint().print("用户{}对表{}没有select权限！".format(db_tuple[0], table_name), "warn")
                         sys_session.delete(table)
                         sys_session.delete(table)
                         continue
                         continue
 
 
@@ -471,7 +471,7 @@ class Api(ApiTemplate):
                     # 属性增加
                     # 属性增加
                     for col in real_cols_name:
                     for col in real_cols_name:
                         if col not in columns_names:
                         if col not in columns_names:
-                            StructurePrint.print("{}表要素属性增加！".format(table_name))
+                            StructurePrint().print("{}表要素属性增加！".format(table_name))
                             column = Columns(guid=uuid.uuid1().__str__(), table_guid=table.guid,
                             column = Columns(guid=uuid.uuid1().__str__(), table_guid=table.guid,
                                              name=col, create_time=this_time, update_time=this_time)
                                              name=col, create_time=this_time, update_time=this_time)
                             sys_session.add(column)
                             sys_session.add(column)
@@ -479,7 +479,7 @@ class Api(ApiTemplate):
                     # 属性减少
                     # 属性减少
                     for column in columns:
                     for column in columns:
                         if column.name not in real_cols_name:
                         if column.name not in real_cols_name:
-                            StructurePrint.print("{}表要素属性减少！".format(table_name))
+                            StructurePrint().print("{}表要素属性减少！".format(table_name))
                             sys_session.delete(column)
                             sys_session.delete(column)
 
 
                     # 修改要素量
                     # 修改要素量
@@ -489,7 +489,7 @@ class Api(ApiTemplate):
                     count = SQLUtil.get_table_count(table_name,data_session)
                     count = SQLUtil.get_table_count(table_name,data_session)
 
 
                     if not table.feature_count.__eq__(count):
                     if not table.feature_count.__eq__(count):
-                        StructurePrint.print("{}表要素变化！".format(table_name))
+                        StructurePrint().print("{}表要素变化！".format(table_name))
                         sys_session.query(Table).filter_by(guid=table.guid).update({"feature_count": count})
                         sys_session.query(Table).filter_by(guid=table.guid).update({"feature_count": count})
 
 
     
     

@@ -126,7 +126,7 @@ class Api(ApiTemplate):
                 # try:
                 # try:
                 #     pg_ds.DeleteLayer(tv.name)
                 #     pg_ds.DeleteLayer(tv.name)
                 # except Exception as e :
                 # except Exception as e :
-                #     StructurePrint.print("抽稀图层不存在！","warn")
+                #     StructurePrint().print("抽稀图层不存在！","warn")
 
 
             # 创建抽稀过程
             # 创建抽稀过程
             options = ["OVERWRITE=yes", "GEOMETRY_NAME={}".format(PGUtil.get_geo_column(table.name,pg_session)),
             options = ["OVERWRITE=yes", "GEOMETRY_NAME={}".format(PGUtil.get_geo_column(table.name,pg_session)),
@@ -257,7 +257,7 @@ class VacuateProcess:
             p_x = (extent[1]-extent[0])/10.0
             p_x = (extent[1]-extent[0])/10.0
             p_y = (extent[3] - extent[2]) / 10.0
             p_y = (extent[3] - extent[2]) / 10.0
             fill_precent=0
             fill_precent=0
-            StructurePrint.print("判断疏密")
+            StructurePrint().print("判断疏密")
             for ix in range(10):
             for ix in range(10):
                 for iy in range(10):
                 for iy in range(10):
                     grid_extent = [extent[0]+ix*p_x,extent[0]+ix*p_x+p_x,extent[2]+iy*p_y,extent[2]+iy*p_y+p_y]
                     grid_extent = [extent[0]+ix*p_x,extent[0]+ix*p_x+p_x,extent[2]+iy*p_y,extent[2]+iy*p_y+p_y]
@@ -270,7 +270,7 @@ class VacuateProcess:
                         fill_precent += 1
                         fill_precent += 1
 
 
             print(fill_precent)
             print(fill_precent)
-            StructurePrint.print("判断疏密结束")
+            StructurePrint().print("判断疏密结束")
 
 
             layer.SetSpatialFilter(None)
             layer.SetSpatialFilter(None)
             layer.ResetReading()
             layer.ResetReading()

@@ -66,7 +66,7 @@ class Api(ApiTemplate):
                 p_x = (extent[1] - extent[0]) / 10.0
                 p_x = (extent[1] - extent[0]) / 10.0
                 p_y = (extent[3] - extent[2]) / 10.0
                 p_y = (extent[3] - extent[2]) / 10.0
                 fill_precent = 0
                 fill_precent = 0
-                StructurePrint.print("判断疏密")
+                StructurePrint().print("判断疏密")
                 for ix in range(10):
                 for ix in range(10):
                     for iy in range(10):
                     for iy in range(10):
                         grid_extent = [extent[0] + ix * p_x, extent[0] + ix * p_x + p_x, extent[2] + iy * p_y,
                         grid_extent = [extent[0] + ix * p_x, extent[0] + ix * p_x + p_x, extent[2] + iy * p_y,
@@ -80,7 +80,7 @@ class Api(ApiTemplate):
                             fill_precent += 1
                             fill_precent += 1
 
 
                 print(fill_precent)
                 print(fill_precent)
-                StructurePrint.print("判断疏密结束")
+                StructurePrint().print("判断疏密结束")
 
 
                 layer.SetSpatialFilter(None)
                 layer.SetSpatialFilter(None)
                 layer.ResetReading()
                 layer.ResetReading()

@@ -8,6 +8,7 @@ from flask import current_app as app
 import socket
 import socket
 import configure
 import configure
 
 
+
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 

@@ -6,10 +6,13 @@ import hashlib
 from flask import current_app as app
 from flask import current_app as app
 import socket
 import socket
 
 
+
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.StructuredPrint import StructurePrint
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     def process(self):
     def process(self):
+        StructurePrint().print("test")
         return {"Name":socket.gethostname(),"Type":"DMapDMS"}
         return {"Name":socket.gethostname(),"Type":"DMapDMS"}
 
 
     api_doc={
     api_doc={

@@ -10,12 +10,6 @@ from . import service_register
 from . import service_type
 from . import service_type
 from . import service_list
 from . import service_list
 from . import service_delete
 from . import service_delete
-from . import catalog_create
-from . import catalog_delete
-from . import catalog_edit
-from . import catalog_tree
-from . import catalog_next
-from . import catalog_real_tree
 import os
 import os
 from flask import send_from_directory
 from flask import send_from_directory
 
 
@@ -61,69 +55,6 @@ class DataManager(BlueprintApi):
         """
         """
         return service_delete.Api().result
         return service_delete.Api().result
 
 
-    @staticmethod
-    @bp.route('/CatalogCreate', methods=['POST'])
-    @swag_from(catalog_create.Api.api_doc)
-    def api_catalog_create():
-        """
-        创建服务目录
-        """
-        return catalog_create.Api().result
-
-    @staticmethod
-    @bp.route('/CatalogDelete', methods=['POST'])
-    @swag_from(catalog_delete.Api.api_doc)
-    def api_catalog_delete():
-        """
-        删除服务目录
-        """
-        return catalog_delete.Api().result
-
-    @staticmethod
-    @bp.route('/CatalogEdit', methods=['POST'])
-    @swag_from(catalog_edit.Api.api_doc)
-    def api_catalog_edit():
-        """
-        修改服务目录
-        """
-        return catalog_edit.Api().result
-
-    @staticmethod
-    @bp.route('/CatalogEdit', methods=['POST'])
-    @swag_from(catalog_edit.Api.api_doc)
-    def api_catalog_edit():
-        """
-        修改服务目录
-        """
-        return catalog_edit.Api().result
-
-    @staticmethod
-    @bp.route('/CatalogNext', methods=['POST'])
-    @swag_from(catalog_next.Api.api_doc)
-    def api_catalog_next():
-        """
-        下一级服务目录
-        """
-        return catalog_next.Api().result
-
-    @staticmethod
-    @bp.route('/CatalogTree', methods=['POST'])
-    @swag_from(catalog_tree.Api.api_doc)
-    def api_catalog_tree():
-        """
-        服务目录树
-        """
-        return catalog_tree.Api().result
-
-    @staticmethod
-    @bp.route('/CatalogRealTree', methods=['POST'])
-    @swag_from(catalog_real_tree.Api.api_doc)
-    def api_catalog_real_tree():
-        """
-        服务目录树
-        """
-        return catalog_real_tree.Api().result
-
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Overview/<file>', methods=['GET'])
     @bp.route('/Overview/<file>', methods=['GET'])

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/22
+#email:         nheweijun@sina.com
+
+
+
+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+from flasgger import swag_from
+from flask import Blueprint
+from app.util import BlueprintApi
+from . import catalog_edit, catalog_tree, catalog_delete, catalog_create, catalog_next,catalog_real_tree
+
+
+class DataManager(BlueprintApi):
+
+    bp = Blueprint("ServiceCatalog", __name__, url_prefix="/API/Service/Catalog")
+
+
+    @staticmethod
+    @bp.route('/Create', methods=['POST'])
+    @swag_from(catalog_create.Api.api_doc)
+    def api_catalog_create():
+        """
+        创建服务目录
+        """
+        return catalog_create.Api().result
+
+    @staticmethod
+    @bp.route('/Delete', methods=['POST'])
+    @swag_from(catalog_delete.Api.api_doc)
+    def api_catalog_delete():
+        """
+        删除服务目录
+        """
+        return catalog_delete.Api().result
+
+    @staticmethod
+    @bp.route('/Edit', methods=['POST'])
+    @swag_from(catalog_edit.Api.api_doc)
+    def api_catalog_edit():
+        """
+        修改服务目录
+        """
+        return catalog_edit.Api().result
+
+
+    @staticmethod
+    @bp.route('/Next', methods=['POST'])
+    @swag_from(catalog_next.Api.api_doc)
+    def api_catalog_next():
+        """
+        下一级服务目录
+        """
+        return catalog_next.Api().result
+
+    @staticmethod
+    @bp.route('/Tree', methods=['POST'])
+    @swag_from(catalog_tree.Api.api_doc)
+    def api_catalog_tree():
+        """
+        服务目录树
+        """
+        return catalog_tree.Api().result
+
+    @staticmethod
+    @bp.route('/RealTree', methods=['POST'])
+    @swag_from(catalog_real_tree.Api.api_doc)
+    def api_catalog_real_tree():
+        """
+        服务目录树
+        """
+        return catalog_real_tree.Api().result
+

@@ -61,7 +61,7 @@ class Api(ApiTemplate):
     
     
     api_doc={
     api_doc={
     
     
-    "tags":["服务接口"],
+    "tags":["服务目录接口"],
     "parameters":[
     "parameters":[
         {"name": "name",
         {"name": "name",
          "in": "formData",
          "in": "formData",

@@ -48,7 +48,7 @@ class Api(ApiTemplate):
     
     
     
     
     api_doc = {
     api_doc = {
-        "tags": ["服务接口"],
+        "tags": ["服务目录接口"],
         "parameters": [
         "parameters": [
             {"name": "guid",
             {"name": "guid",
              "in": "formData",
              "in": "formData",

@@ -34,7 +34,7 @@ class Api(ApiTemplate):
     
     
     
     
     api_doc = {
     api_doc = {
-        "tags": ["服务接口"],
+        "tags": ["服务目录接口"],
         "parameters": [
         "parameters": [
             {"name": "guid",
             {"name": "guid",
              "in": "formData",
              "in": "formData",

@@ -32,7 +32,7 @@ class Api(ApiTemplate):
 
 
     api_doc={
     api_doc={
 
 
-    "tags":["服务接口"],
+    "tags":["服务目录接口"],
     "parameters":[
     "parameters":[
         {"name": "catalog_guid",
         {"name": "catalog_guid",
          "in": "formData",
          "in": "formData",

@@ -50,7 +50,7 @@ class Api(ApiTemplate):
 
 
     api_doc={
     api_doc={
     
     
-    "tags":["服务接口"],
+    "tags":["服务目录接口"],
     "parameters":[
     "parameters":[
         {"name": "database_guid",
         {"name": "database_guid",
          "in": "formData",
          "in": "formData",

@@ -39,7 +39,7 @@ class Api(ApiTemplate):
     
     
     api_doc={
     api_doc={
     
     
-    "tags":["服务接口"],
+    "tags":["服务目录接口"],
     "parameters":[
     "parameters":[
         {"name": "database_guid",
         {"name": "database_guid",
          "in": "formData",
          "in": "formData",

@@ -9,14 +9,14 @@ from flask import Blueprint
 from app.util import BlueprintApi
 from app.util import BlueprintApi
 from . import image_register
 from . import image_register
 from . import image_service_register
 from . import image_service_register
-from . import image_service_list
 from . import image_server_list
 from . import image_server_list
 from . import data_list
 from . import data_list
 from . import capabilities
 from . import capabilities
 from . import image_list
 from . import image_list
 from . import image_tile
 from . import image_tile
 from . import image_wms
 from . import image_wms
-
+from . import image_overview
+from . import image_service_list
 
 
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
@@ -33,6 +33,16 @@ class DataManager(BlueprintApi):
         """
         """
         return image_register.Api().result
         return image_register.Api().result
 
 
+
+    @staticmethod
+    @bp.route('/Overview', methods=['POST'])
+    @swag_from(image_overview.Api.api_doc)
+    def api_image_overview():
+        """
+        影像缩略图
+        """
+        return image_overview.Api().result
+
     @staticmethod
     @staticmethod
     @bp.route('/ServiceRegister', methods=['POST'])
     @bp.route('/ServiceRegister', methods=['POST'])
     @swag_from(image_service_register.Api.api_doc)
     @swag_from(image_service_register.Api.api_doc)
@@ -43,6 +53,15 @@ class DataManager(BlueprintApi):
         return image_service_register.Api().result
         return image_service_register.Api().result
 
 
     @staticmethod
     @staticmethod
+    @bp.route('/ServiceList', methods=['GET'])
+    @swag_from(image_service_list.Api.api_doc)
+    def api_image_service_list():
+        """
+        服务列表
+        """
+        return image_service_list.Api().result
+
+    @staticmethod
     @bp.route('/ServerList', methods=['GET'])
     @bp.route('/ServerList', methods=['GET'])
     @swag_from(image_server_list.Api.api_doc)
     @swag_from(image_server_list.Api.api_doc)
     def image_server_list():
     def image_server_list():
@@ -79,14 +98,6 @@ class DataManager(BlueprintApi):
         """
         """
         return image_list.Api().result
         return image_list.Api().result
 
 
-    @staticmethod
-    @bp.route('/ImageServiceList', methods=['POST'])
-    @swag_from(image_service_list.Api.api_doc)
-    def image_service_list():
-        """
-        影像服务列表
-        """
-        return image_service_list.Api().result
 
 
     @staticmethod
     @staticmethod
     @bp.route('/Tile/<guid>/<l>/<y>/<z>', methods=['GET'])
     @bp.route('/Tile/<guid>/<l>/<y>/<z>', methods=['GET'])

@@ -2,3 +2,52 @@
 #author:        4N
 #author:        4N
 #createtime:    2021/9/8
 #createtime:    2021/9/8
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
+
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+
+from app.modules.service.image.models import Image,db
+from sqlalchemy import or_,and_
+import datetime
+class Api(ApiTemplate):
+
+    api_name = "影像数据List"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            para = self.para
+            guid = self.para.get("guid")
+            image = Image.query.filter_by(guid=guid).one_or_none()
+            del para["guid"]
+            para["update_time"] = datetime.datetime.now()
+            image.update(para)
+            db.session.commit()
+
+            res["result"] = True
+        except Exception as e:
+            raise e
+
+        return res
+
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+            {"name": "alias",
+             "in": "formData",
+             "type": "string"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -5,30 +5,90 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.util.component.ModelVisitor import ModelVisitor
+from app.util.component.StructuredPrint import StructurePrint
 
 
 from app.modules.service.image.models import Image
 from app.modules.service.image.models import Image
-from sqlalchemy import or_,and_
+from sqlalchemy import or_
+import random
+from .image_wms import Api as WMSApi
+import numpy
+import json
+from flask import Response
+from kazoo.client import KazooClient
+import configure
+import traceback
+
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "影像数据预览功能"
     api_name = "影像数据预览功能"
 
 
     def process(self):
     def process(self):
+        from app import GLOBAL_DIC
 
 
         # 返回结果
         # 返回结果
         res = {}
         res = {}
+
         try:
         try:
+            
+            #获取
+            zoo = GLOBAL_DIC.get("zookeeper")
+            if zoo is None:
+                zoo :KazooClient = KazooClient(hosts=configure.zookeeper, timeout=100)
+                zoo.start()
+                GLOBAL_DIC["zookeeper"] = zoo
+                StructurePrint().print("连接zoo")
+            else :
+                if not zoo.connected:
+                    zoo.start()
 
 
-            res["result"] = True
-        except Exception as e:
-            raise e
 
 
-        return res
+            guid = self.para.get("guid")
+            image = Image.query.filter_by(guid=guid).one_or_none()
+            # 该影像的服务器，随机选取一个
+            image_servers = image.server.split(",")
+            indx = int(random.random() * len(image_servers))
+            image_server = image_servers[indx]
+            wms_api = WMSApi()
+
+            bands = [1,2,3] if image.band_count>=3 else [1,1,1]
+
+            #计算查询范围，保持正常比例
+            query_extent = json.loads(image.extent)
+            if query_extent[2]-query_extent[0] > query_extent[3]-query_extent[1]:
+                offset = ((query_extent[2]-query_extent[0]) - (query_extent[3]-query_extent[1])) / 2.0
+                query_extent = [query_extent[0],query_extent[1] - offset ,query_extent[2],query_extent[3] + offset]
+            else:
+                offset = ((query_extent[3] - query_extent[1]) - (query_extent[2] - query_extent[0])) / 2.0
+                query_extent = [query_extent[0] - offset, query_extent[1], query_extent[2] + offset, query_extent[3]]
+
+
+            pixel_array_t = wms_api.get_data(zoo, image_server, image, query_extent, bands, 256, 256)
+
+
+            pixel_array = numpy.zeros((256, 256, 3), dtype=int)
+            for ii in [0, 1, 2]:
+                # opencv 颜色排序为GBR
+                pixel_array[:, :, 2 - ii] = pixel_array_t[:, :, ii]
+
+            # 将图片生成在内存中,然后直接返回response
+            im_data = wms_api.create_by_opencv("image/jpeg", pixel_array, 30)
+
+            return Response(im_data, mimetype="image/jpeg")
+
+        except Exception as e:
+            StructurePrint().print(traceback.format_exc())
+            res["state"] = -1
+            res["message"] = e.__str__()
+            return res
 
 
 
 
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],
         "parameters": [
         "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -117,7 +117,7 @@ class Api(ApiTemplate):
                                   cell_x_size = info.get("cell_x_size"),
                                   cell_x_size = info.get("cell_x_size"),
                                   cell_y_size = abs(info.get("cell_y_size")),
                                   cell_y_size = abs(info.get("cell_y_size")),
                                   name=os.path.basename(info.get("path")),
                                   name=os.path.basename(info.get("path")),
-                                  origin_extent=json.dumps(info["origin_extent"]),
+                                  extent=json.dumps(info["origin_extent"]),
                                   # geo_origin_extent = json.dumps(info["geo_origin_extent"]),
                                   # geo_origin_extent = json.dumps(info["geo_origin_extent"]),
                                   null_value=info.get("null_value"),
                                   null_value=info.get("null_value"),
                                   server=data_server,
                                   server=data_server,
@@ -132,6 +132,9 @@ class Api(ApiTemplate):
                     db.session.add(image)
                     db.session.add(image)
             db.session.commit()
             db.session.commit()
             # res["data"] = guid
             # res["data"] = guid
+
+
+
             res["result"] = True
             res["result"] = True
 
 
         except Exception as e:
         except Exception as e:

@@ -4,7 +4,7 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app import GLOBAL_DIC
+
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
 import configure
 import configure
 class Api(ApiTemplate):
 class Api(ApiTemplate):
@@ -12,6 +12,7 @@ class Api(ApiTemplate):
     api_name = "获取数据服务器列表"
     api_name = "获取数据服务器列表"
 
 
     def process(self):
     def process(self):
+        from app import GLOBAL_DIC
 
 
         # 返回结果
         # 返回结果
         res = {}
         res = {}

@@ -6,25 +6,39 @@
 from app.modules.service.image.models import ImageService,Image
 from app.modules.service.image.models import ImageService,Image
 from app.models import db
 from app.models import db
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-import uuid
-from app.util.component.SliceScheme import SliceScheme
-from app.util.component.FileProcess import FileProcess
-import os
-import json
+from app.models import Service
 import datetime
 import datetime
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
-    api_name = "注册影像服务"
+    api_name = "修改影像服务"
 
 
     def process(self):
     def process(self):
 
 
-
-
         # 返回结果
         # 返回结果
         res = {}
         res = {}
 
 
         try:
         try:
 
 
+            guid = self.para.get("guid")
+            service = Service.query.filter_by(guid=guid).one_or_none()
+            this_time = datetime.datetime.now()
+
+
+            service_update = {"upate_time":this_time}
+            image_service = {"upate_time":this_time}
+            for key in self.para.keys():
+                if key in ["name","alias","state","description","catalog_guid"]:
+                    service_update[key] = self.para.get(key)
+                if key in ["name","scheme_guid"]:
+                    image_service[key] = self.para.get(key)
+
+            image_service = ImageService.query.filter_by(guid=service.service_guid).one_or_none()
+
+            service.update(service_update)
+            image_service.update(image_service)
+
+            db.session.commit()
+
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
             raise e
             raise e
@@ -34,14 +48,12 @@ class Api(ApiTemplate):
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],
         "parameters": [
         "parameters": [
-            {"name": "guids",
+            {"name": "guid",
              "in": "formData",
              "in": "formData",
-             "type": "string",
-             "description": "影像guids，以英文逗号相隔"},
-            {"name": "file",
+             "type": "string"},
+            {"name": "name",
              "in": "formData",
              "in": "formData",
-             "type": "file",
-             "description": "切片方案"},
+             "type": "string"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#email:         nheweijun@sina.com
+
+from app.modules.service.image.models import ImageService,Image
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from app.models import Service
+from sqlalchemy import or_
+class Api(ApiTemplate):
+
+    api_name = "影像服务List"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+
+        try:
+            page_index = int(self.para.get("page_index", "0"))
+            page_size = int(self.para.get("page_size", "10"))
+
+            alias = self.para.get("alias")
+            name = self.para.get("name")
+            type = self.para.get("type")
+
+            services = ImageService.query
+            if type:
+                services = services.filter_by(type=type)
+            # 并集
+            if alias and name:
+                services = services.filter(
+                    or_(ImageService.alias.like("%" + alias + "%"), ImageService.name.like("%" + name + "%")))
+            else:
+                if alias:
+                    services = services.filter(ImageService.alias.like("%" + alias + "%"))
+                if name:
+                    services = services.filter(ImageService.name.like("%" + name + "%"))
+
+            services = services.limit(page_size).offset(page_index).all()
+
+            res["data"] = ModelVisitor.objects_to_jsonarray(services)
+            res["result"] = True
+        except Exception as e:
+            raise e
+
+        return res
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+            {"name": "page_index",
+             "in": "formData",
+             "type": "int",
+             "description": "页"},
+            {"name": "page_size",
+             "in": "formData",
+             "type": "int",
+             "description": "页大小"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "服务别名"},
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "description": "服务名"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -3,7 +3,7 @@
 #createtime:    2021/7/19
 #createtime:    2021/7/19
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from app.modules.service.image.models import ImageService,Image
+from .models import ImageService,Image
 from app.models import db,Service
 from app.models import db,Service
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
@@ -12,6 +12,10 @@ from app.util.component.FileProcess import FileProcess
 import os
 import os
 import json
 import json
 import datetime
 import datetime
+from .image_wms import Api  as Api2
+import cv2
+import configure
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "注册影像服务"
     api_name = "注册影像服务"
@@ -26,55 +30,133 @@ class Api(ApiTemplate):
         try:
         try:
             guids = self.para.get("guids").split(",")
             guids = self.para.get("guids").split(",")
             name = self.para.get("name")
             name = self.para.get("name")
-            catalog_guid = self.para.get("catalog_guid")
-
-            service_guid = uuid.uuid1().__str__()
 
 
+            image_service_guid = uuid.uuid1().__str__()
 
 
-            parent = os.path.dirname(os.path.realpath(__file__))
-            dir_path, store_file = FileProcess.save(parent)
-            scheme = SliceScheme(store_file).parameter
-
-            service = ImageService(guid=service_guid, name=name,
-                                   create_time=datetime.datetime.now())
-            service_exetent = []
+            this_time = datetime.datetime.now()
+            service_guid = uuid.uuid1().__str__()
+            image_service = ImageService(guid=image_service_guid,
+                                         name=name,
+                                         create_time=this_time,
+                                         scheme_guid=self.para.get("scheme_guid"),
+                                         crs = self.para.get("crs"),
+                                         service_guid=service_guid)
+            image_service_exetent = []
 
 
             for g in guids:
             for g in guids:
                 image = Image.query.filter_by(guid=g).one_or_none()
                 image = Image.query.filter_by(guid=g).one_or_none()
                 if image:
                 if image:
-                    image_extent = json.loads(image.origin_extent)
-                    if not service_exetent:
-                        service_exetent = image_extent
+                    image_extent = json.loads(image.extent)
+                    if not image_service_exetent:
+                        image_service_exetent = image_extent
                     else:
                     else:
-                        service_exetent[0] = min(image_extent[0],service_exetent[0])
-                        service_exetent[1] = min(image_extent[1], service_exetent[1])
-                        service_exetent[2] = max(image_extent[2], service_exetent[2])
-                        service_exetent[3] = max(image_extent[3], service_exetent[3])
-                    service.images.append(image)
-            service.extent = json.dumps(service_exetent)
+                        image_service_exetent[0] = min(image_extent[0],image_service_exetent[0])
+                        image_service_exetent[1] = min(image_extent[1], image_service_exetent[1])
+                        image_service_exetent[2] = max(image_extent[2], image_service_exetent[2])
+                        image_service_exetent[3] = max(image_extent[3], image_service_exetent[3])
+                    image_service.images.append(image)
+            image_service.extent = json.dumps(image_service_exetent)
+
+
+
+            service = Service(
+                guid = service_guid,
+                name = self.para.get("name"),
+                alias = self.para.get("alias"),
+                state = 1,
+                create_time = this_time,
+                update_time = this_time,
+                description = self.para.get("description"),
+                #node = Column(Integer),
+                type = self.para.get("type"),
+                service_guid = image_service_guid,
+                catalog_guid = self.para.get("catalog_guid")
+            )
+
             db.session.add(service)
             db.session.add(service)
-            db.session.commit()
+            db.session.add(image_service)
+
 
 
             #获得overview
             #获得overview
+            overview_file = self.get_overview(service,image_service)
+            service.overview="http://{}/API/Service/Overview/{}".format(
+                    configure.deploy_ip_host,overview_file)
+            db.session.commit()
 
 
-            res["data"] = service_guid
+            res["data"] = image_service_guid
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
+            db.session.rollback()
             raise e
             raise e
 
 
         return res
         return res
 
 
+    def get_overview(self,service,image_service):
+
+        api = Api2()
+
+
+        query_extent = json.loads(image_service.extent)
+        if query_extent[2] - query_extent[0] > query_extent[3] - query_extent[1]:
+            offset = ((query_extent[2] - query_extent[0]) - (query_extent[3] - query_extent[1])) / 2.0
+            query_extent = [query_extent[0], query_extent[1] - offset, query_extent[2], query_extent[3] + offset]
+        else:
+            offset = ((query_extent[3] - query_extent[1]) - (query_extent[2] - query_extent[0])) / 2.0
+            query_extent = [query_extent[0] - offset, query_extent[1], query_extent[2] + offset, query_extent[3]]
+
+        bbox = ",".join([str(x) for x in query_extent])
+
+        api.para = {"guid":image_service.guid,"bbox":bbox,"overview":1}
+        res = api.process()
+        dir_path = os.path.join(os.path.dirname(os.path.dirname(os.path.realpath(__file__))), "overview")
+        gid = uuid.uuid1().__str__()
+        store_file = os.path.join(dir_path, "{}.jpg".format(gid))
+        cv2.imwrite(store_file, res, [cv2.IMWRITE_JPEG_QUALITY, 30])
+
+        return "{}.jpg".format(gid)
+
+
+        
+
     api_doc = {
     api_doc = {
         "tags": ["影像接口"],
         "tags": ["影像接口"],
         "parameters": [
         "parameters": [
+
+            # 通用参数
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "enum": ["WMS", "WMTS", "影像WMS", "影像WMTS"],
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            # 影像参数
             {"name": "guids",
             {"name": "guids",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "影像guids，以英文逗号相隔"},
-            {"name": "file",
+             "description": "[影像WMS,影像WMTS]影像guids，以英文逗号相隔"},
+            {"name": "scheme_guid",
              "in": "formData",
              "in": "formData",
-             "type": "file",
-             "description": "切片方案"},
+             "type": "string",
+             "description": "[WMTS,影像WMTS]切片方案"},
+
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {
@@ -84,4 +166,7 @@ class Api(ApiTemplate):
                 }
                 }
             }
             }
         }
         }
-    }
+    }
+
+if __name__ == '__main__':
+    pass

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/8
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from kazoo.client import KazooClient
+import configure
+from .models import ImageTag
+import uuid
+from app.models import db
+class Api(ApiTemplate):
+
+    api_name = "create tag"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            tag_guid = uuid.uuid1().__str__()
+
+            image_tag = ImageTag(guid=tag_guid,name=self.para.get("name"))
+            db.session.add(image_tag)
+            db.session.commit()
+            res["data"] = tag_guid
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+            {"name": "name",
+             "in": "formData",
+             "type": "string"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/8
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.models import db
+from .models import ImageTag
+class Api(ApiTemplate):
+
+    api_name = "delete tag"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            image_tag = ImageTag.query.filter_by(guid=self.para.get("guid")).one_or_none()
+            if image_tag:
+                db.session.delete(image_tag)
+                db.session.commit()
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -2,3 +2,39 @@
 #author:        4N
 #author:        4N
 #createtime:    2021/9/8
 #createtime:    2021/9/8
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from kazoo.client import KazooClient
+import configure
+from .models import ImageTag
+class Api(ApiTemplate):
+
+    api_name = "获取tag列表"
+
+    def process(self):
+
+        # 返回结果
+        res = {}
+        try:
+            image_tags = ImageTag.query.all()
+            res["data"] = ModelVisitor.objects_to_jsonarray(image_tags)
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -17,7 +17,7 @@ from PIL import Image
 import time
 import time
 import cv2
 import cv2
 from app.modules.service.image.models import ImageService,Image
 from app.modules.service.image.models import ImageService,Image
-from app.models import db
+from app.models import db,TileScheme
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import uuid
 import uuid
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.SliceScheme import SliceScheme
@@ -27,7 +27,7 @@ from app.util.component.GeometryAdapter import GeometryAdapter
 import os
 import os
 import json
 import json
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
-from app import GLOBAL_DIC
+
 from threading import Thread
 from threading import Thread
 
 
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from app.modules.service.image.util.ThriftConnect import ThriftConnect
@@ -46,7 +46,7 @@ class Api(ApiTemplate):
         self.col = col
         self.col = col
 
 
     def process(self):
     def process(self):
-
+        from app import GLOBAL_DIC
         result = {}
         result = {}
         parameter: dict = self.para
         parameter: dict = self.para
 
 
@@ -54,8 +54,16 @@ class Api(ApiTemplate):
             if parameter.get("guid"):
             if parameter.get("guid"):
                 self.guid = parameter.get("guid")
                 self.guid = parameter.get("guid")
 
 
-            image_service = ImageService.query.filter_by(guid = self.guid).one_or_none()
-            images = image_service.images.all()
+            #缓存服务信息
+            image_service_info = GLOBAL_DIC.get(self.guid)
+            if image_service_info is None:
+                image_service:ImageService = ImageService.query.filter_by(guid = self.guid).one_or_none()
+                images = image_service.images.all()
+                scheme:TileScheme = TileScheme.query.filter_by(guid=image_service.scheme_guid).one_or_none()
+                GLOBAL_DIC[self.guid] = {"service":image_service,"images":images,"scheme":json.loads(scheme.parameter)}
+                image_service_info = GLOBAL_DIC[self.guid]
+            else:
+                image_service_info = GLOBAL_DIC[self.guid]
 
 
             zoo = GLOBAL_DIC.get("zookeeper")
             zoo = GLOBAL_DIC.get("zookeeper")
             if zoo is None:
             if zoo is None:
@@ -85,14 +93,15 @@ class Api(ApiTemplate):
 
 
             image_type = parameter.get("format") if parameter.get("format") else "image/png"
             image_type = parameter.get("format") if parameter.get("format") else "image/png"
             quality = int(parameter.get("quality")) if parameter.get("quality") else 30
             quality = int(parameter.get("quality")) if parameter.get("quality") else 30
-            slice_para = json.loads(image_service.slice_scheme)
+            slice_para = image_service_info["scheme"]
             extent = SliceScheme.get_polygon(slice_para, self.level, self.row, self.col)
             extent = SliceScheme.get_polygon(slice_para, self.level, self.row, self.col)
 
 
+
             height, width = 256,256
             height, width = 256,256
 
 
             # 多线程获取分布式数据
             # 多线程获取分布式数据
 
 
-            intersect_image = [im for im in images if self.determin_intersect(json.loads(im.origin_extent),extent)]
+            intersect_image = [im for im in image_service_info["images"] if self.determin_intersect(json.loads(im.extent),extent)]
 
 
             if len(intersect_image) > 1:
             if len(intersect_image) > 1:
 
 
@@ -109,7 +118,6 @@ class Api(ApiTemplate):
                     image_servers = image.server.split(",")
                     image_servers = image.server.split(",")
                     indx = int(random.random() * len(image_servers))
                     indx = int(random.random() * len(image_servers))
                     image_server = image_servers[indx]
                     image_server = image_servers[indx]
-
                     thread: MyThread = MyThread(self.get_data,
                     thread: MyThread = MyThread(self.get_data,
                                                 args=(zoo, image_server, image, extent, bands, height, width))
                                                 args=(zoo, image_server, image, extent, bands, height, width))
                     thread.start()
                     thread.start()
@@ -141,7 +149,9 @@ class Api(ApiTemplate):
                 image = intersect_image[0]
                 image = intersect_image[0]
                 image_servers = image.server.split(",")
                 image_servers = image.server.split(",")
                 indx = int(random.random() * len(image_servers))
                 indx = int(random.random() * len(image_servers))
+
                 image_server = image_servers[indx]
                 image_server = image_servers[indx]
+
                 pixel_array_t = self.get_data(zoo, image_server, image, extent, bands, height, width)
                 pixel_array_t = self.get_data(zoo, image_server, image, extent, bands, height, width)
                 pixel_array = numpy.zeros((height, width, 3), dtype=int)
                 pixel_array = numpy.zeros((height, width, 3), dtype=int)
                 for ii in [0, 1, 2]:
                 for ii in [0, 1, 2]:
@@ -205,13 +215,13 @@ class Api(ApiTemplate):
         else:
         else:
             ser = image_server
             ser = image_server
             if zoo.exists("/rpc/{}".format(ser)):
             if zoo.exists("/rpc/{}".format(ser)):
-                data = self.get_remote_wms_data(image, extent, bands, height, width)
+                data = self.get_remote_wms_data(ser,image, extent, bands, height, width)
             else:
             else:
                 data = numpy.zeros((height, width, 3), dtype=int) + 65536
                 data = numpy.zeros((height, width, 3), dtype=int) + 65536
 
 
         return data
         return data
 
 
-    def get_remote_wms_data(self, image, extent, bands, height, width):
+    def get_remote_wms_data(self, image_server,image, extent, bands, height, width):
         '''
         '''
         通过RPC获取远程数据
         通过RPC获取远程数据
         :param image:
         :param image:
@@ -219,14 +229,19 @@ class Api(ApiTemplate):
         :param bands:
         :param bands:
         :return:
         :return:
         '''
         '''
-        thrift_connect = ThriftConnect(image.server)
+
+
+        #需要做thrift连接的缓存，连接池
+
+        thrift_connect = ThriftConnect(image_server)
         t1 = time.time()
         t1 = time.time()
-        image_extent = image.origin_extent if abs(extent[0]) > 180 else image.geo_origin_extent
+        image_extent = image.extent
 
 
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands, width, height)
 
 
         thrift_connect.close()
         thrift_connect.close()
-        current_app.logger.info("time {}".format(time.time() - t1))
+
+        # current_app.logger.info("time {}".format(time.time() - t1))
         data = gzip.decompress(data)
         data = gzip.decompress(data)
         data = numpy.frombuffer(data, dtype='int64')
         data = numpy.frombuffer(data, dtype='int64')
         data = data.reshape((height, width, 3))
         data = data.reshape((height, width, 3))
@@ -250,7 +265,7 @@ class Api(ApiTemplate):
             # 自决定金字塔等级
             # 自决定金字塔等级
             xysize = [img.RasterXSize, img.RasterYSize]
             xysize = [img.RasterXSize, img.RasterYSize]
 
 
-            origin_extent = image.origin_extent if abs(extent[0]) > 180 else image.geo_origin_extent
+            origin_extent = image.extent
             band_data: Band = img.GetRasterBand(band)
             band_data: Band = img.GetRasterBand(band)
 
 
             max_level = band_data.GetOverviewCount()
             max_level = band_data.GetOverviewCount()
@@ -337,8 +352,8 @@ class Api(ApiTemplate):
         return pixel_array
         return pixel_array
 
 
     def determin_intersect(self, extent1, extent2):
     def determin_intersect(self, extent1, extent2):
-        g1 = GeometryAdapter.envelop_2_polygon(extent1)
-        g2 = GeometryAdapter.envelop_2_polygon(extent2)
+        g1 = GeometryAdapter.bbox_2_polygon(extent1)
+        g2 = GeometryAdapter.bbox_2_polygon(extent2)
         return g1.Intersect(g2)
         return g1.Intersect(g2)
 
 
     api_doc = {
     api_doc = {

@@ -20,7 +20,7 @@ from app.modules.service.image.util.ThriftConnect import ThriftConnect
 from app.util.component.ParameterUtil import ParameterUtil
 from app.util.component.ParameterUtil import ParameterUtil
 import json
 import json
 from kazoo.client import KazooClient
 from kazoo.client import KazooClient
-from app import GLOBAL_DIC
+
 from threading import Thread
 from threading import Thread
 from flask import current_app
 from flask import current_app
 import gzip
 import gzip
@@ -30,6 +30,7 @@ class Api(ApiTemplate):
     api_name = "WMS"
     api_name = "WMS"
 
 
     def process(self):
     def process(self):
+        from app import GLOBAL_DIC
 
 
         result = {}
         result = {}
         parameter: dict = self.para
         parameter: dict = self.para
@@ -45,16 +46,22 @@ class Api(ApiTemplate):
             quality = int(parameter.get("quality")) if parameter.get("quality") else 30
             quality = int(parameter.get("quality")) if parameter.get("quality") else 30
 
 
 
 
-
-
             #缓存起来
             #缓存起来
-            image_service = ImageService.query.filter_by(guid = guid).one_or_none()
-            images = image_service.images.all()
+            #缓存服务信息
+            image_service_info = GLOBAL_DIC.get(guid)
+            if image_service_info is None:
+                image_service:ImageService = ImageService.query.filter_by(guid=guid).one_or_none()
+                images = image_service.images.all()
+                GLOBAL_DIC[guid] = {"service":image_service,"images":images}
+                image_service_info = GLOBAL_DIC[guid]
+            else:
+                image_service_info = GLOBAL_DIC[guid]
+
 
 
             re = parameter.get("request")
             re = parameter.get("request")
 
 
             if re and re.__eq__("GetCapabilities"):
             if re and re.__eq__("GetCapabilities"):
-                return self.get_capabilities(image_service)
+                return self.get_capabilities(image_service_info["service"])
 
 
             zoo = GLOBAL_DIC.get("zookeeper")
             zoo = GLOBAL_DIC.get("zookeeper")
             if zoo is None:
             if zoo is None:
@@ -66,11 +73,10 @@ class Api(ApiTemplate):
                     zoo.start()
                     zoo.start()
 
 
             bands = [1, 2, 3]
             bands = [1, 2, 3]
-            extent = [float(x) for x in bbox.split(",")]
-            # extent = [extent[1],extent[0],extent[3],extent[2]]
 
 
+            extent = [float(x) for x in bbox.split(",")]
 
 
-            intersect_image = [im for im in images if self.determin_intersect(json.loads(im.origin_extent),extent)]
+            intersect_image = [im for im in image_service_info["images"] if self.determin_intersect(json.loads(im.extent),extent)]
 
 
             if len(intersect_image)>1:
             if len(intersect_image)>1:
 
 
@@ -131,6 +137,9 @@ class Api(ApiTemplate):
 
 
             # 将图片生成在内存中,然后直接返回response
             # 将图片生成在内存中,然后直接返回response
             im_data = self.create_by_opencv(image_type, pixel_array, quality)
             im_data = self.create_by_opencv(image_type, pixel_array, quality)
+
+            if self.para.get("overview"):
+                return pixel_array
             return Response(im_data, mimetype=image_type.lower())
             return Response(im_data, mimetype=image_type.lower())
 
 
         except Exception as e:
         except Exception as e:
@@ -180,7 +189,7 @@ class Api(ApiTemplate):
         else:
         else:
             ser = image_server
             ser = image_server
             if zoo.exists("/rpc/{}".format(ser)):
             if zoo.exists("/rpc/{}".format(ser)):
-                data = self.get_remote_wms_data(image, extent, bands, height, width)
+                data = self.get_remote_wms_data(image_server,image, extent, bands, height, width)
             else:
             else:
                 data = numpy.zeros((height, width, 3), dtype=int) + 65536
                 data = numpy.zeros((height, width, 3), dtype=int) + 65536
 
 
@@ -188,7 +197,7 @@ class Api(ApiTemplate):
 
 
 
 
 
 
-    def get_remote_wms_data(self,image,extent,bands,height,width):
+    def get_remote_wms_data(self,image_server,image,extent,bands,height,width):
         '''
         '''
         通过RPC获取远程数据
         通过RPC获取远程数据
         :param image:
         :param image:
@@ -196,14 +205,14 @@ class Api(ApiTemplate):
         :param bands:
         :param bands:
         :return:
         :return:
         '''
         '''
-        thrift_connect = ThriftConnect(image.server)
+        thrift_connect = ThriftConnect(image_server)
         t1 = time.time()
         t1 = time.time()
-        image_extent = image.origin_extent
+        image_extent = image.extent
 
 
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands,width,height)
         data = thrift_connect.client.getData(image.path, extent, json.loads(image_extent), bands,width,height)
 
 
         thrift_connect.close()
         thrift_connect.close()
-        current_app.logger.info("time {}".format(time.time() - t1))
+        # current_app.logger.info("time {}".format(time.time() - t1))
         data = gzip.decompress(data)
         data = gzip.decompress(data)
         data = numpy.frombuffer(data, dtype='int64')
         data = numpy.frombuffer(data, dtype='int64')
         data = data.reshape((height,width, 3))
         data = data.reshape((height,width, 3))
@@ -227,9 +236,11 @@ class Api(ApiTemplate):
             # 自决定金字塔等级
             # 自决定金字塔等级
             xysize = [img.RasterXSize, img.RasterYSize]
             xysize = [img.RasterXSize, img.RasterYSize]
 
 
-            origin_extent = image.origin_extent if abs(extent[0]) > 180 else image.geo_origin_extent
+            origin_extent = image.extent
             band_data: Band = img.GetRasterBand(band)
             band_data: Band = img.GetRasterBand(band)
 
 
+
+
             max_level = band_data.GetOverviewCount()
             max_level = band_data.GetOverviewCount()
 
 
             # 超出空间范围
             # 超出空间范围
@@ -314,8 +325,8 @@ class Api(ApiTemplate):
         return pixel_array
         return pixel_array
 
 
     def determin_intersect(self,extent1,extent2):
     def determin_intersect(self,extent1,extent2):
-        g1 = GeometryAdapter.envelop_2_polygon(extent1)
-        g2 = GeometryAdapter.envelop_2_polygon(extent2)
+        g1 = GeometryAdapter.bbox_2_polygon(extent1)
+        g2 = GeometryAdapter.bbox_2_polygon(extent2)
         return g1.Intersect(g2)
         return g1.Intersect(g2)
 
 
     def get_capabilities(self,image_service:ImageService):
     def get_capabilities(self,image_service:ImageService):
@@ -417,7 +428,7 @@ class Api(ApiTemplate):
         extent = json.loads(image_service.extent)
         extent = json.loads(image_service.extent)
         xml = xml.format(service_title=image_service.name,
         xml = xml.format(service_title=image_service.name,
                          service_name=image_service.name,
                          service_name=image_service.name,
-                         abstract=image_service.description if image_service.description else "None" ,
+                         abstract= "None" ,
                          crs="ESPG:4326",
                          crs="ESPG:4326",
                          layer_name=image_service.name,
                          layer_name=image_service.name,
                          layer_title=image_service.name,
                          layer_title=image_service.name,

@@ -54,15 +54,17 @@ class ImageService(db.Model):
     '''
     '''
     __tablename__ = 'dmap_image_service'
     __tablename__ = 'dmap_image_service'
     guid = Column(String(256), primary_key=True)
     guid = Column(String(256), primary_key=True)
-
-    scheme_guid = Column(Text)
+    name = Column(String)
+    scheme_guid = Column(String)
     extent = Column(String(256))
     extent = Column(String(256))
     # node = Column(Integer)
     # node = Column(Integer)
     #可视范围geojson
     #可视范围geojson
     visual_region = Column(Text)
     visual_region = Column(Text)
     crs = Column(String(256))
     crs = Column(String(256))
+    create_time = Column(DateTime)
+    # service_guid = Column(String, ForeignKey('dmap_service.guid'))
 
 
-    service_guid = Column(String, ForeignKey('dmap_service.guid'))
+    service_guid = Column(String)
 
 
     images  = db.relationship('Image',
     images  = db.relationship('Image',
                               secondary=dmap_image_rel,
                               secondary=dmap_image_rel,

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/26
+#email:         nheweijun@sina.com
+
+from app.modules.service.image.tutorial.ttypes import RasterData
+
+from thrift.transport import TSocket
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol
+from app.modules.service.image.ImageDataService import ImageDataService
+from app.modules.service.image.tutorial import Calculator
+
+from struct import Struct
+
+host = "192.168.184.246"
+port = 9090
+transport: TSocket = TSocket.TSocket(host, port)
+transport = TTransport.TBufferedTransport(transport)
+protocol = TBinaryProtocol.TBinaryProtocol(transport)
+
+client = Calculator.Client(protocol)
+
+
+transport.open()
+
+test = client.getData("江南_01.tif",[1340.27, -1911.31, 4351.79, 5410.6],[1340.27, -1911.31, 4351.79, 5410.6],[3,2,1],768,768)
+print(type(test))
+
+
+

+#!/usr/bin/env python
+#
+# Autogenerated by Thrift Compiler (0.14.2)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+import sys
+import pprint
+if sys.version_info[0] > 2:
+    from urllib.parse import urlparse
+else:
+    from urlparse import urlparse
+from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient
+from thrift.protocol.TBinaryProtocol import TBinaryProtocol
+
+from . import Calculator
+from .ttypes import *
+
+if len(sys.argv) <= 1 or sys.argv[1] == '--help':
+    print('')
+    print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] [-novalidate] [-ca_certs certs] [-keyfile keyfile] [-certfile certfile] function [arg1 [arg2...]]')
+    print('')
+    print('Functions:')
+    print('  RasterData getData(string path,  queryRange,  originRange,  bands, i32 width, i32 height)')
+    print('  Raster getInfo(string path)')
+    print('  bool buildOverview(string path)')
+    print('   getImageList(string path)')
+    print('')
+    sys.exit(0)
+
+pp = pprint.PrettyPrinter(indent=2)
+host = 'localhost'
+port = 9090
+uri = ''
+framed = False
+ssl = False
+validate = True
+ca_certs = None
+keyfile = None
+certfile = None
+http = False
+argi = 1
+
+if sys.argv[argi] == '-h':
+    parts = sys.argv[argi + 1].split(':')
+    host = parts[0]
+    if len(parts) > 1:
+        port = int(parts[1])
+    argi += 2
+
+if sys.argv[argi] == '-u':
+    url = urlparse(sys.argv[argi + 1])
+    parts = url[1].split(':')
+    host = parts[0]
+    if len(parts) > 1:
+        port = int(parts[1])
+    else:
+        port = 80
+    uri = url[2]
+    if url[4]:
+        uri += '?%s' % url[4]
+    http = True
+    argi += 2
+
+if sys.argv[argi] == '-f' or sys.argv[argi] == '-framed':
+    framed = True
+    argi += 1
+
+if sys.argv[argi] == '-s' or sys.argv[argi] == '-ssl':
+    ssl = True
+    argi += 1
+
+if sys.argv[argi] == '-novalidate':
+    validate = False
+    argi += 1
+
+if sys.argv[argi] == '-ca_certs':
+    ca_certs = sys.argv[argi+1]
+    argi += 2
+
+if sys.argv[argi] == '-keyfile':
+    keyfile = sys.argv[argi+1]
+    argi += 2
+
+if sys.argv[argi] == '-certfile':
+    certfile = sys.argv[argi+1]
+    argi += 2
+
+cmd = sys.argv[argi]
+args = sys.argv[argi + 1:]
+
+if http:
+    transport = THttpClient.THttpClient(host, port, uri)
+else:
+    if ssl:
+        socket = TSSLSocket.TSSLSocket(host, port, validate=validate, ca_certs=ca_certs, keyfile=keyfile, certfile=certfile)
+    else:
+        socket = TSocket.TSocket(host, port)
+    if framed:
+        transport = TTransport.TFramedTransport(socket)
+    else:
+        transport = TTransport.TBufferedTransport(socket)
+protocol = TBinaryProtocol(transport)
+client = Calculator.Client(protocol)
+transport.open()
+
+if cmd == 'getData':
+    if len(args) != 6:
+        print('getData requires 6 args')
+        sys.exit(1)
+    pp.pprint(client.getData(args[0], eval(args[1]), eval(args[2]), eval(args[3]), eval(args[4]), eval(args[5]),))
+
+elif cmd == 'getInfo':
+    if len(args) != 1:
+        print('getInfo requires 1 args')
+        sys.exit(1)
+    pp.pprint(client.getInfo(args[0],))
+
+elif cmd == 'buildOverview':
+    if len(args) != 1:
+        print('buildOverview requires 1 args')
+        sys.exit(1)
+    pp.pprint(client.buildOverview(args[0],))
+
+elif cmd == 'getImageList':
+    if len(args) != 1:
+        print('getImageList requires 1 args')
+        sys.exit(1)
+    pp.pprint(client.getImageList(args[0],))
+
+else:
+    print('Unrecognized method %s' % cmd)
+    sys.exit(1)
+
+transport.close()

+#
+# Autogenerated by Thrift Compiler (0.14.2)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+
+import sys
+import logging
+from .ttypes import *
+from thrift.Thrift import TProcessor
+from thrift.transport import TTransport
+all_structs = []
+
+
+class Iface(object):
+    """
+    Ahh, now onto the cool part, defining a service. Services just need a name
+    and can optionally inherit from another service using the extends keyword.
+
+    """
+    def getData(self, path, queryRange, originRange, bands, width, height):
+        """
+        Parameters:
+         - path
+         - queryRange
+         - originRange
+         - bands
+         - width
+         - height
+
+        """
+        pass
+
+    def getInfo(self, path):
+        """
+        Parameters:
+         - path
+
+        """
+        pass
+
+    def buildOverview(self, path):
+        """
+        Parameters:
+         - path
+
+        """
+        pass
+
+    def getImageList(self, path):
+        """
+        Parameters:
+         - path
+
+        """
+        pass
+
+
+class Client(Iface):
+    """
+    Ahh, now onto the cool part, defining a service. Services just need a name
+    and can optionally inherit from another service using the extends keyword.
+
+    """
+    def __init__(self, iprot, oprot=None):
+        self._iprot = self._oprot = iprot
+        if oprot is not None:
+            self._oprot = oprot
+        self._seqid = 0
+
+    def getData(self, path, queryRange, originRange, bands, width, height):
+        """
+        Parameters:
+         - path
+         - queryRange
+         - originRange
+         - bands
+         - width
+         - height
+
+        """
+        self.send_getData(path, queryRange, originRange, bands, width, height)
+        return self.recv_getData()
+
+    def send_getData(self, path, queryRange, originRange, bands, width, height):
+        self._oprot.writeMessageBegin('getData', TMessageType.CALL, self._seqid)
+        args = getData_args()
+        args.path = path
+        args.queryRange = queryRange
+        args.originRange = originRange
+        args.bands = bands
+        args.width = width
+        args.height = height
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getData(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getData_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getData failed: unknown result")
+
+    def getInfo(self, path):
+        """
+        Parameters:
+         - path
+
+        """
+        self.send_getInfo(path)
+        return self.recv_getInfo()
+
+    def send_getInfo(self, path):
+        self._oprot.writeMessageBegin('getInfo', TMessageType.CALL, self._seqid)
+        args = getInfo_args()
+        args.path = path
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getInfo(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getInfo_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getInfo failed: unknown result")
+
+    def buildOverview(self, path):
+        """
+        Parameters:
+         - path
+
+        """
+        self.send_buildOverview(path)
+        return self.recv_buildOverview()
+
+    def send_buildOverview(self, path):
+        self._oprot.writeMessageBegin('buildOverview', TMessageType.CALL, self._seqid)
+        args = buildOverview_args()
+        args.path = path
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_buildOverview(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = buildOverview_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "buildOverview failed: unknown result")
+
+    def getImageList(self, path):
+        """
+        Parameters:
+         - path
+
+        """
+        self.send_getImageList(path)
+        return self.recv_getImageList()
+
+    def send_getImageList(self, path):
+        self._oprot.writeMessageBegin('getImageList', TMessageType.CALL, self._seqid)
+        args = getImageList_args()
+        args.path = path
+        args.write(self._oprot)
+        self._oprot.writeMessageEnd()
+        self._oprot.trans.flush()
+
+    def recv_getImageList(self):
+        iprot = self._iprot
+        (fname, mtype, rseqid) = iprot.readMessageBegin()
+        if mtype == TMessageType.EXCEPTION:
+            x = TApplicationException()
+            x.read(iprot)
+            iprot.readMessageEnd()
+            raise x
+        result = getImageList_result()
+        result.read(iprot)
+        iprot.readMessageEnd()
+        if result.success is not None:
+            return result.success
+        raise TApplicationException(TApplicationException.MISSING_RESULT, "getImageList failed: unknown result")
+
+
+class Processor(Iface, TProcessor):
+    def __init__(self, handler):
+        self._handler = handler
+        self._processMap = {}
+        self._processMap["getData"] = Processor.process_getData
+        self._processMap["getInfo"] = Processor.process_getInfo
+        self._processMap["buildOverview"] = Processor.process_buildOverview
+        self._processMap["getImageList"] = Processor.process_getImageList
+        self._on_message_begin = None
+
+    def on_message_begin(self, func):
+        self._on_message_begin = func
+
+    def process(self, iprot, oprot):
+        (name, type, seqid) = iprot.readMessageBegin()
+        if self._on_message_begin:
+            self._on_message_begin(name, type, seqid)
+        if name not in self._processMap:
+            iprot.skip(TType.STRUCT)
+            iprot.readMessageEnd()
+            x = TApplicationException(TApplicationException.UNKNOWN_METHOD, 'Unknown function %s' % (name))
+            oprot.writeMessageBegin(name, TMessageType.EXCEPTION, seqid)
+            x.write(oprot)
+            oprot.writeMessageEnd()
+            oprot.trans.flush()
+            return
+        else:
+            self._processMap[name](self, seqid, iprot, oprot)
+        return True
+
+    def process_getData(self, seqid, iprot, oprot):
+        args = getData_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getData_result()
+        try:
+            result.success = self._handler.getData(args.path, args.queryRange, args.originRange, args.bands, args.width, args.height)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getData", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getInfo(self, seqid, iprot, oprot):
+        args = getInfo_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getInfo_result()
+        try:
+            result.success = self._handler.getInfo(args.path)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getInfo", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_buildOverview(self, seqid, iprot, oprot):
+        args = buildOverview_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = buildOverview_result()
+        try:
+            result.success = self._handler.buildOverview(args.path)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("buildOverview", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+    def process_getImageList(self, seqid, iprot, oprot):
+        args = getImageList_args()
+        args.read(iprot)
+        iprot.readMessageEnd()
+        result = getImageList_result()
+        try:
+            result.success = self._handler.getImageList(args.path)
+            msg_type = TMessageType.REPLY
+        except TTransport.TTransportException:
+            raise
+        except TApplicationException as ex:
+            logging.exception('TApplication exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = ex
+        except Exception:
+            logging.exception('Unexpected exception in handler')
+            msg_type = TMessageType.EXCEPTION
+            result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error')
+        oprot.writeMessageBegin("getImageList", msg_type, seqid)
+        result.write(oprot)
+        oprot.writeMessageEnd()
+        oprot.trans.flush()
+
+# HELPER FUNCTIONS AND STRUCTURES
+
+
+class getData_args(object):
+    """
+    Attributes:
+     - path
+     - queryRange
+     - originRange
+     - bands
+     - width
+     - height
+
+    """
+
+
+    def __init__(self, path=None, queryRange=None, originRange=None, bands=None, width=None, height=None,):
+        self.path = path
+        self.queryRange = queryRange
+        self.originRange = originRange
+        self.bands = bands
+        self.width = width
+        self.height = height
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.path = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.LIST:
+                    self.queryRange = []
+                    (_etype38, _size35) = iprot.readListBegin()
+                    for _i39 in range(_size35):
+                        _elem40 = iprot.readDouble()
+                        self.queryRange.append(_elem40)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.LIST:
+                    self.originRange = []
+                    (_etype44, _size41) = iprot.readListBegin()
+                    for _i45 in range(_size41):
+                        _elem46 = iprot.readDouble()
+                        self.originRange.append(_elem46)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.LIST:
+                    self.bands = []
+                    (_etype50, _size47) = iprot.readListBegin()
+                    for _i51 in range(_size47):
+                        _elem52 = iprot.readI32()
+                        self.bands.append(_elem52)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 5:
+                if ftype == TType.I32:
+                    self.width = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 6:
+                if ftype == TType.I32:
+                    self.height = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getData_args')
+        if self.path is not None:
+            oprot.writeFieldBegin('path', TType.STRING, 1)
+            oprot.writeString(self.path.encode('utf-8') if sys.version_info[0] == 2 else self.path)
+            oprot.writeFieldEnd()
+        if self.queryRange is not None:
+            oprot.writeFieldBegin('queryRange', TType.LIST, 2)
+            oprot.writeListBegin(TType.DOUBLE, len(self.queryRange))
+            for iter53 in self.queryRange:
+                oprot.writeDouble(iter53)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.originRange is not None:
+            oprot.writeFieldBegin('originRange', TType.LIST, 3)
+            oprot.writeListBegin(TType.DOUBLE, len(self.originRange))
+            for iter54 in self.originRange:
+                oprot.writeDouble(iter54)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.bands is not None:
+            oprot.writeFieldBegin('bands', TType.LIST, 4)
+            oprot.writeListBegin(TType.I32, len(self.bands))
+            for iter55 in self.bands:
+                oprot.writeI32(iter55)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.width is not None:
+            oprot.writeFieldBegin('width', TType.I32, 5)
+            oprot.writeI32(self.width)
+            oprot.writeFieldEnd()
+        if self.height is not None:
+            oprot.writeFieldBegin('height', TType.I32, 6)
+            oprot.writeI32(self.height)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getData_args)
+getData_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'path', 'UTF8', None, ),  # 1
+    (2, TType.LIST, 'queryRange', (TType.DOUBLE, None, False), None, ),  # 2
+    (3, TType.LIST, 'originRange', (TType.DOUBLE, None, False), None, ),  # 3
+    (4, TType.LIST, 'bands', (TType.I32, None, False), None, ),  # 4
+    (5, TType.I32, 'width', None, None, ),  # 5
+    (6, TType.I32, 'height', None, None, ),  # 6
+)
+
+
+class getData_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+
+
+    def __init__(self, success=None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRUCT:
+                    self.success = RasterData()
+                    self.success.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getData_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getData_result)
+getData_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [RasterData, None], None, ),  # 0
+)
+
+
+class getInfo_args(object):
+    """
+    Attributes:
+     - path
+
+    """
+
+
+    def __init__(self, path=None,):
+        self.path = path
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.path = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getInfo_args')
+        if self.path is not None:
+            oprot.writeFieldBegin('path', TType.STRING, 1)
+            oprot.writeString(self.path.encode('utf-8') if sys.version_info[0] == 2 else self.path)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getInfo_args)
+getInfo_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'path', 'UTF8', None, ),  # 1
+)
+
+
+class getInfo_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+
+
+    def __init__(self, success=None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.STRUCT:
+                    self.success = Raster()
+                    self.success.read(iprot)
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getInfo_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.STRUCT, 0)
+            self.success.write(oprot)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getInfo_result)
+getInfo_result.thrift_spec = (
+    (0, TType.STRUCT, 'success', [Raster, None], None, ),  # 0
+)
+
+
+class buildOverview_args(object):
+    """
+    Attributes:
+     - path
+
+    """
+
+
+    def __init__(self, path=None,):
+        self.path = path
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.path = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('buildOverview_args')
+        if self.path is not None:
+            oprot.writeFieldBegin('path', TType.STRING, 1)
+            oprot.writeString(self.path.encode('utf-8') if sys.version_info[0] == 2 else self.path)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(buildOverview_args)
+buildOverview_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'path', 'UTF8', None, ),  # 1
+)
+
+
+class buildOverview_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+
+
+    def __init__(self, success=None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.BOOL:
+                    self.success = iprot.readBool()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('buildOverview_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.BOOL, 0)
+            oprot.writeBool(self.success)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(buildOverview_result)
+buildOverview_result.thrift_spec = (
+    (0, TType.BOOL, 'success', None, None, ),  # 0
+)
+
+
+class getImageList_args(object):
+    """
+    Attributes:
+     - path
+
+    """
+
+
+    def __init__(self, path=None,):
+        self.path = path
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.path = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getImageList_args')
+        if self.path is not None:
+            oprot.writeFieldBegin('path', TType.STRING, 1)
+            oprot.writeString(self.path.encode('utf-8') if sys.version_info[0] == 2 else self.path)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getImageList_args)
+getImageList_args.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'path', 'UTF8', None, ),  # 1
+)
+
+
+class getImageList_result(object):
+    """
+    Attributes:
+     - success
+
+    """
+
+
+    def __init__(self, success=None,):
+        self.success = success
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 0:
+                if ftype == TType.LIST:
+                    self.success = []
+                    (_etype59, _size56) = iprot.readListBegin()
+                    for _i60 in range(_size56):
+                        _elem61 = Image()
+                        _elem61.read(iprot)
+                        self.success.append(_elem61)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('getImageList_result')
+        if self.success is not None:
+            oprot.writeFieldBegin('success', TType.LIST, 0)
+            oprot.writeListBegin(TType.STRUCT, len(self.success))
+            for iter62 in self.success:
+                iter62.write(oprot)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(getImageList_result)
+getImageList_result.thrift_spec = (
+    (0, TType.LIST, 'success', (TType.STRUCT, [Image, None], False), None, ),  # 0
+)
+fix_spec(all_structs)
+del all_structs

+__all__ = ['ttypes', 'constants', 'Calculator']

+#
+# Autogenerated by Thrift Compiler (0.14.2)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+
+import sys
+from .ttypes import *

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/27
+#email:         nheweijun@sina.com
+
+
+# from .ttypes import RasterData
+
+from thrift.transport import TSocket
+from thrift.transport import TTransport
+from thrift.protocol import TBinaryProtocol
+from app.modules.service.image.ImageDataService import ImageDataService
+from . import Calculator
+
+from struct import Struct
+
+host = 1
+port = 9090
+transport: TSocket = TSocket.TSocket(host, port)
+transport = TTransport.TBufferedTransport(transport)
+protocol = TBinaryProtocol.TBinaryProtocol(transport)
+
+client = Calculator.Client(protocol)
+
+
+transport.open()
+
+test = client.getData("江南_01.tif",[1340.27, -1911.31, 4351.79, 5410.6],[1340.27, -1911.31, 4351.79, 5410.6],[3,2,1],768,768)
+print(type(test))

+#
+# Autogenerated by Thrift Compiler (0.14.2)
+#
+# DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+#
+#  options string: py
+#
+
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+from thrift.TRecursive import fix_spec
+
+import sys
+
+from thrift.transport import TTransport
+all_structs = []
+
+
+class Image(object):
+    """
+    Structs are the basic complex data structures. They are comprised of fields
+    which each have an integer identifier, a type, a symbolic name, and an
+    optional default value.
+
+    Fields can be declared "optional", which ensures they will not be included
+    in the serialized output if they aren't set.  Note that this requires some
+    manual management in some languages.
+
+    Attributes:
+     - name
+     - path
+     - size
+     - create_time
+     - type
+
+    """
+
+
+    def __init__(self, name=None, path=None, size=None, create_time=None, type=None,):
+        self.name = name
+        self.path = path
+        self.size = size
+        self.create_time = create_time
+        self.type = type
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.STRING:
+                    self.name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    self.path = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.STRING:
+                    self.size = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.STRING:
+                    self.create_time = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 5:
+                if ftype == TType.STRING:
+                    self.type = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('Image')
+        if self.name is not None:
+            oprot.writeFieldBegin('name', TType.STRING, 1)
+            oprot.writeString(self.name.encode('utf-8') if sys.version_info[0] == 2 else self.name)
+            oprot.writeFieldEnd()
+        if self.path is not None:
+            oprot.writeFieldBegin('path', TType.STRING, 2)
+            oprot.writeString(self.path.encode('utf-8') if sys.version_info[0] == 2 else self.path)
+            oprot.writeFieldEnd()
+        if self.size is not None:
+            oprot.writeFieldBegin('size', TType.STRING, 3)
+            oprot.writeString(self.size.encode('utf-8') if sys.version_info[0] == 2 else self.size)
+            oprot.writeFieldEnd()
+        if self.create_time is not None:
+            oprot.writeFieldBegin('create_time', TType.STRING, 4)
+            oprot.writeString(self.create_time.encode('utf-8') if sys.version_info[0] == 2 else self.create_time)
+            oprot.writeFieldEnd()
+        if self.type is not None:
+            oprot.writeFieldBegin('type', TType.STRING, 5)
+            oprot.writeString(self.type.encode('utf-8') if sys.version_info[0] == 2 else self.type)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class RasterData(object):
+    """
+    Attributes:
+     - R
+     - G
+     - B
+
+    """
+
+
+    def __init__(self, R=None, G=None, B=None,):
+        self.R = R
+        self.G = G
+        self.B = B
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.LIST:
+                    self.R = []
+                    (_etype3, _size0) = iprot.readListBegin()
+                    for _i4 in range(_size0):
+                        _elem5 = iprot.readI16()
+                        self.R.append(_elem5)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.LIST:
+                    self.G = []
+                    (_etype9, _size6) = iprot.readListBegin()
+                    for _i10 in range(_size6):
+                        _elem11 = iprot.readI16()
+                        self.G.append(_elem11)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.LIST:
+                    self.B = []
+                    (_etype15, _size12) = iprot.readListBegin()
+                    for _i16 in range(_size12):
+                        _elem17 = iprot.readI16()
+                        self.B.append(_elem17)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('RasterData')
+        if self.R is not None:
+            oprot.writeFieldBegin('R', TType.LIST, 1)
+            oprot.writeListBegin(TType.I16, len(self.R))
+            for iter18 in self.R:
+                oprot.writeI16(iter18)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.G is not None:
+            oprot.writeFieldBegin('G', TType.LIST, 2)
+            oprot.writeListBegin(TType.I16, len(self.G))
+            for iter19 in self.G:
+                oprot.writeI16(iter19)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.B is not None:
+            oprot.writeFieldBegin('B', TType.LIST, 3)
+            oprot.writeListBegin(TType.I16, len(self.B))
+            for iter20 in self.B:
+                oprot.writeI16(iter20)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class Raster(object):
+    """
+    Attributes:
+     - band_count
+     - overview_count
+     - xy_size
+     - origin_extent
+     - null_value
+     - sr_wkt
+     - epsg
+     - sr_proj4
+     - size
+     - path
+     - cell_x_size
+     - cell_y_size
+
+    """
+
+
+    def __init__(self, band_count=None, overview_count=None, xy_size=None, origin_extent=None, null_value=None, sr_wkt=None, epsg=None, sr_proj4=None, size=None, path=None, cell_x_size=None, cell_y_size=None,):
+        self.band_count = band_count
+        self.overview_count = overview_count
+        self.xy_size = xy_size
+        self.origin_extent = origin_extent
+        self.null_value = null_value
+        self.sr_wkt = sr_wkt
+        self.epsg = epsg
+        self.sr_proj4 = sr_proj4
+        self.size = size
+        self.path = path
+        self.cell_x_size = cell_x_size
+        self.cell_y_size = cell_y_size
+
+    def read(self, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None:
+            iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec])
+            return
+        iprot.readStructBegin()
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.I32:
+                    self.band_count = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.I32:
+                    self.overview_count = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 3:
+                if ftype == TType.LIST:
+                    self.xy_size = []
+                    (_etype24, _size21) = iprot.readListBegin()
+                    for _i25 in range(_size21):
+                        _elem26 = iprot.readI32()
+                        self.xy_size.append(_elem26)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 4:
+                if ftype == TType.LIST:
+                    self.origin_extent = []
+                    (_etype30, _size27) = iprot.readListBegin()
+                    for _i31 in range(_size27):
+                        _elem32 = iprot.readDouble()
+                        self.origin_extent.append(_elem32)
+                    iprot.readListEnd()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 5:
+                if ftype == TType.DOUBLE:
+                    self.null_value = iprot.readDouble()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 6:
+                if ftype == TType.STRING:
+                    self.sr_wkt = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 7:
+                if ftype == TType.STRING:
+                    self.epsg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 8:
+                if ftype == TType.STRING:
+                    self.sr_proj4 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 9:
+                if ftype == TType.I32:
+                    self.size = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 10:
+                if ftype == TType.STRING:
+                    self.path = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 11:
+                if ftype == TType.DOUBLE:
+                    self.cell_x_size = iprot.readDouble()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 12:
+                if ftype == TType.DOUBLE:
+                    self.cell_y_size = iprot.readDouble()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('Raster')
+        if self.band_count is not None:
+            oprot.writeFieldBegin('band_count', TType.I32, 1)
+            oprot.writeI32(self.band_count)
+            oprot.writeFieldEnd()
+        if self.overview_count is not None:
+            oprot.writeFieldBegin('overview_count', TType.I32, 2)
+            oprot.writeI32(self.overview_count)
+            oprot.writeFieldEnd()
+        if self.xy_size is not None:
+            oprot.writeFieldBegin('xy_size', TType.LIST, 3)
+            oprot.writeListBegin(TType.I32, len(self.xy_size))
+            for iter33 in self.xy_size:
+                oprot.writeI32(iter33)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.origin_extent is not None:
+            oprot.writeFieldBegin('origin_extent', TType.LIST, 4)
+            oprot.writeListBegin(TType.DOUBLE, len(self.origin_extent))
+            for iter34 in self.origin_extent:
+                oprot.writeDouble(iter34)
+            oprot.writeListEnd()
+            oprot.writeFieldEnd()
+        if self.null_value is not None:
+            oprot.writeFieldBegin('null_value', TType.DOUBLE, 5)
+            oprot.writeDouble(self.null_value)
+            oprot.writeFieldEnd()
+        if self.sr_wkt is not None:
+            oprot.writeFieldBegin('sr_wkt', TType.STRING, 6)
+            oprot.writeString(self.sr_wkt.encode('utf-8') if sys.version_info[0] == 2 else self.sr_wkt)
+            oprot.writeFieldEnd()
+        if self.epsg is not None:
+            oprot.writeFieldBegin('epsg', TType.STRING, 7)
+            oprot.writeString(self.epsg.encode('utf-8') if sys.version_info[0] == 2 else self.epsg)
+            oprot.writeFieldEnd()
+        if self.sr_proj4 is not None:
+            oprot.writeFieldBegin('sr_proj4', TType.STRING, 8)
+            oprot.writeString(self.sr_proj4.encode('utf-8') if sys.version_info[0] == 2 else self.sr_proj4)
+            oprot.writeFieldEnd()
+        if self.size is not None:
+            oprot.writeFieldBegin('size', TType.I32, 9)
+            oprot.writeI32(self.size)
+            oprot.writeFieldEnd()
+        if self.path is not None:
+            oprot.writeFieldBegin('path', TType.STRING, 10)
+            oprot.writeString(self.path.encode('utf-8') if sys.version_info[0] == 2 else self.path)
+            oprot.writeFieldEnd()
+        if self.cell_x_size is not None:
+            oprot.writeFieldBegin('cell_x_size', TType.DOUBLE, 11)
+            oprot.writeDouble(self.cell_x_size)
+            oprot.writeFieldEnd()
+        if self.cell_y_size is not None:
+            oprot.writeFieldBegin('cell_y_size', TType.DOUBLE, 12)
+            oprot.writeDouble(self.cell_y_size)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+
+
+class InvalidOperation(TException):
+    """
+    Structs can also be exceptions, if they are nasty.
+
+    Attributes:
+     - whatOp
+     - why
+
+    """
+
+
+    def __init__(self, whatOp=None, why=None,):
+        super(InvalidOperation, self).__setattr__('whatOp', whatOp)
+        super(InvalidOperation, self).__setattr__('why', why)
+
+    def __setattr__(self, *args):
+        raise TypeError("can't modify immutable instance")
+
+    def __delattr__(self, *args):
+        raise TypeError("can't modify immutable instance")
+
+    def __hash__(self):
+        return hash(self.__class__) ^ hash((self.whatOp, self.why, ))
+
+    @classmethod
+    def read(cls, iprot):
+        if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None:
+            return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec])
+        iprot.readStructBegin()
+        whatOp = None
+        why = None
+        while True:
+            (fname, ftype, fid) = iprot.readFieldBegin()
+            if ftype == TType.STOP:
+                break
+            if fid == 1:
+                if ftype == TType.I32:
+                    whatOp = iprot.readI32()
+                else:
+                    iprot.skip(ftype)
+            elif fid == 2:
+                if ftype == TType.STRING:
+                    why = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString()
+                else:
+                    iprot.skip(ftype)
+            else:
+                iprot.skip(ftype)
+            iprot.readFieldEnd()
+        iprot.readStructEnd()
+        return cls(
+            whatOp=whatOp,
+            why=why,
+        )
+
+    def write(self, oprot):
+        if oprot._fast_encode is not None and self.thrift_spec is not None:
+            oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec]))
+            return
+        oprot.writeStructBegin('InvalidOperation')
+        if self.whatOp is not None:
+            oprot.writeFieldBegin('whatOp', TType.I32, 1)
+            oprot.writeI32(self.whatOp)
+            oprot.writeFieldEnd()
+        if self.why is not None:
+            oprot.writeFieldBegin('why', TType.STRING, 2)
+            oprot.writeString(self.why.encode('utf-8') if sys.version_info[0] == 2 else self.why)
+            oprot.writeFieldEnd()
+        oprot.writeFieldStop()
+        oprot.writeStructEnd()
+
+    def validate(self):
+        return
+
+    def __str__(self):
+        return repr(self)
+
+    def __repr__(self):
+        L = ['%s=%r' % (key, value)
+             for key, value in self.__dict__.items()]
+        return '%s(%s)' % (self.__class__.__name__, ', '.join(L))
+
+    def __eq__(self, other):
+        return isinstance(other, self.__class__) and self.__dict__ == other.__dict__
+
+    def __ne__(self, other):
+        return not (self == other)
+all_structs.append(Image)
+Image.thrift_spec = (
+    None,  # 0
+    (1, TType.STRING, 'name', 'UTF8', None, ),  # 1
+    (2, TType.STRING, 'path', 'UTF8', None, ),  # 2
+    (3, TType.STRING, 'size', 'UTF8', None, ),  # 3
+    (4, TType.STRING, 'create_time', 'UTF8', None, ),  # 4
+    (5, TType.STRING, 'type', 'UTF8', None, ),  # 5
+)
+all_structs.append(RasterData)
+RasterData.thrift_spec = (
+    None,  # 0
+    (1, TType.LIST, 'R', (TType.I16, None, False), None, ),  # 1
+    (2, TType.LIST, 'G', (TType.I16, None, False), None, ),  # 2
+    (3, TType.LIST, 'B', (TType.I16, None, False), None, ),  # 3
+)
+all_structs.append(Raster)
+Raster.thrift_spec = (
+    None,  # 0
+    (1, TType.I32, 'band_count', None, None, ),  # 1
+    (2, TType.I32, 'overview_count', None, None, ),  # 2
+    (3, TType.LIST, 'xy_size', (TType.I32, None, False), None, ),  # 3
+    (4, TType.LIST, 'origin_extent', (TType.DOUBLE, None, False), None, ),  # 4
+    (5, TType.DOUBLE, 'null_value', None, None, ),  # 5
+    (6, TType.STRING, 'sr_wkt', 'UTF8', None, ),  # 6
+    (7, TType.STRING, 'epsg', 'UTF8', None, ),  # 7
+    (8, TType.STRING, 'sr_proj4', 'UTF8', None, ),  # 8
+    (9, TType.I32, 'size', None, None, ),  # 9
+    (10, TType.STRING, 'path', 'UTF8', None, ),  # 10
+    (11, TType.DOUBLE, 'cell_x_size', None, None, ),  # 11
+    (12, TType.DOUBLE, 'cell_y_size', None, None, ),  # 12
+)
+all_structs.append(InvalidOperation)
+InvalidOperation.thrift_spec = (
+    None,  # 0
+    (1, TType.I32, 'whatOp', None, None, ),  # 1
+    (2, TType.STRING, 'why', 'UTF8', None, ),  # 2
+)
+fix_spec(all_structs)
+del all_structs

@@ -26,4 +26,7 @@ class ThriftConnect:
         self.transport.open()
         self.transport.open()
 
 
     def close(self):
     def close(self):
-        self.transport.close()
+        self.transport.close()
+
+class ThriftPool:
+    pass

@@ -24,6 +24,8 @@ class Api(ApiTemplate):
             # extent = [float(x) for x in  data.get("extent").split(",")] if data.get("extent") else [0,0,0,0]
             # extent = [float(x) for x in  data.get("extent").split(",")] if data.get("extent") else [0,0,0,0]
             # top_left = [float(x) for x in data.get("top_left").split(",")] if data.get("top_left") else [0, 0]
             # top_left = [float(x) for x in data.get("top_left").split(",")] if data.get("top_left") else [0, 0]
 
 
+
+
             guid = uuid.uuid1().__str__()
             guid = uuid.uuid1().__str__()
             tile_scheme = TileScheme(
             tile_scheme = TileScheme(
                 guid = guid,
                 guid = guid,
@@ -39,11 +41,12 @@ class Api(ApiTemplate):
                 # ymax = extent[3],
                 # ymax = extent[3],
                 # origin_x = top_left[0],
                 # origin_x = top_left[0],
                 # origin_y = top_left[1],
                 # origin_y = top_left[1],
-                levels = json.dumps(data.get("levels")),
+                levels = json.dumps(json.loads(data.get("levels"))),
                 dpi = int(data.get("dpi")),
                 dpi = int(data.get("dpi")),
                 rows = int(data.get("rows")),
                 rows = int(data.get("rows")),
-                cols = int(data.get("clos")),
-                update_time = datetime.datetime.now()
+                cols = int(data.get("cols")),
+                update_time = datetime.datetime.now(),
+                parameter=json.dumps(json.loads(data.get("parameter")))
             )
             )
 
 
             db.session.add(tile_scheme)
             db.session.add(tile_scheme)
@@ -89,6 +92,9 @@ class Api(ApiTemplate):
             {"name": "levels",
             {"name": "levels",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
+            {"name": "parameter",
+             "in": "formData",
+             "type": "string"},
 
 
         ],
         ],
         "responses": {
         "responses": {

@@ -10,6 +10,7 @@ from app.util.component.FileProcess import FileProcess
 from app.util.component.SliceScheme import SliceScheme
 from app.util.component.SliceScheme import SliceScheme
 import shutil
 import shutil
 from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.StructuredPrint import StructurePrint
+import json
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "解析方案"
     api_name = "解析方案"
 
 
@@ -30,7 +31,8 @@ class Api(ApiTemplate):
                 "dpi": scheme.parameter.get("dpi"),
                 "dpi": scheme.parameter.get("dpi"),
                 "rows": scheme.parameter.get("rows"),
                 "rows": scheme.parameter.get("rows"),
                 "cols": scheme.parameter.get("cols"),
                 "cols": scheme.parameter.get("cols"),
-                "levels": scheme.levels
+                "levels": scheme.levels,
+                "parameter":scheme.parameter
             }
             }
 
 
             res["data"] = data
             res["data"] = data
@@ -47,11 +49,11 @@ class Api(ApiTemplate):
                     i+=1
                     i+=1
                 if i<30:
                 if i<30:
                     shutil.rmtree(dir_path,True)
                     shutil.rmtree(dir_path,True)
-                    StructurePrint.print("删除文件成功！")
+                    StructurePrint().print("删除文件成功！")
                 else:
                 else:
                     raise Exception("找不到文件！")
                     raise Exception("找不到文件！")
             except Exception as e:
             except Exception as e:
-                StructurePrint.print("删除文件失败！","ERROR")
+                StructurePrint().print("删除文件失败！","ERROR")
         return res
         return res
 
 
     api_doc = {
     api_doc = {

+<?xml version="1.0" encoding="utf-8" ?>
+<TileCacheInfo xmlns:typens="http://www.esri.com/schemas/ArcGIS/10.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="typens:TileCacheInfo">
+	<SpatialReference xsi:type="typens:GeographicCoordinateSystem">
+		<WKT>GEOGCS[&quot;GCS_China_Geodetic_Coordinate_System_2000&quot;,DATUM[&quot;D_China_2000&quot;,SPHEROID[&quot;CGCS2000&quot;,6378137.0,298.257222101]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433],AUTHORITY[&quot;EPSG&quot;,4490]]</WKT>
+		<XOrigin>-400</XOrigin>
+		<YOrigin>-400</YOrigin>
+		<XYScale>11258999068426.24</XYScale>
+		<ZOrigin>0</ZOrigin>
+		<ZScale>1</ZScale>
+		<MOrigin>-100000</MOrigin>
+		<MScale>10000</MScale>
+		<XYTolerance>8.98315284119521e-009</XYTolerance>
+		<ZTolerance>2</ZTolerance>
+		<MTolerance>0.001</MTolerance>
+		<HighPrecision>true</HighPrecision>
+		<LeftLongitude>-180</LeftLongitude>
+		<WKID>4490</WKID>
+		<LatestWKID>4490</LatestWKID>
+	</SpatialReference>
+	<TileOrigin xsi:type="typens:PointN">
+		<X>-180</X>
+		<Y>90</Y>
+	</TileOrigin>
+	<TileCols>256</TileCols>
+	<TileRows>256</TileRows>
+	<DPI>96</DPI>
+	<PreciseDPI>96</PreciseDPI>
+	<LODInfos xsi:type="typens:ArrayOfLODInfo">
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>0</LevelID>
+			<Scale>295497593.05875003</Scale>
+			<Resolution>0.70312500000000022</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>1</LevelID>
+			<Scale>147748796.52937502</Scale>
+			<Resolution>0.35156250000000011</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>2</LevelID>
+			<Scale>73874398.264687508</Scale>
+			<Resolution>0.17578125000000006</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>3</LevelID>
+			<Scale>36937199.132343754</Scale>
+			<Resolution>0.087890625000000028</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>4</LevelID>
+			<Scale>18468599.566171877</Scale>
+			<Resolution>0.043945312500000014</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>5</LevelID>
+			<Scale>9234299.7830859385</Scale>
+			<Resolution>0.021972656250000007</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>6</LevelID>
+			<Scale>4617149.8915429693</Scale>
+			<Resolution>0.010986328125000003</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>7</LevelID>
+			<Scale>2308574.9457714846</Scale>
+			<Resolution>0.0054931640625000017</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>8</LevelID>
+			<Scale>1154287.4728857423</Scale>
+			<Resolution>0.0027465820312500009</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>9</LevelID>
+			<Scale>577143.73644287116</Scale>
+			<Resolution>0.0013732910156250004</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>10</LevelID>
+			<Scale>288571.86822143558</Scale>
+			<Resolution>0.00068664550781250022</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>11</LevelID>
+			<Scale>144285.93411071779</Scale>
+			<Resolution>0.00034332275390625011</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>12</LevelID>
+			<Scale>72142.967055358895</Scale>
+			<Resolution>0.00017166137695312505</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>13</LevelID>
+			<Scale>36071.483527679447</Scale>
+			<Resolution>8.5830688476562527e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>14</LevelID>
+			<Scale>18035.741763839724</Scale>
+			<Resolution>4.2915344238281264e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>15</LevelID>
+			<Scale>9017.8708819198619</Scale>
+			<Resolution>2.1457672119140632e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>16</LevelID>
+			<Scale>4508.9354409599309</Scale>
+			<Resolution>1.0728836059570316e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>17</LevelID>
+			<Scale>2254.4677204799655</Scale>
+			<Resolution>5.3644180297851579e-006</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>18</LevelID>
+			<Scale>1127.2338602399827</Scale>
+			<Resolution>2.682209014892579e-006</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>19</LevelID>
+			<Scale>563.61693011999137</Scale>
+			<Resolution>1.3411045074462895e-006</Resolution>
+		</LODInfo>
+	</LODInfos>
+</TileCacheInfo>

+<?xml version="1.0" encoding="utf-8" ?>
+<TileCacheInfo xmlns:typens="http://www.esri.com/schemas/ArcGIS/10.1" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="typens:TileCacheInfo">
+	<SpatialReference xsi:type="typens:GeographicCoordinateSystem">
+		<WKT>GEOGCS[&quot;GCS_China_Geodetic_Coordinate_System_2000&quot;,DATUM[&quot;D_China_2000&quot;,SPHEROID[&quot;CGCS2000&quot;,6378137.0,298.257222101]],PRIMEM[&quot;Greenwich&quot;,0.0],UNIT[&quot;Degree&quot;,0.0174532925199433],AUTHORITY[&quot;EPSG&quot;,4490]]</WKT>
+		<XOrigin>-400</XOrigin>
+		<YOrigin>-400</YOrigin>
+		<XYScale>11258999068426.24</XYScale>
+		<ZOrigin>0</ZOrigin>
+		<ZScale>1</ZScale>
+		<MOrigin>-100000</MOrigin>
+		<MScale>10000</MScale>
+		<XYTolerance>8.98315284119521e-009</XYTolerance>
+		<ZTolerance>2</ZTolerance>
+		<MTolerance>0.001</MTolerance>
+		<HighPrecision>true</HighPrecision>
+		<LeftLongitude>-180</LeftLongitude>
+		<WKID>4490</WKID>
+		<LatestWKID>4490</LatestWKID>
+	</SpatialReference>
+	<TileOrigin xsi:type="typens:PointN">
+		<X>-180</X>
+		<Y>90</Y>
+	</TileOrigin>
+	<TileCols>256</TileCols>
+	<TileRows>256</TileRows>
+	<DPI>96</DPI>
+	<PreciseDPI>96</PreciseDPI>
+	<LODInfos xsi:type="typens:ArrayOfLODInfo">
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>0</LevelID>
+			<Scale>590995186.11750006</Scale>
+			<Resolution>1.4062500000000004</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>1</LevelID>
+			<Scale>295497593.05875003</Scale>
+			<Resolution>0.70312500000000022</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>2</LevelID>
+			<Scale>147748796.52937502</Scale>
+			<Resolution>0.35156250000000011</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>3</LevelID>
+			<Scale>73874398.264687508</Scale>
+			<Resolution>0.17578125000000006</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>4</LevelID>
+			<Scale>36937199.132343754</Scale>
+			<Resolution>0.087890625000000028</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>5</LevelID>
+			<Scale>18468599.566171877</Scale>
+			<Resolution>0.043945312500000014</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>6</LevelID>
+			<Scale>9234299.7830859385</Scale>
+			<Resolution>0.021972656250000007</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>7</LevelID>
+			<Scale>4617149.8915429693</Scale>
+			<Resolution>0.010986328125000003</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>8</LevelID>
+			<Scale>2308574.9457714846</Scale>
+			<Resolution>0.0054931640625000017</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>9</LevelID>
+			<Scale>1154287.4728857423</Scale>
+			<Resolution>0.0027465820312500009</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>10</LevelID>
+			<Scale>577143.73644287116</Scale>
+			<Resolution>0.0013732910156250004</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>11</LevelID>
+			<Scale>288571.86822143558</Scale>
+			<Resolution>0.00068664550781250022</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>12</LevelID>
+			<Scale>144285.93411071779</Scale>
+			<Resolution>0.00034332275390625011</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>13</LevelID>
+			<Scale>72142.967055358895</Scale>
+			<Resolution>0.00017166137695312505</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>14</LevelID>
+			<Scale>36071.483527679447</Scale>
+			<Resolution>8.5830688476562527e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>15</LevelID>
+			<Scale>18035.741763839724</Scale>
+			<Resolution>4.2915344238281264e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>16</LevelID>
+			<Scale>9017.8708819198619</Scale>
+			<Resolution>2.1457672119140632e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>17</LevelID>
+			<Scale>4508.9354409599309</Scale>
+			<Resolution>1.0728836059570316e-005</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>18</LevelID>
+			<Scale>2254.4677204799655</Scale>
+			<Resolution>5.3644180297851579e-006</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>19</LevelID>
+			<Scale>1127.2338602399827</Scale>
+			<Resolution>2.682209014892579e-006</Resolution>
+		</LODInfo>
+		<LODInfo xsi:type="typens:LODInfo">
+			<LevelID>20</LevelID>
+			<Scale>563.61693011999137</Scale>
+			<Resolution>1.3411045074462895e-006</Resolution>
+		</LODInfo>
+	</LODInfos>
+</TileCacheInfo>

@@ -19,7 +19,7 @@ class Api(ApiTemplate):
         try:
         try:
             guid = self.para.get("guid")
             guid = self.para.get("guid")
             service = Service.query.filter_by(guid=guid).one_or_none()
             service = Service.query.filter_by(guid=guid).one_or_none()
-            db.session.remove(service)
+            db.session.delete(service)
             db.session.commit()
             db.session.commit()
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:

@@ -13,17 +13,16 @@ class Api(ApiTemplate):
     def process(self):
     def process(self):
         res = {}
         res = {}
         try:
         try:
-            if self.para.get("type").__eq__("影像WMS"):
-                from app.modules.service.image.image_service_edit import Api
-            elif self.para.get("type").__eq__("影像WMTS"):
-                from app.modules.service.image.image_service_edit import Api
-            elif self.para.get("type").__eq__("WMS"):
-                from app.modules.service.wms.wms_edit import Api
-            elif self.para.get("type").__eq__("WMTS"):
-                from app.modules.service.wmts.wmts_edit import Api
+
+            if self.para.get("type")in ["ImageWMTS","ImageWMS"]:
+                from app.modules.service.image.image_service_edit import Api as Api2
+            elif self.para.get("type").__eq__("WMS/WFS"):
+                from app.modules.service.wms.wms_edit import Api as Api2
+            elif self.para.get("type") in ["WMTS","MTS"]:
+                from app.modules.service.wmts.wmts_edit import Api as Api2
             else:
             else:
                 return res
                 return res
-            api = Api()
+            api = Api2()
             api.para = self.para
             api.para = self.para
             res = api.process()
             res = api.process()
 
 

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/22
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+from app.models import Service
+
+class Api(ApiTemplate):
+    api_name = "服务Info"
+    def process(self):
+        res = {}
+        try:
+            guid = self.para.get("guid")
+            service = Service.query.filter_by(guid=guid).one_or_none()
+
+            if service.type in ["ImageWMS","ImageWMTS"]:
+                from app.modules.service.image.models import ImageService
+                speci_service = ImageService.query.filter_by(guid=guid).one_or_none()
+            elif service.type.__eq__("WMTS") or service.type.__eq__("MTS"):
+                from app.modules.service.wmts.models import WMTS
+                speci_service = WMTS.query.filter_by(guid=guid).one_or_none()
+            elif service.type.__eq__("WMS/WFS"):
+                from app.modules.service.wms.models import WMS
+                speci_service = WMS.query.filter_by(guid=guid).one_or_none()
+            else:
+                speci_service = {}
+            res["data"] = ModelVisitor.object_to_json(speci_service)
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+            {"name": "guid",
+             "in": "formData",
+             "type": "string",
+             "description": "guid"},
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -4,23 +4,28 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-
+from app.models import Service
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "注册服务"
     api_name = "注册服务"
     def process(self):
     def process(self):
         res = {}
         res = {}
         try:
         try:
-            if self.para.get("type").__eq__("影像WMS"):
-                from app.modules.service.image.image_service_register import Api
-            elif self.para.get("type").__eq__("影像WMTS"):
-                from app.modules.service.image.image_service_register import Api
+
+            service = Service.query.filter_by(name=self.para.get("name")).one_or_none()
+            if service:
+                raise Exception("服务已存在！")
+
+            if self.para.get("type").__eq__("ImageWMS"):
+                from app.modules.service.image.image_service_register import Api as Api2
+            elif self.para.get("type").__eq__("ImageWMTS"):
+                from app.modules.service.image.image_service_register import Api as Api2
             elif self.para.get("type").__eq__("WMS"):
             elif self.para.get("type").__eq__("WMS"):
-                from app.modules.service.wms.wms_register import Api
-            elif self.para.get("type").__eq__("WMTS"):
-                from app.modules.service.wmts.wmts_register import Api
+                from app.modules.service.wms.wms_register import Api as Api2
+            elif self.para.get("type").__eq__("WMTS") or self.para.get("type").__eq__("MTS"):
+                from app.modules.service.wmts.wmts_register import Api as Api2
             else:
             else:
                 return res
                 return res
-            api = Api()
+            api = Api2()
             api.para = self.para
             api.para = self.para
             res = api.process()
             res = api.process()
         except Exception as e:
         except Exception as e:
@@ -31,6 +36,134 @@ class Api(ApiTemplate):
     api_doc = {
     api_doc = {
         "tags": ["服务接口"],
         "tags": ["服务接口"],
         "parameters": [
         "parameters": [
+
+            #通用参数
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "enum":["WMS/WFS","WMTS","MTS","ImageWMS","ImageWMTS"],
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            #影像参数
+            {"name": "guids",
+             "in": "formData",
+             "type": "string",
+             "description": "[影像WMS,影像WMTS]影像guids，以英文逗号相隔"},
+            {"name": "scheme_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,影像WMTS]切片方案"},
+
+            # WMTS参数
+            {"name": "overview",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]缩略图"},
+            {"name": "wmts_type",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]wmts_type"},
+            {"name": "vendor",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]厂商"},
+            {"name": "crs",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]坐标系"},
+            {"name": "datasource",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]数据路径"},
+            {"name": "layer_name",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层名"},
+            {"name": "layer_alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层别名"},
+            {"name": "layer_title",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层标题"},
+            {"name": "layer_style",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,WMS]图层样式"},
+            {"name": "layer_format",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层format"},
+            {"name": "layer_extent",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层范围"},
+            {"name": "layer_description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层描述"},
+
+            #WMS参数
+            {"name": "status",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]status"},
+            {"name": "username",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]username"},
+            {"name": "readonly",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]readonly"},
+            {"name": "sid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sid"},
+            {"name": "stype",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]stype"},
+            {"name": "ssupply",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]ssupply"},
+            {"name": "sctime",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sctime"},
+            {"name": "company",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]company"},
+            {"name": "abstract",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]abstract"},
+            {"name": "thumbnail",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]thumbnail"},
+
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -36,4 +36,5 @@ class WMS(db.Model):
 
 
     layer_style = Column(Text)
     layer_style = Column(Text)
 
 
-    service_guid = Column(String,ForeignKey('dmdms_service.guid'))
+    # service_guid = Column(String,ForeignKey('dmdms_service.guid'))
+    service_guid = Column(String)

@@ -2,3 +2,67 @@
 #author:        4N
 #author:        4N
 #createtime:    2021/9/17
 #createtime:    2021/9/17
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+import uuid
+from .models import WMS
+from app.models import Service,db
+
+import datetime
+class Api(ApiTemplate):
+
+    api_name = "修改WMTS服务"
+
+    def process(self):
+
+
+
+        # 返回结果
+        res = {}
+
+        try:
+            guid = self.para.get("guid")
+            service = Service.query.filter_by(guid=guid).one_or_none()
+            this_time = datetime.datetime.now()
+
+
+            service_update = {"upate_time":this_time}
+            wms_update = {"upatetime":this_time}
+            for key in self.para.keys():
+                if key in ["name","alias","state","description","overview","catalog_guid"]:
+                    service_update[key] = self.para.get(key)
+                if key in ["status","description","username","readonly",
+                           "sid","stype","ssupply","sctime","company","abstract","thumbnail","layer_style"]:
+                    wms_update[key] = self.para.get(key)
+                if key.__eq__("name"):
+                    wms_update["service"] = self.para.get(key)
+
+
+
+            wms = WMS.query.filter_by(guid=service.service_guid).one_or_none()
+            service.update(service_update)
+            wms.update(wms_update)
+
+            db.session.commit()
+
+            res["result"] = True
+        except Exception as e:
+            raise e
+
+        return res
+
+    api_doc = {
+        "tags": ["影像接口"],
+        "parameters": [
+
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -36,15 +36,16 @@ class Api(ApiTemplate):
                 update_time = this_time,
                 update_time = this_time,
                 description = self.para.get("description"),
                 description = self.para.get("description"),
                 #node = Column(Integer),
                 #node = Column(Integer),
+                node = 1 ,
                 overview = "xxxx",
                 overview = "xxxx",
-                type = self.para.get("service_type"),
+                type = self.para.get("type"),
                 service_guid = wms_service_guid,
                 service_guid = wms_service_guid,
                 catalog_guid = self.para.get("catalog_guid")
                 catalog_guid = self.para.get("catalog_guid")
             )
             )
 
 
             wms = WMS(
             wms = WMS(
                 guid = wms_service_guid,
                 guid = wms_service_guid,
-                name = self.para.get("name"),
+                service = self.para.get("name"),
                 status = self.para.get("status"),
                 status = self.para.get("status"),
                 description=self.para.get("description"),
                 description=self.para.get("description"),
                 username = self.para.get("username"),
                 username = self.para.get("username"),
@@ -76,6 +77,80 @@ class Api(ApiTemplate):
         "tags": ["WMTS接口"],
         "tags": ["WMTS接口"],
         "parameters": [
         "parameters": [
 
 
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "enum": ["WMS", "WMTS", "影像WMS", "影像WMTS"],
+             "required": "true",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+
+            {"name": "status",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]status"},
+            {"name": "username",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]username"},
+            {"name": "readonly",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]readonly"},
+            {"name": "sid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sid"},
+            {"name": "stype",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]stype"},
+            {"name": "ssupply",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]ssupply"},
+            {"name": "sctime",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]sctime"},
+            {"name": "company",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]company"},
+            {"name": "abstract",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]abstract"},
+            {"name": "thumbnail",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS]thumbnail"},
+            {"name": "layer_style",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS]layer_style"},
+
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -25,12 +25,3 @@ class DataManager(BlueprintApi):
         上传缩略图
         上传缩略图
         """
         """
         return upload_oview.Api().result
         return upload_oview.Api().result
-
-    @staticmethod
-    @bp.route('/UploadOverview', methods=['POST'])
-    @swag_from(upload_oview.Api.api_doc)
-    def api_upload_oview():
-        """
-        上传缩略图
-        """
-        return upload_oview.Api().result

@@ -48,6 +48,9 @@ class WMTS(db.Model):
     #图层描述
     #图层描述
     layer_description = Column(String)
     layer_description = Column(String)
 
 
-    scheme_guid = Column(String,ForeignKey('dmap_tile_scheme.guid'))
+    # scheme_guid = Column(String,ForeignKey('dmap_tile_scheme.guid'))
+    #
+    # service_guid = Column(String,ForeignKey('dmap_service.guid'))
 
 
-    service_guid = Column(String,ForeignKey('dmap_service.guid'))
+    scheme_guid = Column(String)
+    service_guid = Column(String)

@@ -10,6 +10,9 @@ from .models import WMTS
 from app.models import Service,db
 from app.models import Service,db
 import datetime
 import datetime
 import configure
 import configure
+import requests
+from requests import Response
+import json
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "注册WMTS服务"
     api_name = "注册WMTS服务"
@@ -24,25 +27,28 @@ class Api(ApiTemplate):
             service_guid = uuid.uuid1().__str__()
             service_guid = uuid.uuid1().__str__()
             wmts_service_guid = uuid.uuid1().__str__()
             wmts_service_guid = uuid.uuid1().__str__()
 
 
-
-
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,
                 name = self.para.get("name"),
                 name = self.para.get("name"),
                 alias = self.para.get("alias"),
                 alias = self.para.get("alias"),
-                state = int(self.para.get("state")) if self.para.get("state") else None,
+                state = 1,
                 create_time = this_time,
                 create_time = this_time,
                 update_time = this_time,
                 update_time = this_time,
                 description = self.para.get("description"),
                 description = self.para.get("description"),
-                #node = Column(Integer),
+                node = 1,
                 overview = "http://{}/API/Service/Overview/{}".format(
                 overview = "http://{}/API/Service/Overview/{}".format(
                     configure.deploy_ip_host,
                     configure.deploy_ip_host,
                     self.para.get("overview") if self.para.get("overview") else "wmts_tb.png"),
                     self.para.get("overview") if self.para.get("overview") else "wmts_tb.png"),
-                type = self.para.get("service_type"),
+                type = self.para.get("type"),
                 service_guid = wmts_service_guid,
                 service_guid = wmts_service_guid,
                 catalog_guid = self.para.get("catalog_guid")
                 catalog_guid = self.para.get("catalog_guid")
             )
             )
 
 
+            #已存在就删除
+            wmts_isexist = WMTS.query.filter_by(name=self.para.get("name")).one_or_none()
+            if wmts_isexist:
+                db.session.delete(wmts_isexist)
+
             wmts = WMTS(
             wmts = WMTS(
                 guid = wmts_service_guid,
                 guid = wmts_service_guid,
                 name = self.para.get("name"),
                 name = self.para.get("name"),
@@ -60,16 +66,25 @@ class Api(ApiTemplate):
                 layer_extent = self.para.get("layer_extent"),
                 layer_extent = self.para.get("layer_extent"),
                 layer_description = self.para.get("layer_description"),
                 layer_description = self.para.get("layer_description"),
                 scheme_guid = self.para.get("scheme_guid"),
                 scheme_guid = self.para.get("scheme_guid"),
-                service_guid = service_guid
+                service_guid = service_guid,
+                metadata_url="{}/DMap/Services/{}/MapServer/WMTSServer".format(configure.wmts_url,self.para.get("name"))
             )
             )
 
 
-
-            #调用WMTS的注册服务接口
-
-
             db.session.add(service)
             db.session.add(service)
             db.session.add(wmts)
             db.session.add(wmts)
             db.session.commit()
             db.session.commit()
+
+            # 调用WMTS的注册服务接口
+            try:
+                url = "{}/dmap/api/manager/updatecache?servicename={}".format(configure.wmts_url,service.name)
+                resp:Response = requests.get(url)
+                if not resp.json()["status"].__eq__("true"):
+                    raise Exception("调用WMTS的注册服务接口失败！")
+            except Exception as e:
+                db.session.delete(service)
+                db.session.delete(wmts)
+                db.session.commit()
+                raise e
             res["data"] = service_guid
             res["data"] = service_guid
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
@@ -80,7 +95,78 @@ class Api(ApiTemplate):
     api_doc = {
     api_doc = {
         "tags": ["WMTS接口"],
         "tags": ["WMTS接口"],
         "parameters": [
         "parameters": [
-
+            {"name": "name",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "type",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "catalog_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMS,WMTS,影像WMS,影像WMTS]"},
+            {"name": "scheme_guid",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS,影像WMTS]切片方案"},
+            {"name": "overview",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]缩略图"},
+            {"name": "wmts_type",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]wmts_type"},
+            {"name": "vendor",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]厂商"},
+            {"name": "crs",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]坐标系"},
+            {"name": "datasource",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]数据路径"},
+            {"name": "layer_name",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层名"},
+            {"name": "layer_alias",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层别名"},
+            {"name": "layer_title",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层标题"},
+            {"name": "layer_style",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层样式"},
+            {"name": "layer_format",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层format"},
+            {"name": "layer_extent",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层范围"},
+            {"name": "layer_description",
+             "in": "formData",
+             "type": "string",
+             "description": "[WMTS]图层描述"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -65,7 +65,7 @@ class EntryData:
         except Exception as e:
         except Exception as e:
             this_task.write_process("{} 任务结束！".format(e.__str__()))
             this_task.write_process("{} 任务结束！".format(e.__str__()))
             this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
             this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
-            StructurePrint.print(e.__str__(),"ERROR")
+            StructurePrint().print(e.__str__(),"ERROR")
             # rollback
             # rollback
             this_task.pg_ds.RollbackTransaction()
             this_task.pg_ds.RollbackTransaction()
         finally:
         finally:
@@ -79,13 +79,13 @@ class EntryData:
                     i+=1
                     i+=1
                 if i<30:
                 if i<30:
                     shutil.rmtree(dir_path,True)
                     shutil.rmtree(dir_path,True)
-                    StructurePrint.print("删除文件成功！")
+                    StructurePrint().print("删除文件成功！")
                 else:
                 else:
                     raise Exception("找不到文件！")
                     raise Exception("找不到文件！")
 
 
             except Exception as e:
             except Exception as e:
-                StructurePrint.print(e.__str__(), "ERROR")
-                StructurePrint.print("删除文件失败！","ERROR")
+                StructurePrint().print(e.__str__(), "ERROR")
+                StructurePrint().print("删除文件失败！","ERROR")
 
 
     def entry_shp(self,data_path,this_task):
     def entry_shp(self,data_path,this_task):
         '''
         '''
@@ -186,7 +186,7 @@ class EntryData:
             for feature in layer:
             for feature in layer:
                 count+=1
                 count+=1
                 if count%10000==0:
                 if count%10000==0:
-                    StructurePrint.print("{}图层已入库{}个对象".format(new_layer_name,count))
+                    StructurePrint().print("{}图层已入库{}个对象".format(new_layer_name,count))
                     # print(time.time()-this_time)
                     # print(time.time()-this_time)
                     this_time=time.time()
                     this_time=time.time()
                 geo :Geometry = feature.GetGeometryRef()
                 geo :Geometry = feature.GetGeometryRef()
@@ -194,7 +194,7 @@ class EntryData:
                 if geo is not None:
                 if geo is not None:
                     if geo.IsEmpty():
                     if geo.IsEmpty():
                         this_task.write_process("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()))
                         this_task.write_process("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()))
-                        StructurePrint.print("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()),"WARN")
+                        StructurePrint().print("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()),"WARN")
                         continue
                         continue
                 out_feature: Feature = copy.copy(feature)
                 out_feature: Feature = copy.copy(feature)
 
 
@@ -210,7 +210,7 @@ class EntryData:
         except Exception as e:
         except Exception as e:
             # this_task.pg_ds.RollbackTransaction()
             # this_task.pg_ds.RollbackTransaction()
             this_task.write_process("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()))
             this_task.write_process("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()))
-            StructurePrint.print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
+            StructurePrint().print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
             return False,new_layer_name
             return False,new_layer_name
         # finally:
         # finally:
 
 

@@ -87,7 +87,7 @@ class EntryDataVacuate:
         except Exception as e:
         except Exception as e:
             this_task.write_process("{} 任务结束！".format(e.__str__()))
             this_task.write_process("{} 任务结束！".format(e.__str__()))
             this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
             this_task.update({"state": -1, "process": "入库失败", "update_time": datetime.datetime.now()})
-            StructurePrint.print(e.__str__(),"ERROR")
+            StructurePrint().print(e.__str__(),"ERROR")
             # rollback
             # rollback
             this_task.rollback()
             this_task.rollback()
         finally:
         finally:
@@ -101,13 +101,13 @@ class EntryDataVacuate:
                     i+=1
                     i+=1
                 if i<30:
                 if i<30:
                     shutil.rmtree(dir_path,True)
                     shutil.rmtree(dir_path,True)
-                    StructurePrint.print("删除文件成功！")
+                    StructurePrint().print("删除文件成功！")
                 else:
                 else:
                     raise Exception("找不到文件！")
                     raise Exception("找不到文件！")
 
 
             except Exception as e:
             except Exception as e:
-                StructurePrint.print(e.__str__(), "ERROR")
-                StructurePrint.print("删除文件失败！","ERROR")
+                StructurePrint().print(e.__str__(), "ERROR")
+                StructurePrint().print("删除文件失败！","ERROR")
 
 
 
 
     def entry_shp(self,data_path,this_task,meta):
     def entry_shp(self,data_path,this_task,meta):
@@ -209,7 +209,7 @@ class EntryDataVacuate:
             for feature in layer:
             for feature in layer:
                 count+=1
                 count+=1
                 if count%10000==0:
                 if count%10000==0:
-                    StructurePrint.print("{}图层已入库{}个对象".format(new_layer_name,count))
+                    StructurePrint().print("{}图层已入库{}个对象".format(new_layer_name,count))
                     # print(time.time()-this_time)
                     # print(time.time()-this_time)
                     #this_time=time.time()
                     #this_time=time.time()
                 geo :Geometry = feature.GetGeometryRef()
                 geo :Geometry = feature.GetGeometryRef()
@@ -217,7 +217,7 @@ class EntryDataVacuate:
                 if geo is not None:
                 if geo is not None:
                     if geo.IsEmpty():
                     if geo.IsEmpty():
                         this_task.write_process("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()))
                         this_task.write_process("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()))
-                        StructurePrint.print("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()),"WARN")
+                        StructurePrint().print("FID:{}要素的空间字段为空，跳过该要素！".format(feature.GetFID()),"WARN")
                         continue
                         continue
 
 
                 out_feature: Feature = copy.copy(feature)
                 out_feature: Feature = copy.copy(feature)
@@ -248,7 +248,7 @@ class EntryDataVacuate:
         except Exception as e:
         except Exception as e:
 
 
             this_task.write_process("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()))
             this_task.write_process("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()))
-            StructurePrint.print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
+            StructurePrint().print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
             print(traceback.format_exc())
             print(traceback.format_exc())
             # 抽稀回滚
             # 抽稀回滚
             # vacuate_process.rollback()
             # vacuate_process.rollback()
@@ -440,7 +440,7 @@ class VacuateProcess:
             p_x = (extent[1]-extent[0])/10.0
             p_x = (extent[1]-extent[0])/10.0
             p_y = (extent[3] - extent[2]) / 10.0
             p_y = (extent[3] - extent[2]) / 10.0
             fill_precent=0
             fill_precent=0
-            StructurePrint.print("判断疏密")
+            StructurePrint().print("判断疏密")
             for ix in range(10):
             for ix in range(10):
                 for iy in range(10):
                 for iy in range(10):
                     grid_extent = [extent[0]+ix*p_x,extent[0]+ix*p_x+p_x,extent[2]+iy*p_y,extent[2]+iy*p_y+p_y]
                     grid_extent = [extent[0]+ix*p_x,extent[0]+ix*p_x+p_x,extent[2]+iy*p_y,extent[2]+iy*p_y+p_y]
@@ -453,7 +453,7 @@ class VacuateProcess:
                         fill_precent += 1
                         fill_precent += 1
 
 
             print(fill_precent)
             print(fill_precent)
-            StructurePrint.print("判断疏密结束")
+            StructurePrint().print("判断疏密结束")
 
 
             layer.SetSpatialFilter(None)
             layer.SetSpatialFilter(None)
             layer.ResetReading()
             layer.ResetReading()

@@ -155,6 +155,19 @@ class GeometryAdapter:
         return poly
         return poly
 
 
     @classmethod
     @classmethod
+    def bbox_2_polygon(cls,bbox):
+        ring = ogr.Geometry(ogr.wkbLinearRing)
+        ring.AddPoint(bbox[0], bbox[1])
+        ring.AddPoint(bbox[0], bbox[3])
+        ring.AddPoint(bbox[2], bbox[3])
+        ring.AddPoint(bbox[2], bbox[1])
+        ring.AddPoint(bbox[0], bbox[1])
+        # Create polygon
+        poly = ogr.Geometry(ogr.wkbPolygon)
+        poly.AddGeometry(ring)
+        return poly
+
+    @classmethod
     def tuple_2_point(cls,tup):
     def tuple_2_point(cls,tup):
         point = ogr.Geometry(ogr.wkbPoint)
         point = ogr.Geometry(ogr.wkbPoint)
         point.AddPoint(tup[0], tup[1])
         point.AddPoint(tup[0], tup[1])

@@ -51,8 +51,8 @@ class SliceScheme:
         col = int(col)
         col = int(col)
         detaxy = parameter.get(str(level)).get("resolution")* parameter.get("cols")
         detaxy = parameter.get(str(level)).get("resolution")* parameter.get("cols")
 
 
-        minx = detaxy*col + parameter.get("x")
-        maxy = -detaxy*row +parameter.get("y")
+        minx = detaxy * col + parameter.get("x")
+        maxy = -detaxy * row + parameter.get("y")
         maxx = detaxy + minx
         maxx = detaxy + minx
         miny = -detaxy + maxy
         miny = -detaxy + maxy
 
 

@@ -5,15 +5,42 @@
 import datetime
 import datetime
 import os
 import os
 
 
+import logging
+
 class StructurePrint:
 class StructurePrint:
 
 
+    # 单例模式作为打印
+    singleton = None
+    f = None
+
+
+    def __new__(cls, *args, **kwargs):
+        if not cls.singleton:
+            cls.singleton = super().__new__(cls)
+        return cls.singleton
+
     log_file = os.path.join(os.path.dirname(
     log_file = os.path.join(os.path.dirname(
         os.path.dirname(
         os.path.dirname(
             os.path.dirname(
             os.path.dirname(
                 os.path.dirname(
                 os.path.dirname(
                     os.path.realpath(__file__))))), "logs", "log.txt")
                     os.path.realpath(__file__))))), "logs", "log.txt")
-    @classmethod
-    def print(cls,mes, type="info"):
-        with open(cls.log_file,"a",encoding="utf-8") as f:
+
+    def __init__(self):
+        if not self.f:
+            self.f = open(self.log_file,"a",encoding="utf-8")
+
+
+    # def print(self,mes, type="info"):
+    #     message = "[{}] {} {}\n".format(type.upper(), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), mes)
+    #     self.f.write(message)
+    #     dd =1
+
+
+    def print(self,mes, type="info"):
+        with open(self.log_file,"a",encoding="utf-8") as f:
             message = "[{}] {} {}\n".format(type.upper(), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), mes)
             message = "[{}] {} {}\n".format(type.upper(), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), mes)
             f.write(message)
             f.write(message)
+
+
+
+

@@ -4,11 +4,11 @@
 deploy_ip_host = "172.26.40.105:8840"
 deploy_ip_host = "172.26.40.105:8840"
 # 系统数据库
 # 系统数据库
 
 
-SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager"
+SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager_test"
 
 
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
-VACUATE_DB_URI = None
-# VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
+#VACUATE_DB_URI = None
+VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 
 # 部署模式cluster，standalone
 # 部署模式cluster，standalone
 deployment_mode = "cluster"
 deployment_mode = "cluster"
@@ -17,6 +17,10 @@ application_name = "master"
 
 
 zookeeper = "172.26.99.168:2181"
 zookeeper = "172.26.99.168:2181"
 
 
+#WMTS服务器
+wmts_url = "http://172.26.99.160:6080"
+
+
 # 固定配置不需要修改
 # 固定配置不需要修改
 swagger_configure = {"title": "DMapManager"}
 swagger_configure = {"title": "DMapManager"}
 entry_data_thread = 3
 entry_data_thread = 3

 #! /bin/sh
 #! /bin/sh
-
+dn="dmapmanager"
 #停止容器
 #停止容器
 echo "正在关闭容器..."
 echo "正在关闭容器..."
-docker stop dmapmanager
-docker rm dmapmanager
+docker stop $dn
+docker rm $dn
 
 
 curPath=$(readlink -f $(dirname $0))
 curPath=$(readlink -f $(dirname $0))
 
 
@@ -24,7 +24,7 @@ fi
 #启动容器和apache
 #启动容器和apache
 echo "正在启动容器..."
 echo "正在启动容器..."
 set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
 set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
-docker run -d --name dmapmanager $set -p $port:80 -v $curPath:/usr/src/app -v $curPath/httpd.conf:/etc/httpd/conf/httpd.conf dci/dmapmanager:4.0 /usr/sbin/init
-docker exec -d dmapmanager systemctl start httpd
+docker run -d --name $dn $set -p $port:80 -v $curPath:/usr/src/app -v $curPath/httpd.conf:/etc/httpd/conf/httpd.conf dci/dmapmanager:4.0 /usr/sbin/init
+docker exec -d $dn systemctl start httpd
 sleep 5
 sleep 5
 curl localhost:$port/release
 curl localhost:$port/release

 #! /bin/bash
 #! /bin/bash
-docker stop dmapmanager
-docker rm dmapmanager
+dn="dmapmanager"
+#停止容器
+echo "正在关闭容器..."
+docker stop $dn
+docker rm $dn
 curPath=$(readlink -f "$(dirname "$0")")
 curPath=$(readlink -f "$(dirname "$0")")
 #设置端口
 #设置端口
 port=""
 port=""
@@ -11,7 +14,7 @@ else
   port=$1
   port=$1
   echo "端口设置为$1 ..."
   echo "端口设置为$1 ..."
 fi
 fi
-docker run -d --name dmapmanager -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapdms:4.0 gunicorn -c gun_conf.py run:app
+docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapdms:4.0 gunicorn -c gun_conf.py run:app
 # 清除未完成的任务任务
 # 清除未完成的任务任务
 sleep 5
 sleep 5
 curl localhost:$port/release
 curl localhost:$port/release

 #! /bin/bash
 #! /bin/bash
-docker stop dmapmanager
-docker rm dmapmanager
+dn="dmapmanager"
+#停止容器
+echo "正在关闭容器..."
+docker stop $dn
+docker rm $dn
+
 curPath=$(readlink -f "$(dirname "$0")")
 curPath=$(readlink -f "$(dirname "$0")")
 #设置端口
 #设置端口
 port=""
 port=""
@@ -12,7 +16,7 @@ else
   echo "端口设置为$1 ..."
   echo "端口设置为$1 ..."
 fi
 fi
 
 
-docker run -d --name dmapmanager -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapdms:3.0 python3 ./run.py
+docker run -d --name $dn -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0  -p $port:8840 -v $curPath:/usr/src/app -w /usr/src/app dci/dmapdms:3.0 python3 ./run.py
 # 清除未完成的任务任务
 # 清除未完成的任务任务
 sleep 5
 sleep 5
 curl localhost:$port/release
 curl localhost:$port/release