2022.01.12 基于新镜像，修复一些bug

+From osgeo/gdal:ubuntu-small-3.4.1
 
 
 
 
+WORKDIR /root
+#设置编码
+ENV LANG=en_US.UTF-8
+#设置时区
+ENV TZ=Asia/Shanghai
+
+
+RUN apt-get update
+#安装pip
+RUN apt-get install python3-pip -y
+
+#安装opencv所需依赖库
+RUN apt-get install libgl1-mesa-glx -y
+RUN apt-get install libglib2.0-dev -y
+
+#安装apache2
+RUN apt-get install apache2 -y
+RUN apt-get install apache2-dev -y
+
+
+#安装依赖
+COPY . .
+RUN pip install -r requirements.txt -i https://pypi.tuna.tsinghua.edu.cn/simple/ --trusted-host pypi.tuna.tsinghua.edu.cn
+
+
+RUN mod_wsgi-express install-module

+# This is the main Apache server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See http://httpd.apache.org/docs/2.4/ for detailed information about
+# the directives and /usr/share/doc/apache2/README.Debian about Debian specific
+# hints.
+#
+#
+# Summary of how the Apache 2 configuration works in Debian:
+# The Apache 2 web server configuration in Debian is quite different to
+# upstream's suggested way to configure the web server. This is because Debian's
+# default Apache2 installation attempts to make adding and removing modules,
+# virtual hosts, and extra configuration directives as flexible as possible, in
+# order to make automating the changes and administering the server as easy as
+# possible.
+
+# It is split into several files forming the configuration hierarchy outlined
+# below, all located in the /etc/apache2/ directory:
+#
+#	/etc/apache2/
+#	|-- apache2.conf
+#	|	`--  ports.conf
+#	|-- mods-enabled
+#	|	|-- *.load
+#	|	`-- *.conf
+#	|-- conf-enabled
+#	|	`-- *.conf
+# 	`-- sites-enabled
+#	 	`-- *.conf
+#
+#
+# * apache2.conf is the main configuration file (this file). It puts the pieces
+#   together by including all remaining configuration files when starting up the
+#   web server.
+#
+# * ports.conf is always included from the main configuration file. It is
+#   supposed to determine listening ports for incoming connections which can be
+#   customized anytime.
+#
+# * Configuration files in the mods-enabled/, conf-enabled/ and sites-enabled/
+#   directories contain particular configuration snippets which manage modules,
+#   global configuration fragments, or virtual host configurations,
+#   respectively.
+#
+#   They are activated by symlinking available configuration files from their
+#   respective *-available/ counterparts. These should be managed by using our
+#   helpers a2enmod/a2dismod, a2ensite/a2dissite and a2enconf/a2disconf. See
+#   their respective man pages for detailed information.
+#
+# * The binary is called apache2. Due to the use of environment variables, in
+#   the default configuration, apache2 needs to be started/stopped with
+#   /etc/init.d/apache2 or apache2ctl. Calling /usr/bin/apache2 directly will not
+#   work with the default configuration.
+
+
+# Global configuration
+#
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# NOTE!  If you intend to place this on an NFS (or otherwise network)
+# mounted filesystem then please read the Mutex documentation (available
+# at <URL:http://httpd.apache.org/docs/2.4/mod/core.html#mutex>);
+# you will save yourself a lot of trouble.
+#
+# Do NOT add a slash at the end of the directory path.
+#
+#ServerRoot "/etc/apache2"
+
+#
+# The accept serialization lock file MUST BE STORED ON A LOCAL DISK.
+#
+#Mutex file:${APACHE_LOCK_DIR} default
+
+#
+# The directory where shm and other runtime files will be stored.
+#
+
+DefaultRuntimeDir ${APACHE_RUN_DIR}
+
+#
+# PidFile: The file in which the server should record its process
+# identification number when it starts.
+# This needs to be set in /etc/apache2/envvars
+#
+PidFile ${APACHE_PID_FILE}
+
+#
+# Timeout: The number of seconds before receives and sends time out.
+#
+Timeout 300
+
+#
+# KeepAlive: Whether or not to allow persistent connections (more than
+# one request per connection). Set to "Off" to deactivate.
+#
+KeepAlive On
+
+#
+# MaxKeepAliveRequests: The maximum number of requests to allow
+# during a persistent connection. Set to 0 to allow an unlimited amount.
+# We recommend you leave this number high, for maximum performance.
+#
+MaxKeepAliveRequests 100
+
+#
+# KeepAliveTimeout: Number of seconds to wait for the next request from the
+# same client on the same connection.
+#
+KeepAliveTimeout 5
+
+
+# These need to be set in /etc/apache2/envvars
+User ${APACHE_RUN_USER}
+Group ${APACHE_RUN_GROUP}
+
+#
+# HostnameLookups: Log the names of clients or just their IP addresses
+# e.g., www.apache.org (on) or 204.62.129.132 (off).
+# The default is off because it'd be overall better for the net if people
+# had to knowingly turn this feature on, since enabling it means that
+# each client request will result in AT LEAST one lookup request to the
+# nameserver.
+#
+HostnameLookups Off
+
+# ErrorLog: The location of the error log file.
+# If you do not specify an ErrorLog directive within a <VirtualHost>
+# container, error messages relating to that virtual host will be
+# logged here.  If you *do* define an error logfile for a <VirtualHost>
+# container, that host's errors will be logged there and not here.
+#
+ErrorLog ${APACHE_LOG_DIR}/error.log
+
+#
+# LogLevel: Control the severity of messages logged to the error_log.
+# Available values: trace8, ..., trace1, debug, info, notice, warn,
+# error, crit, alert, emerg.
+# It is also possible to configure the log level for particular modules, e.g.
+# "LogLevel info ssl:warn"
+#
+LogLevel warn
+
+# Include module configuration:
+IncludeOptional mods-enabled/*.load
+IncludeOptional mods-enabled/*.conf
+
+# Include list of ports to listen on
+Include ports.conf
+
+
+# Sets the default security model of the Apache2 HTTPD server. It does
+# not allow access to the root filesystem outside of /usr/share and /var/www.
+# The former is used by web applications packaged in Debian,
+# the latter may be used for local directories served by the web server. If
+# your system is serving content from a sub-directory in /srv you must allow
+# access here, or in any related virtual host.
+<Directory />
+	Options FollowSymLinks
+	AllowOverride None
+	Require all denied
+</Directory>
+
+<Directory /usr/share>
+	AllowOverride None
+	Require all granted
+</Directory>
+
+<Directory /var/www/>
+	Options Indexes FollowSymLinks
+	AllowOverride None
+	Require all granted
+</Directory>
+
+#<Directory /srv/>
+#	Options Indexes FollowSymLinks
+#	AllowOverride None
+#	Require all granted
+#</Directory>
+
+
+
+
+# AccessFileName: The name of the file to look for in each directory
+# for additional configuration directives.  See also the AllowOverride
+# directive.
+#
+AccessFileName .htaccess
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being
+# viewed by Web clients.
+#
+<FilesMatch "^\.ht">
+	Require all denied
+</FilesMatch>
+
+
+#
+# The following directives define some format nicknames for use with
+# a CustomLog directive.
+#
+# These deviate from the Common Log Format definitions in that they use %O
+# (the actual bytes sent including headers) instead of %b (the size of the
+# requested file), because the latter makes it impossible to detect partial
+# requests.
+#
+# Note that the use of %{X-Forwarded-For}i instead of %h is not recommended.
+# Use mod_remoteip instead.
+#
+LogFormat "%v:%p %h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" vhost_combined
+LogFormat "%h %l %u %t \"%r\" %>s %O \"%{Referer}i\" \"%{User-Agent}i\"" combined
+LogFormat "%h %l %u %t \"%r\" %>s %O" common
+LogFormat "%{Referer}i -> %U" referer
+LogFormat "%{User-agent}i" agent
+
+# Include of directories ignores editors' and dpkg's backup files,
+# see README.Debian for details.
+
+# Include generic snippets of statements
+IncludeOptional conf-enabled/*.conf
+
+# Include the virtual host configurations:
+IncludeOptional sites-enabled/*.conf
+
+LoadModule wsgi_module "/usr/lib/apache2/modules/mod_wsgi-py38.cpython-38-x86_64-linux-gnu.so"
+WSGIPythonHome "/usr"

@@ -17,6 +17,7 @@ from . import database_edit
 from . import database_alias_check
 from . import database_alias_check
 from . import database_connect_test
 from . import database_connect_test
 from . import database_info
 from . import database_info
+from . import database_detail
 
 
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
@@ -88,10 +89,19 @@ class DataManager(BlueprintApi):
 
 
 
 
     @staticmethod
     @staticmethod
-    @bp.route('/Info', methods=['POST'])
+    @bp.route('/Info', methods=["POST"])
     @swag_from(database_info.Api.api_doc)
     @swag_from(database_info.Api.api_doc)
     def api_database_info():
     def api_database_info():
         """
         """
         数据源信息
         数据源信息
         """
         """
-        return database_info.Api().result
+        return database_info.Api().result
+
+    @staticmethod
+    @bp.route('/Detail', methods=["POST"])
+    @swag_from(database_detail.Api.api_doc)
+    def api_database_detail():
+        """
+        数据源detail
+        """
+        return database_detail.Api().result

+# coding=utf-8
+#author:        4N
+#createtime:    2021/3/9
+#email:         nheweijun@sina.com
+
+
+from ..models import Database
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.ModelVisitor import ModelVisitor
+
+
+class Api(ApiTemplate):
+    api_name = "获取数据库Detial"
+    def process(self):
+        # 返回结果
+        res = {}
+        try:
+            # 业务逻辑
+            database_guid = self.para.get("guid")
+            database = Database.query.filter_by(guid=database_guid).one_or_none()
+            if not database:
+                raise Exception("数据库不存在！")
+
+            res["data"] = ModelVisitor.object_to_json(database)
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+    api_doc={
+    "tags":["数据库接口"],
+    "parameters":[
+        {"name": "guid",
+         "in": "formData",
+         "type": "string", "description": "数据库guid"}
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }

@@ -93,4 +93,4 @@ class Api(ApiTemplate):
             }
             }
             }
             }
         }
         }
-    }
+    }

@@ -45,11 +45,13 @@ class Api(ApiTemplate):
                 datab_json = ModelVisitor.database_to_json(datab)
                 datab_json = ModelVisitor.database_to_json(datab)
                 datab_json["table_count"] = table_count
                 datab_json["table_count"] = table_count
                 datab_json["available"] = available
                 datab_json["available"] = available
+                del datab_json["connectstr"]
                 res["data"]["list"].append(datab_json)
                 res["data"]["list"].append(datab_json)
 
 
             # 可用非可用排序
             # 可用非可用排序
             sorted_list = [dat for dat in res["data"]["list"] if dat["available"]==1]
             sorted_list = [dat for dat in res["data"]["list"] if dat["available"]==1]
             sorted_list.extend([dat for dat in res["data"]["list"] if dat["available"] == -1])
             sorted_list.extend([dat for dat in res["data"]["list"] if dat["available"] == -1])
+
             res["data"]["list"] = sorted_list
             res["data"]["list"] = sorted_list
             res["result"]=True
             res["result"]=True
         except Exception as e:
         except Exception as e:

@@ -14,7 +14,7 @@ from . import feature_delete
 from . import feature_schema
 from . import feature_schema
 from . import feature_edit
 from . import feature_edit
 
 
-class DataManager(BlueprintApi):
+class DataManager():
 
 
     bp = Blueprint("FeatureService", __name__, url_prefix="/API/FeatureService")
     bp = Blueprint("FeatureService", __name__, url_prefix="/API/FeatureService")
     service_type = []
     service_type = []

@@ -115,7 +115,7 @@ class Api(ApiTemplate):
 
 
             task:Task = task_writer.session.query(Task).filter_by(guid=task_guid).one_or_none()
             task:Task = task_writer.session.query(Task).filter_by(guid=task_guid).one_or_none()
             parameter = json.loads(task.parameter)
             parameter = json.loads(task.parameter)
-            task_writer.update_task({"state": 2, "prcess": "入库中"})
+            task_writer.update_task({"state": 2, "process": "入库中"})
 
 
             #处理修改入库信息
             #处理修改入库信息
             metas: list = json.loads(parameter.get("meta").__str__())
             metas: list = json.loads(parameter.get("meta").__str__())
@@ -132,7 +132,7 @@ class Api(ApiTemplate):
                     origin_name = layer_name
                     origin_name = layer_name
                     no = 1
                     no = 1
 
 
-                    while (overwrite.__eq__("no") and pg_ds.GetLayerByName(layer_name)) or sys_session.query(
+                    while (overwrite.__eq__("no") and pg_ds.GetLayerByName(layer_name)) or task_writer.session.query(
                             InsertingLayerName).filter_by(name=layer_name).one_or_none():
                             InsertingLayerName).filter_by(name=layer_name).one_or_none():
                         layer_name = origin_name + "_{}".format(no)
                         layer_name = origin_name + "_{}".format(no)
                         no += 1
                         no += 1

@@ -23,6 +23,7 @@ from . import table_vacuate_info
 from . import table_vacuate_ref
 from . import table_vacuate_ref
 from . import table_vacuate_delete
 from . import table_vacuate_delete
 from . import field_value
 from . import field_value
+from . import table_check
 class DataManager(BlueprintApi):
 class DataManager(BlueprintApi):
 
 
     bp = Blueprint("DataManager", __name__, url_prefix="/API/Manager")
     bp = Blueprint("DataManager", __name__, url_prefix="/API/Manager")
@@ -93,6 +94,15 @@ class DataManager(BlueprintApi):
         """
         """
         return table_info.Api().result
         return table_info.Api().result
 
 
+    @staticmethod
+    @bp.route('/TableCheck', methods=['POST'])
+    @swag_from(table_check.Api.api_doc)
+    def table_check():
+        """
+        检查表是否存在
+        """
+        return table_check.Api().result
+
 
 
     @staticmethod
     @staticmethod
     @bp.route('/TableRefresh', methods=['POST'])
     @bp.route('/TableRefresh', methods=['POST'])

+#author:        4N
+#createtime:    2021/1/27
+#email:         nheweijun@sina.com
+
+from ..models import Table,DES,Database
+from app.util.component.ApiTemplate import ApiTemplate
+from app.util.component.PGUtil import PGUtil
+from osgeo.ogr import Layer
+
+class Api(ApiTemplate):
+
+    api_name = "检查表是否存在"
+
+    def process(self):
+        res = {}
+        pg_ds = None
+        try:
+            table_names = self.para.get("table_names")
+            database_guid = self.para.get("database_guid")
+
+            res["data"] = []
+            database = Database.query.filter_by(guid=database_guid).one_or_none()
+            if not database:
+                raise Exception("数据源不存在！")
+            pg_ds = PGUtil.open_pg_data_source(0, DES.decode(database.sqlalchemy_uri))
+            if not pg_ds:
+                raise Exception("数据源连接失败！")
+
+            for table_name in table_names.split(","):
+
+                layer:Layer = pg_ds.GetLayerByName(table_name)
+                table = Table.query.filter_by(database_guid=database_guid,name=table_name).one_or_none()
+
+
+                if table and layer:
+                    exist = True
+                    table_guid = table.guid
+                else:
+                    exist = False
+                    table_guid = None
+
+                res["data"].append({"table_name": table_name, "exist": exist,"table_guid":table_guid})
+
+
+            res["result"] = True
+
+        except Exception as e:
+            raise e
+        finally:
+            if pg_ds:
+                try:
+                    pg_ds.Destroy()
+                except:
+                    pass
+        return res
+    
+    api_doc={
+    "tags":["管理接口"],
+    "parameters":[
+        {"name": "table_names",
+         "in": "formData",
+         "type": "string",
+         "description": "表table_names,多个用,相隔","required":"true"},
+        {"name": "database_guid",
+         "in": "formData",
+         "type": "string",
+         "description": "database guid", "required": "true"},
+    ],
+    "responses":{
+        200:{
+            "schema":{
+                "properties":{
+                }
+            }
+            }
+        }
+    }

@@ -58,7 +58,7 @@ class Api(ApiTemplate):
 
 
             if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none():
             if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none():
                 res["result"] = False
                 res["result"] = False
-                res["msg"] = "数据精化中！"
+                res["msg"] = "矢量金字塔构建中！"
                 return res
                 return res
             if table.table_type==0:
             if table.table_type==0:
                 res["result"] = False
                 res["result"] = False
@@ -73,7 +73,7 @@ class Api(ApiTemplate):
 
 
 
 
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
-                        name="{}精化".format(table.name),
+                        name="{}矢量金字塔构建".format(table.name),
                         table_guid=table_guid,
                         table_guid=table_guid,
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,
@@ -81,14 +81,14 @@ class Api(ApiTemplate):
                         creator=self.para.get("creator"),
                         creator=self.para.get("creator"),
                         file_name=None,
                         file_name=None,
                         database_guid=table.database_guid,
                         database_guid=table.database_guid,
-                        process="精化中",
+                        process="构建中",
                         task_pid= vacuate_process.pid
                         task_pid= vacuate_process.pid
                         # parameter=",".join([str(x) for x in ref_grids])
                         # parameter=",".join([str(x) for x in ref_grids])
                         )
                         )
 
 
             db.session.add(task)
             db.session.add(task)
             db.session.commit()
             db.session.commit()
-            res["msg"] = "图层抽稀已提交！"
+            res["msg"] = "矢量金字塔构建已提交！"
             res["data"] = task_guid
             res["data"] = task_guid
             res["result"] = True
             res["result"] = True
 
 
@@ -113,8 +113,8 @@ class Api(ApiTemplate):
             task_writer = TaskWriter(task_guid)
             task_writer = TaskWriter(task_guid)
 
 
             task_writer.update_table(table.guid,{"is_vacuate": 2, "update_time": datetime.datetime.now()})
             task_writer.update_table(table.guid,{"is_vacuate": 2, "update_time": datetime.datetime.now()})
-            task_writer.update_task({"state":2,"process":"精华中"})
-            task_writer.update_process("开始精化...")
+            task_writer.update_task({"state":2,"process":"构建中"})
+            task_writer.update_process("开始构建...")
 
 
             database = task_writer.session.query(Database).filter_by(guid=table.database_guid).one_or_none()
             database = task_writer.session.query(Database).filter_by(guid=table.database_guid).one_or_none()
             database_sqlalchemy_uri = str(database.sqlalchemy_uri)
             database_sqlalchemy_uri = str(database.sqlalchemy_uri)
@@ -167,13 +167,13 @@ class Api(ApiTemplate):
                                              connectstr=DES.encode(connectstr))
                                              connectstr=DES.encode(connectstr))
                 task_writer.session.add(table_vacuate)
                 task_writer.session.add(table_vacuate)
 
 
-            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process": "精化完成"})
+            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process": "构建完成"})
             task_writer.update_table(table.guid, {"is_vacuate": 1, "update_time": datetime.datetime.now()})
             task_writer.update_table(table.guid, {"is_vacuate": 1, "update_time": datetime.datetime.now()})
-            task_writer.update_process("精化完成！")
+            task_writer.update_process("构建完成！")
 
 
         except Exception as e:
         except Exception as e:
             try:
             try:
-                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "精化失败"})
+                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "构建失败"})
                 task_writer.update_table(table.guid, {"is_vacuate": 0, "update_time": datetime.datetime.now()})
                 task_writer.update_table(table.guid, {"is_vacuate": 0, "update_time": datetime.datetime.now()})
                 task_writer.update_process( e.__str__())
                 task_writer.update_process( e.__str__())
                 task_writer.update_process("任务中止！")
                 task_writer.update_process("任务中止！")

@@ -58,7 +58,7 @@ class Api(ApiTemplate):
 
 
             if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none():
             if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none():
                 res["result"] = False
                 res["result"] = False
-                res["msg"] = "数据精化中！"
+                res["msg"] = "矢量金字塔构建中！"
                 return res
                 return res
             if table.table_type==0:
             if table.table_type==0:
                 res["result"] = False
                 res["result"] = False
@@ -73,7 +73,7 @@ class Api(ApiTemplate):
 
 
 
 
             task = Task(guid=task_guid,
             task = Task(guid=task_guid,
-                        name="{}精化,网格大小:{}".format(table.name,self.para.get("grids")),
+                        name="{}矢量金字塔构建,网格大小:{}".format(table.name,self.para.get("grids")),
                         table_guid=table_guid,
                         table_guid=table_guid,
                         create_time=datetime.datetime.now(),
                         create_time=datetime.datetime.now(),
                         state=0,
                         state=0,
@@ -81,13 +81,13 @@ class Api(ApiTemplate):
                         creator=self.para.get("creator"),
                         creator=self.para.get("creator"),
                         file_name=None,
                         file_name=None,
                         database_guid=table.database_guid,
                         database_guid=table.database_guid,
-                        process="精化中",
+                        process="构建中",
                         parameter=self.para.get("grids"),
                         parameter=self.para.get("grids"),
                         task_pid=vacuate_process.pid)
                         task_pid=vacuate_process.pid)
 
 
             db.session.add(task)
             db.session.add(task)
             db.session.commit()
             db.session.commit()
-            res["msg"] = "图层抽稀已提交！"
+            res["msg"] = "矢量金字塔构建已提交！"
             res["data"] = task_guid
             res["data"] = task_guid
             res["result"] = True
             res["result"] = True
 
 
@@ -113,8 +113,8 @@ class Api(ApiTemplate):
             task_writer =  TaskWriter(task_guid)
             task_writer =  TaskWriter(task_guid)
 
 
             task_writer.update_table(table.guid,{"is_vacuate": 2, "update_time": datetime.datetime.now()})
             task_writer.update_table(table.guid,{"is_vacuate": 2, "update_time": datetime.datetime.now()})
-            task_writer.update_task({"state":2,"process":"精华中"})
-            task_writer.update_process("开始精化...")
+            task_writer.update_task({"state":2,"process":"构建中"})
+            task_writer.update_process("开始构建...")
 
 
             database = task_writer.session.query(Database).filter_by(guid=table.database_guid).one_or_none()
             database = task_writer.session.query(Database).filter_by(guid=table.database_guid).one_or_none()
             database_sqlalchemy_uri = str(database.sqlalchemy_uri)
             database_sqlalchemy_uri = str(database.sqlalchemy_uri)
@@ -168,13 +168,13 @@ class Api(ApiTemplate):
                                              pixel_distance=vacuate_process.this_gridsize[l],
                                              pixel_distance=vacuate_process.this_gridsize[l],
                                              connectstr=DES.encode(connectstr))
                                              connectstr=DES.encode(connectstr))
                 task_writer.session.add(table_vacuate)
                 task_writer.session.add(table_vacuate)
-            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process" : "精化完成"})
+            task_writer.update_task({"state":1,"update_time":datetime.datetime.now(),"process" : "构建完成"})
             task_writer.update_table(table.guid,{"is_vacuate": 1, "update_time": datetime.datetime.now()})
             task_writer.update_table(table.guid,{"is_vacuate": 1, "update_time": datetime.datetime.now()})
-            task_writer.update_process("精化完成！")
+            task_writer.update_process("构建完成！")
 
 
         except Exception as e:
         except Exception as e:
             try:
             try:
-                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "精化失败"})
+                task_writer.update_task({"state": -1,"update_time":datetime.datetime.now(),"process": "构建失败"})
                 task_writer.update_table(table.guid, {"is_vacuate": origin_vacuate, "update_time": datetime.datetime.now()})
                 task_writer.update_table(table.guid, {"is_vacuate": origin_vacuate, "update_time": datetime.datetime.now()})
                 task_writer.update_process( e.__str__())
                 task_writer.update_process( e.__str__())
                 task_writer.update_process("任务中止！")
                 task_writer.update_process("任务中止！")

@@ -8,7 +8,7 @@ from ..models import Table,Database,DES
 from sqlalchemy.engine import ResultProxy
 from sqlalchemy.engine import ResultProxy
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
-
+import json
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "数据浏览"
     api_name = "数据浏览"
     def process(self):
     def process(self):
@@ -35,27 +35,35 @@ class Api(ApiTemplate):
 
 
             res["data"]["count"]=PGUtil.get_table_count(table.name,db_session)
             res["data"]["count"]=PGUtil.get_table_count(table.name,db_session)
 
 
+            pkey = PGUtil.get_pkey(table.name,db_session)
+
             res["data"]["list"]=[]
             res["data"]["list"]=[]
             for row_proxy in query_result:
             for row_proxy in query_result:
+                pkey_dict = {}
                 d = {}
                 d = {}
                 for column, value in row_proxy.items():
                 for column, value in row_proxy.items():
                     #跳过空间列
                     #跳过空间列
                     if geom_col:
                     if geom_col:
                         if column.__eq__(geom_col):
                         if column.__eq__(geom_col):
                             continue
                             continue
+                    if pkey:
+                        if column == pkey:
+                            pkey_dict[column]=value
+                            continue
                     #格式化时间列
                     #格式化时间列
                     if isinstance(value, datetime.datetime):
                     if isinstance(value, datetime.datetime):
                         d[column] = value.strftime('%Y-%m-%d %H:%M:%S')
                         d[column] = value.strftime('%Y-%m-%d %H:%M:%S')
                     else:
                     else:
                         d[column]=value
                         d[column]=value
-                res["data"]["list"].append(d)
+                pkey_dict.update(d)
+                res["data"]["list"].append(pkey_dict)
             res["result"]=True
             res["result"]=True
         except Exception as e:
         except Exception as e:
             raise Exception("数据库连接失败！")
             raise Exception("数据库连接失败！")
         finally:
         finally:
             if db_session:
             if db_session:
                 db_session.close()
                 db_session.close()
-        return res
+        return json.dumps(res)
     
     
     api_doc={
     api_doc={
     "tags":["管理接口"],
     "tags":["管理接口"],

@@ -73,7 +73,7 @@ class Api(ApiTemplate):
         task_process = Process(guid=uuid.uuid1().__str__(), message=message, time=datetime.datetime.now(),
         task_process = Process(guid=uuid.uuid1().__str__(), message=message, time=datetime.datetime.now(),
                                task_guid=task.guid)
                                task_guid=task.guid)
 
 
-        db.add(task_process)
+        db.session.add(task_process)
         db.session.commit()
         db.session.commit()
         return None
         return None
 
 

@@ -14,6 +14,7 @@ from . import service_delete
 from . import service_state
 from . import service_state
 from . import service_info
 from . import service_info
 from . import service_edit
 from . import service_edit
+from . import service_reload
 import os
 import os
 from flask import send_from_directory
 from flask import send_from_directory
 
 
@@ -88,6 +89,14 @@ class DataManager(BlueprintApi):
         """
         """
         return service_edit.Api().result
         return service_edit.Api().result
 
 
+    @staticmethod
+    @bp.route('/Reload', methods=['POST','GET'])
+    @swag_from(service_reload.Api.api_doc)
+    def api_service_reload():
+        """
+        服务重载
+        """
+        return service_reload.Api().result
 
 
 
 
     @staticmethod
     @staticmethod

@@ -12,7 +12,7 @@ from . import service_engine_delete
 from . import service_engine_edit
 from . import service_engine_edit
 from . import service_engine_list
 from . import service_engine_list
 from . import service_engine_info
 from . import service_engine_info
-
+from . import service_engine_deploy
 class EngineManager(BlueprintApi):
 class EngineManager(BlueprintApi):
 
 
     bp = Blueprint("Engine", __name__, url_prefix="/API/Service/Engine")
     bp = Blueprint("Engine", __name__, url_prefix="/API/Service/Engine")
@@ -62,3 +62,13 @@ class EngineManager(BlueprintApi):
         Engine Delete
         Engine Delete
         """
         """
         return service_engine_delete.Api().result
         return service_engine_delete.Api().result
+
+
+    @staticmethod
+    @bp.route('/ImageServerDeploy', methods=['GET'])
+    @swag_from(service_engine_deploy.Api.api_doc)
+    def service_engine_deploy():
+        """
+        Engine Deploy
+        """
+        return service_engine_deploy.Api().result

@@ -4,16 +4,21 @@
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from app.modules.service.models import ServiceEngine,db
+from app.modules.service.models import ServiceEngine,db,Service
 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")
             guid = self.para.get("guid")
-            service_engine = ServiceEngine.query.filter_by(guid=guid).one_or_none()
+            service_engine:ServiceEngine = ServiceEngine.query.filter_by(guid=guid).one_or_none()
+
             if not service_engine:
             if not service_engine:
                 raise Exception("服务不存在！")
                 raise Exception("服务不存在！")
+            if service_engine.type=="AddServer":
+                add_service = Service.query.filter_by(url=service_engine.url).one_or_none()
+                if add_service:
+                    db.session.delete(add_service)
             db.session.delete(service_engine)
             db.session.delete(service_engine)
             db.session.commit()
             db.session.commit()
             res["result"] = True
             res["result"] = True

+# coding=utf-8
+#author:        4N
+#createtime:    2021/9/14
+#email:         nheweijun@sina.com
+
+from app.util.component.ApiTemplate import ApiTemplate
+from app.modules.service.models import ServiceEngine
+from app.util.component.StructuredPrint import StructurePrint
+import requests
+import uuid
+
+class Api(ApiTemplate):
+
+    api_name = "影像服务引擎Depoly"
+
+    def process(self):
+        res = {}
+        try:
+            res["data"] = []
+            image_servers = ServiceEngine.query.filter_by(type="ImageServer").all()
+            for imgs in image_servers:
+                try :
+                    url = "{}/API/Deploy/Topology".format(imgs.url)
+                    resp: requests.Response = requests.get(url, timeout=1)
+                    resp.encoding = "utf-8"
+                    resp_json = resp.json()
+                    res["data"].append({"id":uuid.uuid1().__str__(),
+                                        "name":"影像服务器",
+                                        "url":imgs.url,
+                                        "type": 0,
+                                        "children":[{
+                                            "name": "数据服务器",
+                                            "url": ser,
+                                            "type": 1,
+                                            "id":uuid.uuid1().__str__()
+                                        } for ser in resp_json.get("data")]})
+                except:
+                    StructurePrint().print("连接影像服务引擎失败！","error")
+            res["result"] = True
+        except Exception as e:
+            raise e
+        return res
+
+
+    api_doc = {
+        "tags": ["引擎接口"],
+        "parameters": [
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -48,7 +48,7 @@ class Api(ApiTemplate):
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "enum":["ImageServer"]},
+             "enum":["ImageServer","AddServer"]},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -5,10 +5,10 @@
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 import requests
 import requests
-from app.modules.service.models import ServiceEngine,db
+from app.modules.service.models import ServiceEngine,db,Service
 import datetime
 import datetime
 import uuid
 import uuid
-
+import configure
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "注册服务引擎"
     api_name = "注册服务引擎"
     def process(self):
     def process(self):
@@ -16,15 +16,41 @@ class Api(ApiTemplate):
         try:
         try:
             url = self.para.get("url")
             url = self.para.get("url")
             name = self.para.get("name")
             name = self.para.get("name")
-            response:requests.Response = requests.get(url)
+
+            if ServiceEngine.query.filter_by(url=url).one_or_none():
+                raise Exception("引擎已注册!")
+
+            response:requests.Response = requests.get(url,timeout=3)
             if response.status_code != 200:
             if response.status_code != 200:
                 raise Exception("服务引擎连接失败！")
                 raise Exception("服务引擎连接失败！")
-            service_engine = ServiceEngine(guid=uuid.uuid1().__str__(),
+
+            this_time = datetime.datetime.now()
+            engine_guid = uuid.uuid1().__str__()
+            service_engine = ServiceEngine(guid=engine_guid,
                                            name=name if name else response.json().get("Name"),
                                            name=name if name else response.json().get("Name"),
                                            url=url,
                                            url=url,
                                            type=response.json().get("Type"),
                                            type=response.json().get("Type"),
-                                           create_time=datetime.datetime.now()
+                                           create_time=this_time
                                            )
                                            )
+            #注册地址匹配引擎服务
+            if response.json().get("Type") == "AddServer":
+                response: requests.Response = requests.get("{}/Info".format(url),timeout=3)
+                add_name = response.json().get("name")
+                service = Service(
+                    guid=engine_guid,
+                    name=add_name,
+                    title=add_name,
+                    state=1,
+                    create_time=this_time,
+                    update_time=this_time,
+                    description="地址匹配",
+                    node=1,
+                    overview="{}/Thumbnail".format(url),
+                    type="地址匹配",
+                    url = url
+                )
+                db.session.add(service)
+
             db.session.add(service_engine)
             db.session.add(service_engine)
             db.session.commit()
             db.session.commit()
             res["result"] = True
             res["result"] = True

@@ -18,7 +18,7 @@ class Api(ApiTemplate):
             url = "{}/API/Service/Register".format(self.para.get("url"))
             url = "{}/API/Service/Register".format(self.para.get("url"))
             response:requests.Response = requests.post(url,data=self.para)
             response:requests.Response = requests.post(url,data=self.para)
             if not response.json().get("result"):
             if not response.json().get("result"):
-                raise Exception("由于{}，影像服务注册失败！".format(response.json().get("msg")))
+                raise Exception("由于{}影像服务注册失败！".format(response.json().get("msg")))
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
             raise e
             raise e

@@ -27,15 +27,16 @@ class Api(ApiTemplate):
 
 
 
 
             service_update = {"update_time":this_time}
             service_update = {"update_time":this_time}
-            map_service_update = {"updatetime":this_time}
+            map_service_update = {}
+
             for key in self.para.keys():
             for key in self.para.keys():
                 if key in ["name","title","state","description","overview","catalog_guid"]:
                 if key in ["name","title","state","description","overview","catalog_guid"]:
                     service_update[key] = self.para.get(key)
                     service_update[key] = self.para.get(key)
-                if key in ["name","status","description","username","readonly",
-                           "sid","stype","ssupply","sctime","company","abstract","thumbnail","layer_style"]:
+                if key in ["name","tile","project","capabilities"]:
                     map_service_update[key] = self.para.get(key)
                     map_service_update[key] = self.para.get(key)
 
 
 
 
+
             # 修改功能
             # 修改功能
             if functions:
             if functions:
                 new_types = functions.split(",")
                 new_types = functions.split(",")
@@ -97,48 +98,15 @@ class Api(ApiTemplate):
              "type": "string",
              "type": "string",
              "description": "[地图服务]服务能力，用逗号相隔"},
              "description": "[地图服务]服务能力，用逗号相隔"},
 
 
-
-            # MapService参数
-            {"name": "status",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]status"},
-            {"name": "username",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]username"},
-            {"name": "readonly",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]readonly"},
-            {"name": "sid",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]sid"},
-            {"name": "stype",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]stype"},
-            {"name": "ssupply",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]ssupply"},
-            {"name": "sctime",
+            #地图服务参数
+            {"name": "capabilities",
              "in": "formData",
              "in": "formData",
-             "type": "string",
-             "description": "[地图服务]sctime"},
-            {"name": "company",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]company"},
-            {"name": "abstract",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]abstract"},
-            {"name": "thumbnail",
+             "type": "int",
+             "description": "[地图服务]"},
+            {"name": "project",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[地图服务]thumbnail"},
+             "description": "[地图服务]project"},
 
 
         ],
         ],
         "responses": {
         "responses": {

@@ -9,6 +9,9 @@ import uuid
 from ..models import Service,db,MapService,ServiceFunction
 from ..models import Service,db,MapService,ServiceFunction
 import datetime
 import datetime
 import configure
 import configure
+import requests
+import json
+
 class Api(ApiTemplate):
 class Api(ApiTemplate):
 
 
     api_name = "注册MapService服务"
     api_name = "注册MapService服务"
@@ -22,23 +25,38 @@ class Api(ApiTemplate):
             this_time = datetime.datetime.now()
             this_time = datetime.datetime.now()
             service_guid = uuid.uuid1().__str__()
             service_guid = uuid.uuid1().__str__()
             map_service_guid = uuid.uuid1().__str__()
             map_service_guid = uuid.uuid1().__str__()
-            service_function_guid = uuid.uuid1().__str__()
-
 
 
             # 逻辑是，先调用引擎接口，引擎说可以，才做持久化
             # 逻辑是，先调用引擎接口，引擎说可以，才做持久化
+
+            para = {"name":self.para.get("name"),
+                    "title":self.para.get("title"),
+                    "type":"mapserver",
+                    "capabilities":2,
+                    "project":self.para.get("project")}
+
+            map_service_register_url = "{}/dmap/api/manager/regservice".format(configure.vector_engine)
+            resp: requests.Response  = requests.post(map_service_register_url,data=json.dumps(para),
+                                            headers={'Content-Type':'application/json'},timeout=3
+                                            )
+            resp.encoding="utf-8"
+            resp_json = resp.json()
+            if not resp_json["status"]=="1":
+                raise Exception("调用矢量服务的注册服务接口失败！")
+
             # 并获得服务缩略图
             # 并获得服务缩略图
 
 
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,
                 name = self.para.get("name"),
                 name = self.para.get("name"),
                 title = self.para.get("title"),
                 title = self.para.get("title"),
-                state = int(self.para.get("state")) if self.para.get("state") else None,
+                creator=self.para.get("creator"),
+                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 = Column(Integer),
                 node = 1 ,
                 node = 1 ,
-                overview = "xxxx",
+                overview = resp_json["url"],
                 type = self.para.get("type"),
                 type = self.para.get("type"),
                 catalog_guid = self.para.get("catalog_guid")
                 catalog_guid = self.para.get("catalog_guid")
             )
             )
@@ -46,41 +64,22 @@ class Api(ApiTemplate):
             map_service = MapService(
             map_service = MapService(
                 guid = map_service_guid,
                 guid = map_service_guid,
                 name = self.para.get("name"),
                 name = self.para.get("name"),
-                status = self.para.get("status"),
-                description=self.para.get("description"),
-                username = self.para.get("username"),
-                readonly = self.para.get("readonly"),
-                updatetime = this_time,
-                sid = int(self.para.get("sid")),
-                stype = self.para.get("stype"),
-                ssupply = self.para.get("ssupply"),
-                sctime = self.para.get("sctime"),
-                company = self.para.get("company"),
-                abstract = self.para.get("abstract"),
-                thumbnail = self.para.get("thumbnail"),
-                layer_style = self.para.get("layer_style"),
+                title = self.para.get("title"),
+                type = "mapserver",
+                capabilities = int(self.para.get("capabilities",2)),
+                project = self.para.get("project"),
                 service_guid = service_guid
                 service_guid = service_guid
             )
             )
 
 
-            service_function = ServiceFunction(guid=service_function_guid,type="WMS",
-                                               service_guid=service_guid)
+            service_function_wms = ServiceFunction(guid=uuid.uuid1().__str__(),type="WMS",service_guid=service_guid)
+            service_function_wfs = ServiceFunction(guid=uuid.uuid1().__str__(),type="WFS",service_guid=service_guid)
 
 
             db.session.add(service)
             db.session.add(service)
             db.session.add(map_service)
             db.session.add(map_service)
-            db.session.add(service_function)
+            db.session.add(service_function_wms)
+            db.session.add(service_function_wfs)
             db.session.commit()
             db.session.commit()
 
 
-            # 调用MapService服务的注册服务接口
-            try:
-                pass
-                #对，逻辑是，先调用引擎接口，引擎说可以，才做持久化
-            except Exception as e:
-                db.session.delete(service)
-                db.session.delete(map_service)
-                db.session.delete(service_function)
-                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:
@@ -108,7 +107,7 @@ class Api(ApiTemplate):
             {"name": "type",
             {"name": "type",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "enum": ["地图服务", "切片服务", "影像服务"],
+             "enum": ["地图服务"],
              "required": "true",
              "required": "true",
              "description": "[地图服务，切片服务，影像服务]"},
              "description": "[地图服务，切片服务，影像服务]"},
             {"name": "catalog_guid",
             {"name": "catalog_guid",
@@ -117,50 +116,16 @@ class Api(ApiTemplate):
              "description": "[地图服务，切片服务，影像服务]"},
              "description": "[地图服务，切片服务，影像服务]"},
 
 
 
 
-            {"name": "status",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]status"},
-            {"name": "username",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]username"},
-            {"name": "readonly",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]readonly"},
-            {"name": "sid",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]sid"},
-            {"name": "stype",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]stype"},
-            {"name": "ssupply",
+            #地图服务参数
+            {"name": "capabilities",
              "in": "formData",
              "in": "formData",
-             "type": "string",
-             "description": "[地图服务]ssupply"},
-            {"name": "sctime",
+             "type": "int",
+             "description": "[地图服务]"},
+            {"name": "project",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[地图服务]sctime"},
-            {"name": "company",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]company"},
-            {"name": "abstract",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]abstract"},
-            {"name": "thumbnail",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]thumbnail"},
-            {"name": "layer_style",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务,切片服务]layer_style"},
+             "description": "[地图服务]project"},
+
 
 
         ],
         ],
         "responses": {
         "responses": {

+# coding=utf-8
+#author:        4N
+#createtime:    2021/12/6
+#email:         nheweijun@sina.com
+
+
+from app.modules.service.models import TileScheme
+from app.util.component.ModelVisitor import ModelVisitor
+from app.util.component.StructuredPrint import StructurePrint
+import json
+import base64
+
+
+class ProjectFile:
+
+    @classmethod
+    def create(cls,para):
+        if para.get("tile_type").__eq__("WMTS"):
+
+            if para.get("scheme"):
+                tile_scheme = json.loads(para.get("scheme"))
+            else:
+                tile_scheme: TileScheme = TileScheme.query.filter_by(guid=para.get("scheme_guid")).one_or_none()
+                if not tile_scheme:
+                    raise Exception("切片方案不存在！")
+                tile_scheme = ModelVisitor.object_to_json(tile_scheme)
+
+            project_xml_format = '''
+<?xml version="1.0"?>
+<dmap projectname="wmtstest" version="4.0">
+  <projectCrs>
+    <spatialrefsys>
+      <wkt>{wkt}</wkt>
+      <proj4>{proj4}</proj4>
+      <srid>{srid}</srid>
+      <description/>
+      <projectionacronym/>
+    </spatialrefsys>
+  </projectCrs>
+  <projectlayers>
+    <maplayer name="{name}" alias="{alias}" type="0">
+      <extent>
+        <xmin>{xmin}</xmin>
+        <ymin>{ymin}</ymin>
+        <xmax>{xmax}</xmax>
+        <ymax>{ymax}</ymax>
+      </extent>
+      <style>{layer_style}</style>
+      <format>{layer_format}</format>
+      <vendor>{vendor}</vendor>
+      <datasource>{datasource}</datasource>
+      <tileMatrixSets>
+        <tileMatrixSet>
+          <id>default</id>
+          <crs>{crs}</crs>
+          <tileCols>{cols}</tileCols>
+          <tileRows>{rows}</tileRows>
+          <dpi>{dpi}</dpi>
+          <tileOrigin>
+            <X>{x}</X>
+            <Y>{y}</Y>
+          </tileOrigin>
+          <levels>
+            {levels}
+          </levels>
+        </tileMatrixSet>
+      </tileMatrixSets>
+    </maplayer>
+  </projectlayers>
+</dmap>
+'''
+
+            level_each = '''<level>
+              <id>{lev}</id>
+              <scaleDenominator>{scale}</scaleDenominator>
+              <resolution>{resolution}</resolution>
+            </level>
+            '''
+
+            levels = ''
+            for level in json.loads(tile_scheme.get("levels")):
+                levels = "{}{}".format(levels, level_each.format(lev=level["level"],
+                                                                 scale=level["scale"],
+                                                                 resolution=level["resolution"],
+                                                                 ))
+            #删除空格
+            levels = levels.strip()
+
+            layer_extent = para.get("layer_extent").split(",")
+
+            project_xml = project_xml_format.format(wkt="",
+                                                    proj4="",
+                                                    srid=para.get("crs").split("::")[-1],
+                                                    name=para.get("layer_name"),
+                                                    alias=para.get("alias") if para.get("alias") else "",
+                                                    xmin=layer_extent[0],
+                                                    xmax=layer_extent[1],
+                                                    ymin=layer_extent[2],
+                                                    ymax=layer_extent[3],
+                                                    layer_style=para.get("layer_style"),
+                                                    layer_format=para.get("layer_format"),
+                                                    vendor=para.get("vendor"),
+                                                    datasource=para.get("datasource"),
+                                                    crs=para.get("crs"),
+                                                    cols=tile_scheme.get("cols"),
+                                                    rows=tile_scheme.get("rows"),
+                                                    dpi=tile_scheme.get("dpi"),
+                                                    x=tile_scheme.get("top_left").split(",")[0],
+                                                    y=tile_scheme.get("top_left").split(",")[1],
+                                                    levels=levels
+                                                    )
+        else:
+
+            project_xml_format = '''
+<?xml version="1.0"?>
+<dmap projectname="tmstest" version="4.0">
+  <projectCrs>
+    <spatialrefsys>
+      <wkt>{wkt}</wkt>
+      <proj4>{proj4}</proj4>
+      <srid>{srid}</srid>
+      <description/>
+      <projectionacronym/>
+    </spatialrefsys>
+  </projectCrs>
+  <projectlayers>
+    <maplayer name="{name}" alias="{alias}" type="0">
+      <extent>
+        <xmin>{xmin}</xmin>
+        <ymin>{ymin}</ymin>
+        <xmax>{xmax}</xmax>
+        <ymax>{ymax}</ymax>
+      </extent>
+      <style>{layer_style}</style>
+      <format>{layer_format}</format>
+      <vendor>{vendor}</vendor>
+      <datasource>{datasource}</datasource>
+    </maplayer>
+  </projectlayers>
+</dmap>
+'''
+            layer_extent = para.get("layer_extent").split(",")
+            project_xml = project_xml_format.format(wkt="",
+                                                    proj4="",
+                                                    srid=para.get("crs").split("::")[-1],
+                                                    name=para.get("layer_name"),
+                                                    alias=para.get("alias") if para.get("alias") else "",
+                                                    xmin=layer_extent[0],
+                                                    xmax=layer_extent[1],
+                                                    ymin=layer_extent[2],
+                                                    ymax=layer_extent[3],
+                                                    layer_style=para.get("layer_style"),
+                                                    layer_format=para.get("layer_format"),
+                                                    vendor=para.get("vendor"),
+                                                    datasource=para.get("datasource"),
+                                                    )
+
+        project_xml = project_xml.strip()
+        return str(base64.b64encode(project_xml.encode('utf-8')), encoding="utf8")

+# coding=utf-8
+#author:        4N
+#createtime:    2021/12/31
+#email:         nheweijun@sina.com

@@ -29,7 +29,8 @@ class Service(db.Model):
     type = Column(String(256)) #地图服务，影像服务，切片服务
     type = Column(String(256)) #地图服务，影像服务，切片服务
     # 目录外键
     # 目录外键
     catalog_guid = Column(String(256), ForeignKey('dmap_service_catalog.guid'))
     catalog_guid = Column(String(256), ForeignKey('dmap_service_catalog.guid'))
-
+    # 创建者
+    creator = Column(String(256))
     url = Column(String(256))
     url = Column(String(256))
 
 
     relate_service_functions = relationship('ServiceFunction', backref='relate_service', lazy='dynamic')
     relate_service_functions = relationship('ServiceFunction', backref='relate_service', lazy='dynamic')
@@ -76,6 +77,9 @@ class TileScheme(db.Model):
     extent = Column(Text)
     extent = Column(Text)
     top_left = Column(String(256))
     top_left = Column(String(256))
 
 
+    # 创建者
+    creator = Column(String(256))
+
     levels = Column(Text)
     levels = Column(Text)
     dpi = Column(Integer)
     dpi = Column(Integer)
     rows = Column(Integer)
     rows = Column(Integer)
@@ -141,23 +145,11 @@ class MapService(db.Model):
     guid = Column(String(256), primary_key=True)
     guid = Column(String(256), primary_key=True)
     name = Column(String, unique=True)
     name = Column(String, unique=True)
 
 
-    #基本信息
-    status = Column(String)
-    description = Column(String)
-    #厂家
-    username = Column(String(256))
-
-    readonly = Column(String)
-    updatetime = Column(DateTime)
-    sid = Column(Integer)
-    stype = Column(String)
-    ssupply = Column(String)
-    sctime = Column(String)
-    company = Column(String)
-    abstract = Column(String)
-    title = Column(String)
-    thumbnail = Column(String)
-    layer_style = Column(Text)
+    title = Column(String(256))
+    type = Column(String(256))
+    capabilities = Column(Integer)
+    project = Column(Text)
+
     service_guid = Column(String,ForeignKey('dmap_service.guid'))
     service_guid = Column(String,ForeignKey('dmap_service.guid'))
 
 
 class ServiceEngine(db.Model):
 class ServiceEngine(db.Model):

@@ -45,6 +45,7 @@ class Api(ApiTemplate):
                 crs_wkt = data.get("crs_wkt"),
                 crs_wkt = data.get("crs_wkt"),
                 extent = data.get("extent"),
                 extent = data.get("extent"),
                 top_left =  data.get("top_left"),
                 top_left =  data.get("top_left"),
+                creator= data.get("creator"),
                 # ymin = extent[1],
                 # ymin = extent[1],
                 # xmax = extent[2],
                 # xmax = extent[2],
                 # ymax = extent[3],
                 # ymax = extent[3],
@@ -77,6 +78,9 @@ class Api(ApiTemplate):
             {"name": "alias",
             {"name": "alias",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
+            {"name": "creator",
+             "in": "formData",
+             "type": "string"},
             {"name": "description",
             {"name": "description",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},

@@ -27,18 +27,22 @@ class Api(ApiTemplate):
                 service = Service.query.filter_by(guid=guid).one_or_none()
                 service = Service.query.filter_by(guid=guid).one_or_none()
 
 
                 if service:
                 if service:
-                    if service.type.__eq__("切片服务"):
-                        #调用接口
-                        #172.26.99.160:6060/dmap/api/manager/deleteService?servername=tileserver&servicename=GDMap
-                        tile_service = TileService.query.filter_by(service_guid=guid).one_or_none()
-                        db.session.delete(tile_service)
 
 
-                    if service.type.__eq__("地图服务"):
-                        map_service = MapService.query.filter_by(service_guid=guid).one_or_none()
-                        db.session.delete(map_service)
-                    service_functions = service.relate_service_functions.all()
-                    for function in service_functions:
-                        db.session.delete(function)
+                    try:
+                        if service.type.__eq__("切片服务"):
+                            #调用接口
+                            tile_service = TileService.query.filter_by(service_guid=guid).one_or_none()
+                            db.session.delete(tile_service)
+
+                        if service.type.__eq__("地图服务"):
+                            map_service = MapService.query.filter_by(service_guid=guid).one_or_none()
+                            db.session.delete(map_service)
+                        service_functions = service.relate_service_functions.all()
+                        for function in service_functions:
+                            db.session.delete(function)
+                    except:
+                        pass
+
                     db.session.delete(service)
                     db.session.delete(service)
 
 
                 else:
                 else:

@@ -149,47 +149,15 @@ class Api(ApiTemplate):
              "type": "string",
              "type": "string",
              "description": "[切片服务]图层描述"},
              "description": "[切片服务]图层描述"},
 
 
-            # WMS参数
-            {"name": "status",
+            #地图服务参数
+            {"name": "capabilities",
              "in": "formData",
              "in": "formData",
-             "type": "string",
-             "description": "[地图服务]status"},
-            {"name": "username",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]username"},
-            {"name": "readonly",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]readonly"},
-            {"name": "sid",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]sid"},
-            {"name": "stype",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]stype"},
-            {"name": "ssupply",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]ssupply"},
-            {"name": "sctime",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]sctime"},
-            {"name": "company",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]company"},
-            {"name": "abstract",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]abstract"},
-            {"name": "thumbnail",
+             "type": "int",
+             "description": "[地图服务]"},
+            {"name": "project",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[地图服务]thumbnail"},
+             "description": "[地图服务]project"},
         ],
         ],
         "responses": {
         "responses": {
             200: {
             200: {

@@ -64,7 +64,7 @@ class Api(ApiTemplate):
 
 
             for ie in image_engines:
             for ie in image_engines:
                 url = "{}/API/Service/List".format(ie.url)
                 url = "{}/API/Service/List".format(ie.url)
-                response:requests.Response = requests.post(url,self.para)
+                response:requests.Response = requests.post(url,{"page_size":"9999","page_index":"0"})
                 if not response.json().get("result"):
                 if not response.json().get("result"):
                     raise Exception("修改影像服务失败！")
                     raise Exception("修改影像服务失败！")
                 else:
                 else:
@@ -95,7 +95,7 @@ class Api(ApiTemplate):
             # update时间倒数
             # update时间倒数
             services_json = sorted(services_json,key=lambda x:x["update_time"],reverse=True)
             services_json = sorted(services_json,key=lambda x:x["update_time"],reverse=True)
 
 
-            res["data"]["list"] = services_json[page_index:(page_index+1)*page_size]
+            res["data"]["list"] = services_json[page_index*page_size:(page_index+1)*page_size]
             res["result"] = True
             res["result"] = True
 
 
         except Exception as e:
         except Exception as e:

@@ -59,7 +59,8 @@ class Api(ApiTemplate):
 
 
             for ie in image_engines:
             for ie in image_engines:
                 url = "{}/API/Service/BaseMapList".format(ie.url)
                 url = "{}/API/Service/BaseMapList".format(ie.url)
-                response:requests.Response = requests.post(url,self.para)
+                response:requests.Response = requests.post(url,{"page_size":"9999","page_index":"0",
+                                                                "bbox":bbox,"state":state})
                 if not response.json().get("result"):
                 if not response.json().get("result"):
                     raise Exception("修改影像服务失败！")
                     raise Exception("修改影像服务失败！")
                 else:
                 else:
@@ -71,7 +72,7 @@ class Api(ApiTemplate):
 
 
             fit_services_json = sorted(fit_services_json, key=lambda x: x["update_time"], reverse=True)
             fit_services_json = sorted(fit_services_json, key=lambda x: x["update_time"], reverse=True)
 
 
-            res["data"]["list"] =  fit_services_json[page_index:(page_index + 1) * page_size]
+            res["data"]["list"] =  fit_services_json[page_index*page_size:(page_index+1)*page_size]
             res["result"] = True
             res["result"] = True
 
 
         except Exception as e:
         except Exception as e:

@@ -52,6 +52,10 @@ class Api(ApiTemplate):
              "type": "string",
              "type": "string",
              "description": "[地图服务，切片服务，影像服务]"},
              "description": "[地图服务，切片服务，影像服务]"},
 
 
+            {"name": "creator",
+             "in": "formData",
+             "type": "string"},
+
             {"name": "url",
             {"name": "url",
              "in": "formData",
              "in": "formData",
              "type": "string"},
              "type": "string"},
@@ -142,46 +146,14 @@ class Api(ApiTemplate):
              "description": "[切片服务]图层描述"},
              "description": "[切片服务]图层描述"},
 
 
             #地图服务参数
             #地图服务参数
-            {"name": "status",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]status"},
-            {"name": "username",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]username"},
-            {"name": "readonly",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]readonly"},
-            {"name": "sid",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]sid"},
-            {"name": "stype",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]stype"},
-            {"name": "ssupply",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]ssupply"},
-            {"name": "sctime",
+            {"name": "capabilities",
              "in": "formData",
              "in": "formData",
-             "type": "string",
-             "description": "[地图服务]sctime"},
-            {"name": "company",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]company"},
-            {"name": "abstract",
-             "in": "formData",
-             "type": "string",
-             "description": "[地图服务]abstract"},
-            {"name": "thumbnail",
+             "type": "int",
+             "description": "[地图服务]"},
+            {"name": "project",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "[地图服务]thumbnail"},
+             "description": "[地图服务]project"},
 
 
         ],
         ],
         "responses": {
         "responses": {

+# coding=utf-8
+#author:        4N
+#createtime:    2021/7/19
+#email:         nheweijun@sina.com
+
+
+from app.util.component.ApiTemplate import ApiTemplate
+from .models import TileService,db,Service,MapService
+import configure
+from app.util.component.ModelVisitor import ModelVisitor
+
+from .tile_service.util.ProjectFile import ProjectFile
+
+
+class Api(ApiTemplate):
+
+    api_name = "服务reload"
+
+    def process(self):
+        res = {}
+        try:
+
+            res["data"] = {}
+
+            res["data"]["list"] = []
+
+            #切片服务
+            tile_services = TileService.query.join(Service).filter(Service.type == "切片服务").all()
+            for ts in tile_services:
+                project_file = ProjectFile.create(ModelVisitor.object_to_json(ts))
+                service:Service = Service.query.filter_by(guid=ts.service_guid).one_or_none()
+                para = {"name":service.name,"title":service.title,
+                        "type":"tileserver","capabilities":1 if ts.tile_type=="WMTS" else 16,"project":project_file}
+                res["data"]["list"].append(para)
+
+            #地图服务
+            map_services = MapService.query.all()
+            for ms in map_services:
+                res["data"]["list"].append(ModelVisitor.object_to_json(ms))
+
+            res["data"]["count"] = len(tile_services)+len(map_services)
+            res["result"] = True
+        except Exception as e:
+            raise Exception("数据库错误！")
+        return res
+
+
+
+    api_doc = {
+        "tags": ["服务接口"],
+        "parameters": [
+        ],
+        "responses": {
+            200: {
+                "schema": {
+                    "properties": {
+                    }
+                }
+            }
+        }
+    }

@@ -19,7 +19,7 @@ class Api(ApiTemplate):
 
 
 
 
             #删除本地服务
             #删除本地服务
-            if s_type in ["切片服务","地图服务"]:
+            if s_type in ["切片服务","地图服务","地址匹配"]:
                 service = Service.query.filter_by(guid=guid).one_or_none()
                 service = Service.query.filter_by(guid=guid).one_or_none()
 
 
                 if service:
                 if service:
@@ -35,7 +35,6 @@ class Api(ApiTemplate):
                 api.para = self.para
                 api.para = self.para
                 res = api.process()
                 res = api.process()
 
 
-
         except Exception as e:
         except Exception as e:
             raise e
             raise e
         return res
         return res
@@ -55,7 +54,7 @@ class Api(ApiTemplate):
             {"name": "url",
             {"name": "url",
              "in": "formData",
              "in": "formData",
              "type": "string",
              "type": "string",
-             "description": "type"},
+             "description": "url"},
             {"name": "state",
             {"name": "state",
              "in": "formData",
              "in": "formData",
              "type": "int",
              "type": "int",

@@ -46,7 +46,7 @@ class DataManager(BlueprintApi):
         return tile_service_edit.Api().result
         return tile_service_edit.Api().result
 
 
     @staticmethod
     @staticmethod
-    @bp.route('/Reload', methods=['GET'])
+    @bp.route('/Reload', methods=['POST','GET'])
     @swag_from(tile_service_reload.Api.api_doc)
     @swag_from(tile_service_reload.Api.api_doc)
     def api_tile_service_reload():
     def api_tile_service_reload():
         """
         """
@@ -54,3 +54,5 @@ class DataManager(BlueprintApi):
         """
         """
         return tile_service_reload.Api().result
         return tile_service_reload.Api().result
 
 
+
+

@@ -4,6 +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.util.component.StructuredPrint import StructurePrint
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 import uuid
 import uuid
 from ..models import TileService,Service,db,ServiceFunction,TileScheme
 from ..models import TileService,Service,db,ServiceFunction,TileScheme
@@ -38,25 +39,29 @@ class Api(ApiTemplate):
                 tile_update["scheme"] = json.dumps(ModelVisitor.object_to_json(tilesche))
                 tile_update["scheme"] = json.dumps(ModelVisitor.object_to_json(tilesche))
 
 
             #通知tileserver，更新缓存
             #通知tileserver，更新缓存
-            ts = TileService.query.filter_by(service_guid=guid).one_or_none()
+            ts:TileService = TileService.query.filter_by(service_guid=guid).one_or_none()
             se = service.one_or_none()
             se = service.one_or_none()
+            tile_type = self.para.get("tile_type") if self.para.get("tile_type") else ts.tile_type
 
 
             ts_json = ModelVisitor.object_to_json(ts)
             ts_json = ModelVisitor.object_to_json(ts)
             ts_json.update(tile_update)
             ts_json.update(tile_update)
+
             project_file = ProjectFile.create(ts_json)
             project_file = ProjectFile.create(ts_json)
 
 
             para = {"name":self.para.get("name") if self.para.get("name") else se.name,
             para = {"name":self.para.get("name") if self.para.get("name") else se.name,
                     "title":self.para.get("title") if self.para.get("title") else se.title,
                     "title":self.para.get("title") if self.para.get("title") else se.title,
-                    "type":"tileserver","capabilities":1,"project":project_file}
+                    "type":"tileserver","capabilities":1 if tile_type == "WMTS" else 16,"project":project_file}
+
 
 
-            tile_service_edit_url = "{}/dmap/api/manager/RegService".format(configure.wmts_url)
+            tile_service_edit_url = "{}/dmap/api/manager/RegService".format(configure.tile_engine)
 
 
-            resp: Response  = requests.post(tile_service_edit_url,data=json.dumps(para),headers={'Content-Type':'application/json'})
+            resp: Response  = requests.post(tile_service_edit_url,data=json.dumps(para),headers={'Content-Type':'application/json'},timeout=3)
             resp.encoding="utf-8"
             resp.encoding="utf-8"
             resp_json = resp.json()
             resp_json = resp.json()
-            if not resp_json["status"].__eq__("true"):
+            if not resp_json["status"].__eq__("1"):
                 raise Exception("调用切片服务的注册服务接口失败！")
                 raise Exception("调用切片服务的注册服务接口失败！")
 
 
+            service_update["overview"] = resp_json["url"]
             #修改数据库
             #修改数据库
             tile_service = TileService.query.filter_by(service_guid=guid)
             tile_service = TileService.query.filter_by(service_guid=guid)
             tile_type = self.para.get("tile_type")
             tile_type = self.para.get("tile_type")

@@ -31,28 +31,32 @@ class Api(ApiTemplate):
             # 调用切片服务的注册服务接口
             # 调用切片服务的注册服务接口
 
 
             project_file = ProjectFile.create(self.para)
             project_file = ProjectFile.create(self.para)
-            para = {"name":self.para.get("name"),"title":self.para.get("title"),
-                    "type":"tileserver","capabilities":1,"project":project_file}
-
-            tile_service_register_url = "{}/dmap/api/manager/RegService".format(configure.wmts_url)
-            resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),headers={'Content-Type':'application/json'})
+            para = {"name":self.para.get("name"),
+                    "title":self.para.get("title"),
+                    "type":"tileserver",
+                    "capabilities":1 if self.para.get("tile_type") == "WMTS" else 16,
+                    "project":project_file}
+
+            tile_service_register_url = "{}/dmap/api/manager/RegService".format(configure.tile_engine)
+            resp: Response  = requests.post(tile_service_register_url,data=json.dumps(para),
+                                            headers={'Content-Type':'application/json'},timeout=3
+                                            )
             resp.encoding="utf-8"
             resp.encoding="utf-8"
             resp_json = resp.json()
             resp_json = resp.json()
-            if not resp_json["status"].__eq__("true"):
+            if not resp_json["status"]=="1":
                 raise Exception("调用切片服务的注册服务接口失败！")
                 raise Exception("调用切片服务的注册服务接口失败！")
 
 
             service = Service(
             service = Service(
                 guid = service_guid,
                 guid = service_guid,
                 name = self.para.get("name"),
                 name = self.para.get("name"),
                 title = self.para.get("title"),
                 title = self.para.get("title"),
+                creator= self.para.get("creator"),
                 state = 1,
                 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 = 1,
                 node = 1,
-                overview = "http://{}/API/Service/Overview/{}".format(
-                    configure.deploy_ip_host,
-                    self.para.get("overview") if self.para.get("overview") else "wmts_tb.png"),
+                overview= resp_json["url"],
                 type = self.para.get("type"),
                 type = self.para.get("type"),
                 catalog_guid = self.para.get("catalog_guid")
                 catalog_guid = self.para.get("catalog_guid")
             )
             )
@@ -85,7 +89,7 @@ class Api(ApiTemplate):
 
 
                 scheme=self.para.get("scheme"),
                 scheme=self.para.get("scheme"),
                 service_guid = service_guid,
                 service_guid = service_guid,
-                metadata_url = "{}/DMap/Services/{}/MapServer/WMTSServer".format(configure.wmts_url,self.para.get("name"))
+                metadata_url = "{}/DMap/Services/{}/MapServer/WMTSServer".format(configure.tile_engine,self.para.get("name"))
             )
             )
 
 
             service_function = ServiceFunction(guid=service_function_guid,
             service_function = ServiceFunction(guid=service_function_guid,

@@ -5,7 +5,7 @@
 
 
 
 
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
-from ..models import TileService,db,Service
+from ..models import TileService,db,Service,MapService
 import configure
 import configure
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 
 
@@ -19,16 +19,21 @@ class Api(ApiTemplate):
     def process(self):
     def process(self):
         res = {}
         res = {}
         try:
         try:
-            tile_services = TileService.query.join(Service).filter(Service.type=="切片服务").all()
+
             res["data"] = {}
             res["data"] = {}
-            res["data"]["count"] = len(tile_services)
+
             res["data"]["list"] = []
             res["data"]["list"] = []
+
+            #切片服务
+            tile_services = TileService.query.join(Service).filter(Service.type == "切片服务").all()
             for ts in tile_services:
             for ts in tile_services:
                 project_file = ProjectFile.create(ModelVisitor.object_to_json(ts))
                 project_file = ProjectFile.create(ModelVisitor.object_to_json(ts))
                 service:Service = Service.query.filter_by(guid=ts.service_guid).one_or_none()
                 service:Service = Service.query.filter_by(guid=ts.service_guid).one_or_none()
                 para = {"name":service.name,"title":service.title,
                 para = {"name":service.name,"title":service.title,
-                        "type":"tileserver","capabilities":1,"project":project_file}
+                        "type":"tileserver","capabilities":1 if ts.tile_type=="WMTS" else 16,"project":project_file}
                 res["data"]["list"].append(para)
                 res["data"]["list"].append(para)
+
+            res["data"]["count"] = len(tile_services)
             res["result"] = True
             res["result"] = True
         except Exception as e:
         except Exception as e:
             raise Exception("数据库错误！")
             raise Exception("数据库错误！")

@@ -6,6 +6,7 @@
 
 
 from app.modules.service.models import TileScheme
 from app.modules.service.models import TileScheme
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
+from app.util.component.StructuredPrint import StructurePrint
 import json
 import json
 import base64
 import base64
 
 
@@ -40,8 +41,8 @@ class ProjectFile:
     <maplayer name="{name}" alias="{alias}" type="0">
     <maplayer name="{name}" alias="{alias}" type="0">
       <extent>
       <extent>
         <xmin>{xmin}</xmin>
         <xmin>{xmin}</xmin>
-        <ymin>{xmax}</ymin>
-        <xmax>{ymin}</xmax>
+        <ymin>{ymin}</ymin>
+        <xmax>{xmax}</xmax>
         <ymax>{ymax}</ymax>
         <ymax>{ymax}</ymax>
       </extent>
       </extent>
       <style>{layer_style}</style>
       <style>{layer_style}</style>
@@ -126,7 +127,7 @@ class ProjectFile:
     <maplayer name="{name}" alias="{alias}" type="0">
     <maplayer name="{name}" alias="{alias}" type="0">
       <extent>
       <extent>
         <xmin>{xmin}</xmin>
         <xmin>{xmin}</xmin>
-        <ymin>{xmax}</ymin>
+        <ymin>{ymin}</ymin>
         <xmax>{xmax}</xmax>
         <xmax>{xmax}</xmax>
         <ymax>{ymax}</ymax>
         <ymax>{ymax}</ymax>
       </extent>
       </extent>

@@ -71,6 +71,26 @@ class PGUtil:
         return geom_col
         return geom_col
 
 
     @classmethod
     @classmethod
+    def get_pkey(cls,table_name,db_session):
+        # 判断空间列
+        pkey_sql = '''
+        select pg_attribute.attname as colname from 
+        pg_constraint  inner join pg_class 
+        on pg_constraint.conrelid = pg_class.oid 
+        inner join pg_attribute on pg_attribute.attrelid = pg_class.oid 
+        and  pg_attribute.attnum = pg_constraint.conkey[1]
+        inner join pg_type on pg_type.oid = pg_attribute.atttypid
+        where pg_class.relname = '{}' 
+        and pg_constraint.contype='p'
+        '''.format(table_name)
+        pkey = None
+        pkey_result = db_session.execute(pkey_sql)
+        for row_proxy in pkey_result:
+            pkey = row_proxy[0]
+        return pkey
+
+
+    @classmethod
     def get_table_count(cls,table_name,db_session):
     def get_table_count(cls,table_name,db_session):
         count_result = db_session.execute('''SELECT reltuples::bigint AS ec FROM pg_class WHERE  oid = 'public."{}"'::regclass'''.format(
         count_result = db_session.execute('''SELECT reltuples::bigint AS ec FROM pg_class WHERE  oid = 'public."{}"'::regclass'''.format(
             table_name)).fetchone()
             table_name)).fetchone()

@@ -107,7 +107,28 @@ def get_rc(parameter,l,lon,lat):
 
 
 def wmts_overview(extent,url_format):
 def wmts_overview(extent,url_format):
 
 
-    scheme = {"0": {"resolution": 1.4062500000059488, "scale": 590995186.12}, "1": {"resolution": 0.7031250000029744, "scale": 295497593.06}, "2": {"resolution": 0.3515625000014872, "scale": 147748796.53}, "3": {"resolution": 0.1757812500007436, "scale": 73874398.265}, "4": {"resolution": 0.0878906250003718, "scale": 36937199.1325}, "5": {"resolution": 0.0439453125001859, "scale": 18468599.56625}, "6": {"resolution": 0.02197265625009295, "scale": 9234299.783125}, "7": {"resolution": 0.010986328125046475, "scale": 4617149.8915625}, "8": {"resolution": 0.0054931640625232375, "scale": 2308574.94578125}, "9": {"resolution": 0.0027465820312616187, "scale": 1154287.472890625}, "10": {"resolution": 0.0013732910156308094, "scale": 577143.7364453125}, "11": {"resolution": 0.0006866455078154047, "scale": 288571.86822265625}, "12": {"resolution": 0.00034332275390770234, "scale": 144285.93411132813}, "13": {"resolution": 0.00017166137695385117, "scale": 72142.96705566406}, "14": {"resolution": 8.583068847692559e-05, "scale": 36071.48352783203}, "15": {"resolution": 4.291534423846279e-05, "scale": 18035.741763916016}, "16": {"resolution": 2.1457672119231396e-05, "scale": 9017.870881958008}, "17": {"resolution": 1.0728836059615698e-05, "scale": 4508.935440979004}, "18": {"resolution": 5.364418029807849e-06, "scale": 2254.467720489502}, "19": {"resolution": 2.6822090149039246e-06, "scale": 1127.233860244751}, "20": {"resolution": 1.3411045074519623e-06, "scale": 563.6169301223755}, "cols": 256, "rows": 256, "dpi": 96, "wkt": "", "x": -400, "y": 400}
+    scheme = {"0": {"resolution": 1.4062500000059488, "scale": 590995186.12},
+              "1": {"resolution": 0.7031250000029744, "scale": 295497593.06},
+              "2": {"resolution": 0.3515625000014872, "scale": 147748796.53},
+              "3": {"resolution": 0.1757812500007436, "scale": 73874398.265},
+              "4": {"resolution": 0.0878906250003718, "scale": 36937199.1325},
+              "5": {"resolution": 0.0439453125001859, "scale": 18468599.56625},
+              "6": {"resolution": 0.02197265625009295, "scale": 9234299.783125},
+              "7": {"resolution": 0.010986328125046475, "scale": 4617149.8915625},
+              "8": {"resolution": 0.0054931640625232375, "scale": 2308574.94578125},
+              "9": {"resolution": 0.0027465820312616187, "scale": 1154287.472890625},
+              "10": {"resolution": 0.0013732910156308094, "scale": 577143.7364453125},
+              "11": {"resolution": 0.0006866455078154047, "scale": 288571.86822265625},
+              "12": {"resolution": 0.00034332275390770234, "scale": 144285.93411132813},
+              "13": {"resolution": 0.00017166137695385117, "scale": 72142.96705566406},
+              "14": {"resolution": 8.583068847692559e-05, "scale": 36071.48352783203},
+              "15": {"resolution": 4.291534423846279e-05, "scale": 18035.741763916016},
+              "16": {"resolution": 2.1457672119231396e-05, "scale": 9017.870881958008},
+              "17": {"resolution": 1.0728836059615698e-05, "scale": 4508.935440979004},
+              "18": {"resolution": 5.364418029807849e-06, "scale": 2254.467720489502},
+              "19": {"resolution": 2.6822090149039246e-06, "scale": 1127.233860244751},
+              "20": {"resolution": 1.3411045074519623e-06, "scale": 563.6169301223755},
+              "cols": 256, "rows": 256, "dpi": 96, "wkt": "", "x": -400, "y": 400}
 
 
     lev = 0
     lev = 0
     r1 = 0
     r1 = 0

@@ -4,8 +4,7 @@ import logging
 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_test"
-# SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@localhost:5433/dmap_dms_test"
+SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.60.100:5432/dmap_manager"
 
 
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 # 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
 #VACUATE_DB_URI = None
 #VACUATE_DB_URI = None
@@ -13,9 +12,10 @@ VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 
 zookeeper = "172.26.99.168:2181"
 zookeeper = "172.26.99.168:2181"
 
 
-#WMTS服务器
-wmts_url = "http://172.26.99.160:6060"
-wms_url = ""
+#切片引擎
+tile_engine = "http://172.26.99.160:6060"
+#矢量引擎
+vector_engine = "http://172.26.99.160:6060"
 
 
 # 固定配置不需要修改
 # 固定配置不需要修改
 swagger_configure = {"title": "DMapManager"}
 swagger_configure = {"title": "DMapManager"}

+<VirtualHost *:80>
+    ServerName 172.26.60.101
+    WSGIDaemonProcess yourapplication processes=4 threads=16
+    WSGIScriptAlias / /usr/src/app/run.wsgi
+    WSGIPassAuthorization On
+
+    <Directory /usr/src/app/>
+        WSGIProcessGroup yourapplication
+        WSGIApplicationGroup %{GLOBAL}
+        WSGIScriptReloading On
+        Require all granted
+    </Directory>
+</VirtualHost>
+
+Listen 81
+
+<VirtualHost *:81>
+    ServerName 172.26.60.101
+    WSGIDaemonProcess monitormanager processes=1 threads=8
+    WSGIScriptAlias / /usr/src/app/monitor.wsgi
+    WSGIPassAuthorization On
+    <Directory /usr/src/app/>
+        WSGIProcessGroup monitormanager
+        WSGIApplicationGroup %{GLOBAL}
+        WSGIScriptReloading On
+        Require all granted
+    </Directory>
+</VirtualHost>

-flask==1.1.2
-SQLAlchemy==1.3.17
-Flask-SQLAlchemy==2.4.3
-gevent==20.9.0
-gunicorn==20.0.4
-flask_cors==3.0.8
-flasgger==0.9.5
-GDAL==3.2.1
-psycopg2==2.8.5
-pyDes==2.0.1
-gevent-websocket==0.10.1
-Pillow==8.1.2
-#Rtree==0.9.7
-opencv-python==4.5.1.48
-psutil==5.8.0
-# mod_wsgi==4.8.0
-thrift==0.13.0
-Authlib==0.13
-kazoo==2.8.0
-paramiko==2.8.0
-requests==2.26.0
-schedule==1.1.0
-
+flask==1.1.2
+SQLAlchemy==1.3.17
+Flask-SQLAlchemy==2.4.3
+gevent==20.9.0
+gunicorn==20.0.4
+flask_cors==3.0.8
+flasgger==0.9.5
+#GDAL==3.2.1
+psycopg2-binary==2.8.5
+pyDes==2.0.1
+gevent-websocket==0.10.1
+opencv-python==4.5.1.48
+mod_wsgi==4.8.0
+thrift==0.13.0
+Authlib==0.13
+kazoo==2.8.0
+paramiko==2.8.0
+requests==2.26.0
+schedule==1.1.0

+#! /bin/sh
+container_name="dmapmanager"
+#停止容器
+echo "正在关闭容器..."
+docker stop $container_name
+docker rm $container_name
+
+curPath=$(readlink -f $(dirname $0))
+
+
+#设置日志权限
+chmod -R 777 $curPath
+
+#设置端口
+port=""
+if [ ! -n "$1" ] ;then
+port="8840"
+echo "未设置端口，使用默认8840端口..."
+else
+port=$1
+echo "端口设置为$1 ..."
+fi
+
+port2=""
+if [ ! -n "$2" ] ;then
+port="8841"
+echo "未设置端口2，使用默认8840端口..."
+else
+port2=$2
+echo "端口2设置为$2 ..."
+fi
+
+
+#启动容器和apache
+echo "正在启动容器..."
+set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
+docker run -it -d --name $container_name $set -p ${port}:80 -p ${port2}:81 -v ${curPath}:/usr/src/app -v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dmapmanager.conf:/etc/apache2/sites-enabled/dmapmanager.conf dci/dmapserver:base
+docker exec -d $container_name service apache2 start
+sleep 5
+curl localhost:$port/release
+curl localhost:$port2

@@ -3,116 +3,72 @@
 #createtime:    2021/7/15
 #createtime:    2021/7/15
 #email:         nheweijun@sina.com
 #email:         nheweijun@sina.com
 
 
-from osgeo import gdal
-
-
-from osgeo import gdal, gdalconst
-from osgeo import ogr
-import math
-import requests
-def tms(ytile, zoom):
-    n = 2.0 ** zoom
-    ytile = n - ytile - 1
-    return int(ytile)
-import numpy
-import cv2
-from osgeo import gdal,osr
+from osgeo import gdal,osr,ogr
 from osgeo.gdal import *
 from osgeo.gdal import *
+from osgeo.ogr import *
 
 
-# Math functions taken from https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames #spellok
-def deg2num(lat_deg, lon_deg, zoom):
-    lat_rad = math.radians(lat_deg)
-    n = 2.0 ** zoom
-    xtile = int((lon_deg + 180.0) / 360.0 * n)
-    ytile = int((1.0 - math.log(math.tan(lat_rad) + (1 / math.cos(lat_rad))) / math.pi) / 2.0 * n)
-    return (xtile, ytile)
-
-def num2deg(xtile, ytile, zoom):
-    n = 2.0 ** zoom
-    lon_deg = xtile / n * 360.0 - 180.0
-    lat_rad = math.atan(math.sinh(math.pi * (1 - 2 * ytile / n)))
-    lat_deg = math.degrees(lat_rad)
-    return (lat_deg, lon_deg)
-
-def create_image(cls,image_type, pixel_array, quality):
-
-    if image_type.__eq__("image/jpeg") or image_type.__eq__("image/jpg"):
-        r, buf = cv2.imencode(".jpg", pixel_array, [cv2.IMWRITE_JPEG_QUALITY, quality])
-        image_out = buf.tobytes()
-    else:
-        height, width = pixel_array[:, :, 0].shape
-        four = numpy.zeros((height,width), dtype=int) + 255
-        four[pixel_array[:, :, 0] == 65536] = 0
-        r, buf = cv2.imencode(".png", numpy.dstack((pixel_array, four)))
-        image_out = buf.tobytes()
-    return image_out
 
 
-if __name__ == '__main__':
-
-
-
-
-    lev = 8
-    extent = [107.78981494180618, 120.43553603935675, 18.870480519260582, 25.999868757737033]
-    url = "http://172.26.99.160:6060/DMap/Services/GDMap/TileServer/TMSService"
+import json
 
 
 
 
+def getInfo( path):
+    # driver: Driver = ogr.GetDriverByName("OpenFileGDB")
+    # ds: DataSource = driver.Open(path, 0)
+    #
+    #
+    # layer:Layer = ds.GetLayerByName("LM51130251998341HAJ00_B2")
+    #
+    # count = layer.GetFeatureCount()
+    #
+    # dd:Feature = layer.GetNextFeature()
+    # dd.
+    #
+    # for i in range(dd.GetFieldCount()):
+    #     print(dd.GetField(i))
+    # ff = dd.GetField(1)
+    image: Dataset = gdal.Open(path)
 
 
-    if extent[3] - extent[2] > extent[1] - extent[0]:
-        offset = ((extent[3] - extent[2]) - (extent[1] - extent[0])) / 2.0
-        out_extent = [extent[0]- offset, extent[1]+offset , extent[2], extent[3] ]
-    else:
-        offset = ((extent[1] - extent[0]) - (extent[3] - extent[2])) / 2.0
-        out_extent = [extent[0] , extent[1], extent[2] - offset, extent[3] + offset]
-        
-    c1,r1 = deg2num(18.870480519260582,107.78981494180618,lev)
-    c2,r2 = deg2num(25.999868757737033, 120.43553603935675, lev)
+    geo = image.GetGeoTransform()
 
 
-    print(r1 - r2)
-    print(c2 - c1)
+    # print(image.GetSpatialRef())
 
 
-    lat1, lon1 = num2deg(c1, r1, lev)
-    lat2, lon2 = num2deg(c1+1, r1+1, lev)
-    print( [lon1, lat2, lon2, lat1])
+    origin: osr.SpatialReference = osr.SpatialReference()
+    origin.ImportFromWkt(image.GetProjection())
 
 
-    lat3, lon3 = num2deg(c2, r2, lev)
-    lat4, lon4 = num2deg(c2+1, r2+1, lev)
-    print( [lon3, lat4, lon4, lat3])
+    authority_code = origin.GetAuthorityCode(None)
 
 
-    dat = numpy.zeros(((r1 - r2+1)*256, (c2 - c1+1)*256, 3), dtype=int) + 256
+    band_count = image.RasterCount
+    band: Band = image.GetRasterBand(1)
 
 
+    count = band.GetOverviewCount()
+    nodatavalue = band.GetNoDataValue()
 
 
-    offx = (extent[0]-lon1)/((lon4-lon1)/((c2 - c1+1)*256))
+    left_top = (geo[0], geo[3])
+    right_buttom = (geo[0] + geo[1] * image.RasterXSize, geo[3] + geo[5] * image.RasterYSize)
 
 
-    xnum = (extent[1]-extent[0])/((lon4-lon1)/((c2 - c1+1)*256))
+    origin_extent = [left_top[0], right_buttom[1], right_buttom[0], left_top[1]]
 
 
-    print(offx)
-    print(xnum)
+    info = {"band_count": band_count,
+            "overview_count": count,
+            "xy_size": [image.RasterXSize, image.RasterYSize],
+            "origin_extent": origin_extent,
+            "null_value": nodatavalue,
+            "crs_wkt": image.GetProjection(),
+            "crs": authority_code,
+            "crs_proj4": origin.ExportToProj4(),
+            "size": os.path.getsize(path),
+            "path": path,
+            "cell_x_size": geo[1],
+            "cell_y_size": geo[5]}
 
 
-    offy = (lat3 - extent[3])/((lat3-lat2)/((r1 - r2+1)*256))
-    ynum = (extent[3]-extent[2])/((lat3-lat2)/((r1 - r2+1)*256))
-    print(offy)
-    print(ynum)
-
-
-    for r in range(r2,r1+1):
-        for c in range(c1,c2+1):
-            url = "http://172.26.99.160:6060/DMap/Services/GDMap/TileServer/TMSService/{}/{}/{}.png".format(lev,c,r)
-            dataset:Dataset = gdal.Open(url, 0)
-            for b in range(1,4):
-                band:Band = dataset.GetRasterBand(b)
-                zaa = (r - r2)*256
-                zbb = (c - c1)*256
-                zcc = (r - r2+1)*256
-                zdd = (c - c1+1)*256
-
-                dat[(r - r2)*256:(r - r2+1)*256,(c - c1)*256 : (c - c1+1)*256, 2-(b-1)]  = band.ReadAsArray(0,0,256,256)
+    del image
+    return json.dumps(info)
 
 
+if __name__ == '__main__':
 
 
-    dat2 = dat[int(offy):int(offy+ynum),int(offx):int(offx+xnum),:]
+    path = r"E:\Data\zh.gdb"
+    print(getInfo(path))
 
 
-    cv2.imwrite("t.jpg", dat, [cv2.IMWRITE_JPEG_QUALITY, 30])
-    cv2.imwrite("t2.jpg", dat2, [cv2.IMWRITE_JPEG_QUALITY, 30])
 
 
 
 
 
 

-#增加table_vacuate connectstr
+#