2022.02.22 修复抽稀

@@ -80,7 +80,7 @@ class Api(ApiTemplate):
                     rename_sql = 'alter table "{}" rename to "{}"'.format(this_table.name,name)
                     rename_sql = 'alter table "{}" rename to "{}"'.format(this_table.name,name)
                     sys_session.execute(rename_sql)
                     sys_session.execute(rename_sql)
                     sys_session.commit()
                     sys_session.commit()
-                    print(rename_sql)
+
                     # 更新所有相关业务表
                     # 更新所有相关业务表
                     same_databases = Database.query.filter_by(sqlalchemy_uri=this_table.relate_database.sqlalchemy_uri).all()
                     same_databases = Database.query.filter_by(sqlalchemy_uri=this_table.relate_database.sqlalchemy_uri).all()
                     same_databases_database_guid = [d.guid for d in same_databases]
                     same_databases_database_guid = [d.guid for d in same_databases]

@@ -14,6 +14,7 @@ class Api(ApiTemplate):
     api_name = "表信息"
     api_name = "表信息"
     def process(self):
     def process(self):
         res = {}
         res = {}
+        pg_ds = None
         try:
         try:
             table_guid = self.para.get("guid")
             table_guid = self.para.get("guid")
             table = Table.query.filter_by(guid=table_guid).one_or_none()
             table = Table.query.filter_by(guid=table_guid).one_or_none()
@@ -48,6 +49,9 @@ class Api(ApiTemplate):
     
     
         except Exception as e:
         except Exception as e:
             raise e
             raise e
+        finally:
+            if pg_ds:
+                pg_ds.Destroy()
         return res
         return res
     
     
     api_doc={
     api_doc={

@@ -58,10 +58,11 @@ class Api(ApiTemplate):
             if pg_ds:
             if pg_ds:
                 pg_ds.Destroy()
                 pg_ds.Destroy()
 
 
-            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() or table.is_vacuate==2:
                 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
                 res["msg"] = "非空间表！"
                 res["msg"] = "非空间表！"

@@ -64,11 +64,13 @@ class Api(ApiTemplate):
                 res["result"] = False
                 res["result"] = False
                 res["msg"] = "矢量金字塔构建中！"
                 res["msg"] = "矢量金字塔构建中！"
                 return res
                 return res
-            if table.table_type==0:
+
+            if Task.query.filter_by(table_guid=table_guid,state=0).one_or_none() or table.is_vacuate==2:
                 res["result"] = False
                 res["result"] = False
-                res["msg"] = "非空间表！"
+                res["msg"] = "矢量金字塔构建中！"
                 return res
                 return res
 
 
+
             # 初始化task
             # 初始化task
             task_guid = uuid.uuid1().__str__()
             task_guid = uuid.uuid1().__str__()
 
 

@@ -11,7 +11,7 @@ VACUATE_DB_URI = None
 #VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 #VACUATE_DB_URI = SQLALCHEMY_DATABASE_URI
 
 
 #DMap引擎
 #DMap引擎
-dmap_engine = "http://172.26.99.160:8820"
+dmap_engine = "http://172.26.60.101:8820"
 
 
 # 固定配置不需要修改
 # 固定配置不需要修改