2022.02.21 修复srid

@@ -8,7 +8,7 @@ from ..models import Table,Columns,DES
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ApiTemplate import ApiTemplate
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.ModelVisitor import ModelVisitor
 from app.util.component.PGUtil import PGUtil
 from app.util.component.PGUtil import PGUtil
-from osgeo.ogr import DataSource,Layer
+from osgeo.ogr import DataSource,Layer,Feature
 from osgeo.osr import SpatialReference
 from osgeo.osr import SpatialReference
 class Api(ApiTemplate):
 class Api(ApiTemplate):
     api_name = "表信息"
     api_name = "表信息"
@@ -19,7 +19,7 @@ class Api(ApiTemplate):
             table = Table.query.filter_by(guid=table_guid).one_or_none()
             table = Table.query.filter_by(guid=table_guid).one_or_none()
             if not table:
             if not table:
                 raise Exception("数据不存在！")
                 raise Exception("数据不存在！")
-            pg_ds = PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
+            pg_ds :DataSource = PGUtil.open_pg_data_source(0,DES.decode(table.relate_database.sqlalchemy_uri))
             layer:Layer = pg_ds.GetLayerByName(table.name)
             layer:Layer = pg_ds.GetLayerByName(table.name)
             if not layer:
             if not layer:
                 raise Exception("数据异常！")
                 raise Exception("数据异常！")
@@ -27,10 +27,17 @@ class Api(ApiTemplate):
             if layer:
             if layer:
                 sr:SpatialReference = layer.GetSpatialRef()
                 sr:SpatialReference = layer.GetSpatialRef()
 
 
-                if sr:
-                    append_dict["srid"] = sr.GetAuthorityCode(None)
+                if sr is not None:
                     append_dict["sr_wkt"] = sr.ExportToWkt()
                     append_dict["sr_wkt"] = sr.ExportToWkt()
                     append_dict["sr_proj4"] = sr.ExportToProj4()
                     append_dict["sr_proj4"] = sr.ExportToProj4()
+
+                srid_sql = '''select st_srid({}) from public."{}" limit 1'''.format(layer.GetGeometryColumn(),layer.GetName())
+                srid_layer:Layer = pg_ds.ExecuteSQL(srid_sql)
+                srid_feature : Feature = srid_layer.GetNextFeature()
+                if srid_feature:
+                    if srid_feature.GetField(0):
+                        append_dict["srid"] = str(srid_feature.GetField(0))
+
             else:
             else:
                 append_dict["exist"]=0
                 append_dict["exist"]=0
             columns = table.relate_columns.order_by(Columns.name).all()
             columns = table.relate_columns.order_by(Columns.name).all()

@@ -13,6 +13,7 @@ from app.util.component.GeometryAdapter import GeometryAdapter
 from app.util.component.StructurePrint import StructurePrint
 from app.util.component.StructurePrint import StructurePrint
 
 
 from osgeo.ogr import DataSource,Layer
 from osgeo.ogr import DataSource,Layer
+from osgeo.osr import SpatialReference
 
 
 from app.util.component.VacuateConf import VacuateConf
 from app.util.component.VacuateConf import VacuateConf
 import copy
 import copy
@@ -65,6 +66,7 @@ class Api(ApiTemplate):
                 p_y = (extent[3] - extent[2]) / 5.0
                 p_y = (extent[3] - extent[2]) / 5.0
                 fill_precent = 0
                 fill_precent = 0
                 StructurePrint().print("判断疏密")
                 StructurePrint().print("判断疏密")
+
                 for ix in range(5):
                 for ix in range(5):
                     for iy in range(5):
                     for iy in range(5):
                         grid_extent = [extent[0] + ix * p_x, extent[0] + ix * p_x + p_x, extent[2] + iy * p_y,
                         grid_extent = [extent[0] + ix * p_x, extent[0] + ix * p_x + p_x, extent[2] + iy * p_y,
@@ -72,8 +74,9 @@ class Api(ApiTemplate):
 
 
                         poly = GeometryAdapter.envelop_2_polygon(grid_extent)
                         poly = GeometryAdapter.envelop_2_polygon(grid_extent)
 
 
-                        sql = '''select * from "{}" where st_intersects({},st_geogfromtext('{}')) limit 1'''.format(layer.GetName(),
-                                                                                layer.GetGeometryColumn(),poly.ExportToWkt())
+                        sql = '''select * from "{}" where st_intersects({},st_setsrid(st_geometryfromtext('{}'),st_srid({}))) limit 1'''.format(layer.GetName(),
+                                                                                layer.GetGeometryColumn(),poly.ExportToWkt(),layer.GetGeometryColumn())
+
                         query_layer: Layer = pg_ds.ExecuteSQL(sql)
                         query_layer: Layer = pg_ds.ExecuteSQL(sql)
                         if query_layer.GetFeatureCount() == 1:
                         if query_layer.GetFeatureCount() == 1:
                             fill_precent += 4
                             fill_precent += 4

+#
+# This is the main Apache HTTP server configuration file.  It contains the
+# configuration directives that give the server its instructions.
+# See <URL:http://httpd.apache.org/docs/2.4/> for detailed information.
+# In particular, see 
+# <URL:http://httpd.apache.org/docs/2.4/mod/directives.html>
+# for a discussion of each configuration directive.
+#
+# Do NOT simply read the instructions in here without understanding
+# what they do.  They're here only as hints or reminders.  If you are unsure
+# consult the online docs. You have been warned.  
+#
+# Configuration and logfile names: If the filenames you specify for many
+# of the server's control files begin with "/" (or "drive:/" for Win32), the
+# server will use that explicit path.  If the filenames do *not* begin
+# with "/", the value of ServerRoot is prepended -- so 'log/access_log'
+# with ServerRoot set to '/www' will be interpreted by the
+# server as '/www/log/access_log', where as '/log/access_log' will be
+# interpreted as '/log/access_log'.
+
+#
+# ServerRoot: The top of the directory tree under which the server's
+# configuration, error, and log files are kept.
+#
+# Do not add a slash at the end of the directory path.  If you point
+# ServerRoot at a non-local disk, be sure to specify a local disk on the
+# Mutex directive, if file-based mutexes are used.  If you wish to share the
+# same ServerRoot for multiple httpd daemons, you will need to change at
+# least PidFile.
+#
+ServerRoot "/etc/httpd"
+
+#
+# Listen: Allows you to bind Apache to specific IP addresses and/or
+# ports, instead of the default. See also the <VirtualHost>
+# directive.
+#
+# Change this to Listen on specific IP addresses as shown below to 
+# prevent Apache from glomming onto all bound IP addresses.
+#
+#Listen 12.34.56.78:80
+Listen 80
+Listen 81
+
+#
+# Dynamic Shared Object (DSO) Support
+#
+# To be able to use the functionality of a module which was built as a DSO you
+# have to place corresponding `LoadModule' lines at this location so the
+# directives contained in it are actually available _before_ they are used.
+# Statically compiled modules (those listed by `httpd -l') do not need
+# to be loaded here.
+#
+# Example:
+# LoadModule foo_module modules/mod_foo.so
+#
+Include conf.modules.d/*.conf
+
+#
+# If you wish httpd to run as a different user or group, you must run
+# httpd as root initially and it will switch.  
+#
+# User/Group: The name (or #number) of the user/group to run httpd as.
+# It is usually good practice to create a dedicated user and group for
+# running httpd, as with most system services.
+#
+User apache
+Group apache
+
+# 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
+#
+# ServerAdmin: Your address, where problems with the server should be
+# e-mailed.  This address appears on some server-generated pages, such
+# as error documents.  e.g. admin@your-domain.com
+#
+ServerAdmin root@localhost
+
+#
+# ServerName gives the name and port that the server uses to identify itself.
+# This can often be determined automatically, but we recommend you specify
+# it explicitly to prevent problems during startup.
+#
+# If your host doesn't have a registered DNS name, enter its IP address here.
+#
+#ServerName www.example.com:80
+
+#
+# Deny access to the entirety of your server's filesystem. You must
+# explicitly permit access to web content directories in other 
+# <Directory> blocks below.
+#
+<Directory />
+    AllowOverride none
+    Require all denied
+</Directory>
+
+#
+# Note that from this point forward you must specifically allow
+# particular features to be enabled - so if something's not working as
+# you might expect, make sure that you have specifically enabled it
+# below.
+#
+
+#
+# DocumentRoot: The directory out of which you will serve your
+# documents. By default, all requests are taken from this directory, but
+# symbolic links and aliases may be used to point to other locations.
+#
+
+ DocumentRoot "/var/www/html"
+#DocumentRoot "/html"
+
+#
+# Relax access to content within /var/www.
+#
+<Directory "/var/www">
+    AllowOverride none
+    # Allow open access:
+    Require all denied
+</Directory>
+
+# Further relax access to the default document root:
+<Directory "/var/www/html">
+    #
+    # Possible values for the Options directive are "None", "All",
+    # or any combination of:
+    #   Indexes Includes FollowSymLinks SymLinksifOwnerMatch ExecCGI MultiViews
+    #
+    # Note that "MultiViews" must be named *explicitly* --- "Options All"
+    # doesn't give it to you.
+    #
+    # The Options directive is both complicated and important.  Please see
+    # http://httpd.apache.org/docs/2.4/mod/core.html#options
+    # for more information.
+    #
+    Options Indexes FollowSymLinks
+
+    #
+    # AllowOverride controls what directives may be placed in .htaccess files.
+    # It can be "All", "None", or any combination of the keywords:
+    #   Options FileInfo AuthConfig Limit
+    #
+    AllowOverride all
+
+    #
+    # Controls who can get stuff from this server.
+    #
+    Require all granted
+</Directory>
+
+#
+# DirectoryIndex: sets the file that Apache will serve if a directory
+# is requested.
+#
+<IfModule dir_module>
+    DirectoryIndex index.html
+</IfModule>
+
+#
+# The following lines prevent .htaccess and .htpasswd files from being 
+# viewed by Web clients. 
+#
+
+AccessFileName .htaccess
+
+<Files ".ht*">
+    Require all denied
+</Files>
+
+#
+# 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 "logs/error_log"
+
+#
+# LogLevel: Control the number of messages logged to the error_log.
+# Possible values include: debug, info, notice, warn, error, crit,
+# alert, emerg.
+#
+LogLevel warn
+
+<IfModule log_config_module>
+    #
+    # The following directives define some format nicknames for use with
+    # a CustomLog directive (see below).
+    #
+    LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\"" combined
+    LogFormat "%h %l %u %t \"%r\" %>s %b" common
+
+    <IfModule logio_module>
+      # You need to enable mod_logio.c to use %I and %O
+      LogFormat "%h %l %u %t \"%r\" %>s %b \"%{Referer}i\" \"%{User-Agent}i\" %I %O" combinedio
+    </IfModule>
+
+    #
+    # The location and format of the access logfile (Common Logfile Format).
+    # If you do not define any access logfiles within a <VirtualHost>
+    # container, they will be logged here.  Contrariwise, if you *do*
+    # define per-<VirtualHost> access logfiles, transactions will be
+    # logged therein and *not* in this file.
+    #
+    #CustomLog "logs/access_log" common
+
+    #
+    # If you prefer a logfile with access, agent, and referer information
+    # (Combined Logfile Format) you can use the following directive.
+    #
+    CustomLog "logs/access_log" combined
+</IfModule>
+
+<IfModule alias_module>
+    #
+    # Redirect: Allows you to tell clients about documents that used to 
+    # exist in your server's namespace, but do not anymore. The client 
+    # will make a new request for the document at its new location.
+    # Example:
+    # Redirect permanent /foo http://www.example.com/bar
+
+    #
+    # Alias: Maps web paths into filesystem paths and is used to
+    # access content that does not live under the DocumentRoot.
+    # Example:
+    # Alias /webpath /full/filesystem/path
+    #
+    # If you include a trailing / on /webpath then the server will
+    # require it to be present in the URL.  You will also likely
+    # need to provide a <Directory> section to allow access to
+    # the filesystem path.
+
+    #
+    # ScriptAlias: This controls which directories contain server scripts. 
+    # ScriptAliases are essentially the same as Aliases, except that
+    # documents in the target directory are treated as applications and
+    # run by the server when requested rather than as documents sent to the
+    # client.  The same rules about trailing "/" apply to ScriptAlias
+    # directives as to Alias.
+    #
+    ScriptAlias /cgi-bin/ "/var/www/cgi-bin/"
+
+</IfModule>
+
+#
+# "/var/www/cgi-bin" should be changed to whatever your ScriptAliased
+# CGI directory exists, if you have that configured.
+#
+<Directory "/var/www/cgi-bin">
+    AllowOverride None
+    Options None
+    Require all granted
+</Directory>
+
+<IfModule mime_module>
+    #
+    # TypesConfig points to the file containing the list of mappings from
+    # filename extension to MIME-type.
+    #
+    TypesConfig /etc/mime.types
+
+    #
+    # AddType allows you to add to or override the MIME configuration
+    # file specified in TypesConfig for specific file types.
+    #
+    #AddType application/x-gzip .tgz
+    #
+    # AddEncoding allows you to have certain browsers uncompress
+    # information on the fly. Note: Not all browsers support this.
+    #
+    #AddEncoding x-compress .Z
+    #AddEncoding x-gzip .gz .tgz
+    #
+    # If the AddEncoding directives above are commented-out, then you
+    # probably should define those extensions to indicate media types:
+    #
+    AddType application/x-compress .Z
+    AddType application/x-gzip .gz .tgz
+
+    #
+    # AddHandler allows you to map certain file extensions to "handlers":
+    # actions unrelated to filetype. These can be either built into the server
+    # or added with the Action directive (see below)
+    #
+    # To use CGI scripts outside of ScriptAliased directories:
+    # (You will also need to add "ExecCGI" to the "Options" directive.)
+    #
+    #AddHandler cgi-script .cgi
+
+    # For type maps (negotiated resources):
+    #AddHandler type-map var
+
+    #
+    # Filters allow you to process content before it is sent to the client.
+    #
+    # To parse .shtml files for server-side includes (SSI):
+    # (You will also need to add "Includes" to the "Options" directive.)
+    #
+    AddType text/html .shtml
+    AddOutputFilter INCLUDES .shtml
+</IfModule>
+
+#
+# Specify a default charset for all content served; this enables
+# interpretation of all content as UTF-8 by default.  To use the 
+# default browser choice (ISO-8859-1), or to allow the META tags
+# in HTML content to override this choice, comment out this
+# directive:
+#
+AddDefaultCharset UTF-8
+
+<IfModule mime_magic_module>
+    #
+    # The mod_mime_magic module allows the server to use various hints from the
+    # contents of the file itself to determine its type.  The MIMEMagicFile
+    # directive tells the module where the hint definitions are located.
+    #
+     conf/magic
+</IfModule>
+
+#
+# Customizable error responses come in three flavors:
+# 1) plain text 2) local redirects 3) external redirects
+#
+# Some examples:
+#ErrorDocument 500 "The server made a boo boo."
+#ErrorDocument 404 /missing.html
+#ErrorDocument 404 "/cgi-bin/missing_handler.pl"
+#ErrorDocument 402 http://www.example.com/subscription_info.html
+#
+
+#
+# EnableMMAP and EnableSendfile: On systems that support it, 
+# memory-mapping or the sendfile syscall may be used to deliver
+# files.  This usually improves server performance, but must
+# be turned off when serving from networked-mounted 
+# filesystems or if support for these functions is otherwise
+# broken on your system.
+# Defaults if commented: EnableMMAP On, EnableSendfile Off
+#
+#EnableMMAP off
+EnableSendfile on
+
+# Supplemental configuration
+#
+# Load config files in the "/etc/httpd/conf.d" directory, if any.
+ conf.d/*.conf
+AccessFileName .htaccess
+LoadModule wsgi_module "/usr/lib64/httpd/modules/mod_wsgi-py37.cpython-37m-x86_64-linux-gnu.so"
+LoadModule rewrite_module /usr/lib/apache2/modules/mod_rewrite.so
+ "/var/gdal"
+
+<VirtualHost *:81>
+     dmapmanager processes=1 threads=16 display-name=%{GROUP}
+     dmapmanager
+     On
+     %{GLOBAL}
+     / /usr/src/app/run.wsgi
+    <Directory /usr/>
+    Require all granted
+    </Directory>
+</VirtualHost>
+
+<Directory /usr/>
+  Require all granted
+</Directory>

+#! /bin/sh
+dn="dmapmanager"
+#停止容器
+echo "正在关闭容器..."
+docker stop $dn
+docker rm $dn
+
+curPath=$(readlink -f $(dirname $0))
+
+
+#设置日志权限
+chmod -R 777 $curPath
+
+#设置端口
+port1=""
+if [ ! -n "$1" ] ;then
+port1="8830"
+echo "未设置端口，使用默认8830端口..."
+else
+port1=$1
+echo "端口设置为$1 ..."
+fi
+
+#设置端口
+port2=""
+if [ ! -n "$2" ] ;then
+port2="8840"
+echo "未设置端口，使用默认8840端口..."
+else
+port2=$2
+echo "端口设置为$2 ..."
+fi
+
+#启动容器和apache
+echo "正在启动容器..."
+set="--privileged=true -e TZ="Asia/Shanghai" --restart=always -e ALLOW_IP_RANGE=0.0.0.0/0"
+docker run -d --name $dn $set -p $port1:80 -p $port2:81 -v $curPath/logs/apache.error:/var/log/httpd/error_log -v ${curPath}/html:/var/www/html -v $curPath:/usr/src/app -v $curPath/httpd.conf:/etc/httpd/conf/httpd.conf dci/dmapmanager:4.1-gdb
+sleep 1
+curl localhost:$port2/release
+

@@ -42,4 +42,4 @@ apacheMap="-v ${curPath}/apache2.conf:/etc/apache2/apache2.conf -v ${curPath}/dm
 docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.1
 docker run -it -d --name ${container_name} ${set} ${codeMap} ${apacheMap} dci/dmapmanager:4.1
 sleep 5
 sleep 5
 curl localhost:$port2/release
 curl localhost:$port2/release
-#curl localhost:$port3
+