优化抽稀功能，超大的图形可以额外加入到抽稀图层中

@@ -107,44 +107,48 @@ class Api(ApiTemplate):
         for i in range(pg_ds.GetLayerCount()):
             layer: Layer = pg_ds.GetLayer(i)
             l_name = layer.GetName()
+            try:
 
-            # 只注册public的空间表,其他表空间的表名会有.
-            if layer.GetName().__contains__("."):
-                continue
-
-            # 不注册抽稀表
-            if layer.GetName().__contains__("_vacuate_"):
-                spatial_table_name.append(layer.GetName())
-                continue
+                # 只注册public的空间表,其他表空间的表名会有.
+                if layer.GetName().__contains__("."):
+                    continue
 
-            # 没有权限的表跳过
-            if not PGUtil.check_table_privilege(l_name,"SELECT",db_tuple[0],pg_ds):
-                StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0],l_name),"warn")
-                continue
+                # 不注册抽稀表
+                if layer.GetName().__contains__("_vacuate_"):
+                    spatial_table_name.append(layer.GetName())
+                    continue
 
-            # 范围统计和数量统计以100w为界限
-            query_count_layer: Layer = pg_ds.ExecuteSQL(
-                '''SELECT reltuples::bigint AS ec FROM pg_class WHERE  oid = 'public."{}"'::regclass'''.format(l_name))
+                # 没有权限的表跳过
+                if not PGUtil.check_table_privilege(l_name,"SELECT",db_tuple[0],pg_ds):
+                    StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0],l_name),"warn")
+                    continue
 
-            feature_count = query_count_layer.GetFeature(0).GetField("ec")
-            # 要素少于100w可以精确统计
-            if feature_count < 1000000:
-                feature_count = layer.GetFeatureCount()
-                ext = layer.GetExtent()
-            else:
-                query_ext_layer: Layer = pg_ds.ExecuteSQL(
-                    "select geometry(ST_EstimatedExtent('public', '{}','{}'))".format(l_name,
-                                                                                       layer.GetGeometryColumn()))
-                ext = query_ext_layer.GetExtent()
-            if ext[0] < 360:
-                ext = [round(e, 6) for e in ext]
-            else:
-                ext = [round(e, 2) for e in ext]
-            extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
+                # 范围统计和数量统计以100w为界限
+                query_count_layer: Layer = pg_ds.ExecuteSQL(
+                    '''SELECT reltuples::bigint AS ec FROM pg_class WHERE  oid = 'public."{}"'::regclass'''.format(l_name))
+
+                feature_count = query_count_layer.GetFeature(0).GetField("ec")
+                # 要素少于100w可以精确统计
+                if feature_count < 1000000:
+                    feature_count = layer.GetFeatureCount()
+                    ext = layer.GetExtent()
+                else:
+                    query_ext_layer: Layer = pg_ds.ExecuteSQL(
+                        "select geometry(ST_EstimatedExtent('public', '{}','{}'))".format(l_name,
+                                                                                           layer.GetGeometryColumn()))
+                    ext = query_ext_layer.GetExtent()
+                if ext[0] < 360:
+                    ext = [round(e, 6) for e in ext]
+                else:
+                    ext = [round(e, 2) for e in ext]
+                extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
 
-            table_guid = uuid.uuid1().__str__()
+                table_guid = uuid.uuid1().__str__()
 
-            geom_type = GeometryAdapter.get_geometry_type(layer)
+                geom_type = GeometryAdapter.get_geometry_type(layer)
+            except:
+                StructurePrint.print("表{}注册失败！".format(l_name), "warn")
+                continue
 
             table = Table(guid=table_guid,
                           database_guid=database.guid,

@@ -14,12 +14,15 @@ from app.models import db
 from app.util.component.ApiTemplate import ApiTemplate
 
 from app.util.component.PGUtil import PGUtil
+import configure
+from flask import current_app
 class Api(ApiTemplate):
     api_name = "删除表"
     def process(self):
 
         res = {}
         pg_ds = None
+        sys_ds = None
         try:
 
             table_guid = self.para.get("guid")
@@ -45,14 +48,22 @@ class Api(ApiTemplate):
 
     
             pg_ds: DataSource = PGUtil.open_pg_data_source(1, DES.decode(database.sqlalchemy_uri))
-
+            sys_ds: DataSource = PGUtil.open_pg_data_source(1, configure.SQLALCHEMY_DATABASE_URI)
 
             #删除抽稀表
             vacuate_tables=table.relate_table_vacuates.all()
             for vt in vacuate_tables:
-                pg_ds.DeleteLayer(vt.name)
+                db.session.delete(vt)
+                try:
+                    sys_ds.DeleteLayer(vt.name)
+                except:
+                    current_app.logger.warning("{}不存在！".format(vt.name))
+
+            try:
+                pg_ds.DeleteLayer(table.name)
+            except:
+                current_app.logger.warning("{}不存在！".format(table.name))
 
-            pg_ds.DeleteLayer(table.name)
 
             # 删除元数据
 
@@ -65,6 +76,8 @@ class Api(ApiTemplate):
         finally:
             if pg_ds:
                 pg_ds.Destroy()
+            if sys_ds:
+                sys_ds.Destroy()
         return res
 
     api_doc={

@@ -13,10 +13,10 @@ class Api(ApiTemplate):
         res = {}
         try:
             table_guid = self.para.get("guid")
-            table = Table.query.filter_by(guid=table_guid)
-            if not table.one_or_none():
+            table = Table.query.filter_by(guid=table_guid).one_or_none()
+            if not table:
                 raise Exception("数据不存在！")
-            table = table.one_or_none()
+
             columns = table.relate_columns.order_by(Columns.name).all()
             res["data"]=ModelVisitor.table_to_json(table)
             res["data"]["columns"] = ModelVisitor.objects_to_jsonarray(columns)

@@ -189,43 +189,47 @@ class Api(ApiTemplate):
             if layer.GetName() not in spatial_tables_names:
                 l_name = layer.GetName()
 
-                # 只注册public的空间表,其他表空间的表名会有.
-                if layer.GetName().__contains__("."):
-                    continue
-                # 略过抽稀表
-                if layer.GetName().__contains__("_vacuate_"):
-                    continue
-
-                # 没有权限的表跳过
-                if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
-                    StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
-                    continue
-
-
-                # 范围统计和数量统计以100w为界限
-                query_count_layer: Layer = pg_ds.ExecuteSQL(
-                    '''SELECT reltuples::bigint AS ec FROM pg_class WHERE  oid = 'public."{}"'::regclass'''.format(
-                        l_name))
+                try:
+                    # 只注册public的空间表,其他表空间的表名会有.
+                    if layer.GetName().__contains__("."):
+                        continue
+                    # 略过抽稀表
+                    if layer.GetName().__contains__("_vacuate_"):
+                        continue
 
-                feature_count = query_count_layer.GetFeature(0).GetField("ec")
-                # 要素少于100w可以精确统计
-                if feature_count < 1000000:
-                    feature_count = layer.GetFeatureCount()
-                    ext = layer.GetExtent()
-                else:
-                    query_ext_layer: Layer = pg_ds.ExecuteSQL(
-                        "select geometry(ST_EstimatedExtent('public', '{}','{}'))".format(l_name,
-                                                                                          layer.GetGeometryColumn()))
-                    ext = query_ext_layer.GetExtent()
-                if ext[0] < 360:
-                    ext = [round(e, 6) for e in ext]
-                else:
-                    ext = [round(e, 2) for e in ext]
-                extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
+                    # 没有权限的表跳过
+                    if not PGUtil.check_table_privilege(l_name, "SELECT", db_tuple[0], pg_ds):
+                        StructurePrint.print("用户{}对表{}没有select权限！".format(db_tuple[0], l_name), "warn")
+                        continue
 
-                StructurePrint.print("空间表增加！")
 
-                geom_type = GeometryAdapter.get_geometry_type(layer)
+                    # 范围统计和数量统计以100w为界限
+                    query_count_layer: Layer = pg_ds.ExecuteSQL(
+                        '''SELECT reltuples::bigint AS ec FROM pg_class WHERE  oid = 'public."{}"'::regclass'''.format(
+                            l_name))
+
+                    feature_count = query_count_layer.GetFeature(0).GetField("ec")
+                    # 要素少于100w可以精确统计
+                    if feature_count < 1000000:
+                        feature_count = layer.GetFeatureCount()
+                        ext = layer.GetExtent()
+                    else:
+                        query_ext_layer: Layer = pg_ds.ExecuteSQL(
+                            "select geometry(ST_EstimatedExtent('public', '{}','{}'))".format(l_name,
+                                                                                              layer.GetGeometryColumn()))
+                        ext = query_ext_layer.GetExtent()
+                    if ext[0] < 360:
+                        ext = [round(e, 6) for e in ext]
+                    else:
+                        ext = [round(e, 2) for e in ext]
+                    extent = "{},{},{},{}".format(ext[0], ext[1], ext[2], ext[3])
+
+                    StructurePrint.print("空间表增加！")
+
+                    geom_type = GeometryAdapter.get_geometry_type(layer)
+                except:
+                    StructurePrint.print("表{}注册失败！".format(l_name), "warn")
+                    continue
 
                 table_guid = uuid.uuid1().__str__()
                 table = Table(guid=table_guid,

@@ -293,8 +293,8 @@ class VacuateProcess:
 
                 v_ln = "z{}_vacuate_{}_{}".format(table_guid,lev, grid_name)
                 vl = pg.CreateLayer(v_ln, layer.GetSpatialRef(),ogr.wkbUnknown, options)
-                # 抽稀表不需要属性
-                # vl.CreateFields(schema)
+                # 抽稀表需要属性
+                vl.CreateFields(layer.schema)
                 self.vacuate_layers[l] = vl
 
         else:

@@ -165,19 +165,20 @@ def clip():
         raise Exception("打开数据失败！")
 
     output_ds: DataSource = shp_driver.CreateDataSource(output)
-
-    out_layer: Layer = output_ds.CreateLayer(layer.GetName(), layer.GetSpatialRef(), layer.GetGeomType())
-    out_layer.CreateFields(layer.schema)
+    #
+    # out_layer: Layer = output_ds.CreateLayer(layer.GetName(), layer.GetSpatialRef(), layer.GetGeomType())
+    # out_layer.CreateFields(layer.schema)
     for f in layer:
-        new_f = copy.copy(f)
+        new_f:Feature = copy.copy(f)
         out_g = f.GetGeometryRef()
         if out_g.Intersect(bound_geo):
             out_g = out_g.Intersection(bound_geo)
             new_f.SetGeometry(out_g)
+            new_f.SetField("ttt",1)
             # new_f.UnsetField("OBJECTID")
-            out_layer.CreateFeature(new_f)
+            # out_layer.CreateFeature(new_f)
 
-    output_ds.Destroy()
+    # output_ds.Destroy()
 
 
 
@@ -186,7 +187,7 @@ if __name__ == '__main__':
     # input = r"E:\Data\copy\origin.shp"
     # output = r"E:\Data\copy\re.shp"
     # copydata(bound_shp,input,output)
-
+    #
     # bound_shp = "/root/CopyData/gdsample.shp"
     # input = r"/root/CopyData/origin.shp"
     # output = r"/root/CopyData/re.gdb"

@@ -157,7 +157,7 @@ class EntryDataVacuate:
 
         # this_task.pg_ds.StartTransaction()
         new_layer_name = None
-        vacuate_process= None
+        # vacuate_process= None
         success = True
         table_guid = uuid.uuid1().__str__()
         try:
@@ -200,7 +200,7 @@ class EntryDataVacuate:
             pg_layer.CreateFields(schema)
 
             #创建抽稀过程
-            vacuate_process = VacuateProcess(layer,table_guid,options)
+            # vacuate_process = VacuateProcess(layer,table_guid,options)
 
 
 
@@ -229,17 +229,18 @@ class EntryDataVacuate:
                 pg_layer.CreateFeature(out_feature)
 
                 #插入抽稀图层
-                if out_geom is not None:
-                    vacuate_process.vacuate(out_geom)
+                # if out_geom is not None:
+                #     vacuate_process.vacuate(out_geom)
 
             # 注册图层信息
             # 是否抽吸过
-            is_vacuate = 1 if vacuate_process.max_level>0 else 0
+            # is_vacuate = 1 if vacuate_process.max_level>0 else 0
+            is_vacuate = 0
 
             this_task.register_table(pg_layer,new_layer_name,overwrite,parameter.get("creator"),is_vacuate,table_guid)
 
             # 注册抽稀表
-            this_task.register_table_vacuate(table_guid,vacuate_process.vacuate_layers)
+            # this_task.register_table_vacuate(table_guid,vacuate_process.vacuate_layers)
 
             this_task.write_process("{}图层入库成功。".format(new_layer_name))
 
@@ -249,11 +250,12 @@ class EntryDataVacuate:
             StructurePrint.print("{}入库失败，数据回滚！原因：{}".format(new_layer_name,e.__str__()), "error")
             print(traceback.format_exc())
             # 抽稀回滚
-            vacuate_process.rollback()
+            # vacuate_process.rollback()
             success =False
 
         finally:
-            vacuate_process.end()
+            # vacuate_process.end()
+            pass
         return success,new_layer_name
 
 
@@ -516,8 +518,8 @@ class VacuateProcess:
 
                 v_ln = "z{}_vacuate_{}_{}".format(table_guid, self.t_grid_size.index(this_grid_len), grid_name)
                 vl = pg.CreateLayer(v_ln, layer.GetSpatialRef(),ogr.wkbUnknown, options)
-                # 抽稀表不需要属性
-                # vl.CreateFields(schema)
+                # 抽稀表需要属性
+                vl.CreateFields(layer.schema)
                 self.vacuate_layers[l] = vl
 
         else:

@@ -3,11 +3,17 @@
 #createtime:    2021/5/17
 #email:         nheweijun@sina.com
 import datetime
-
+import os
 
 class StructurePrint:
 
+    log_file = os.path.join(os.path.dirname(
+        os.path.dirname(
+            os.path.dirname(
+                os.path.dirname(
+                    os.path.realpath(__file__))))), "logs", "log.txt")
     @classmethod
     def print(cls,mes, type="info"):
-        message = "[{}] {} {}".format(type.upper(), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), mes)
-        print(message)
+        with open(cls.log_file,"a",encoding="utf-8") as f:
+            message = "[{}] {} {}\n".format(type.upper(), datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), mes)
+            f.write(message)

@@ -4,9 +4,11 @@
 deploy_ip_host = "172.26.99.160:8840"
 # 系统数据库
 
-# SQLALCHEMY_DATABASE_URI = "postgresql://postgres:postgres@172.26.40.254:5433/dmap_dms_test"
 SQLALCHEMY_DATABASE_URI = "postgresql://postgres:chinadci@172.26.99.160:5432/dmap_dms_test"
 
+# 指定精华表所在位置(必须为空间库)，设置为None则存放在各自的实体库中
+VACUATE_DB_URI = None
+# VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 # 部署模式cluster，standalone
 deployment_mode = "cluster"

-4N
-4N
\ No newline at end of file