2021.8.4

@@ -28,10 +28,11 @@ from app.util.component.StructuredPrint import StructurePrint
 from app.util.component.PGUtil import PGUtil
 import os
 
-"""
-因为decimal不能序列化，增加Flask对decimal类的解析 
-"""
+
 class JSONEncoder(_JSONEncoder):
+    """
+    因为decimal不能序列化，增加Flask对decimal类的解析
+    """
     def default(self, o):
         if isinstance(o, decimal.Decimal):
             return float(o)
@@ -45,6 +46,10 @@ class Flask(_Flask):
 # url_json_list=None
 # sqlite3_connect= None
 def create_app():
+    """
+    flask应用创建函数
+    :return:app,flask实例
+    """
 
     # app基本设置
     app = Flask(__name__)

@@ -33,7 +33,9 @@ class Api(ApiTemplate):
             # if Table.query.filter_by(catalog_guid=self.para.get("pguid")).all():
             #     raise Exception("父目录挂载了数据，不能创建子目录")
     
-            if Catalog.query.filter_by(name=self.para.get("name"),pguid=self.para.get("pguid"),database_guid=self.para.get("database_guid")).one_or_none():
+            if Catalog.query.filter_by(name=self.para.get("name"),
+                                       pguid=self.para.get("pguid"),
+                                       database_guid=self.para.get("database_guid")).one_or_none():
                 res["msg"]="目录已经存在！"
                 return res
 
@@ -58,9 +60,12 @@ class Api(ApiTemplate):
     
             sort = Catalog.query.filter_by(pguid=self.para.get("pguid")).count()
     
-            catalog = Catalog(guid=guid,pguid=self.para.get("pguid"),name=self.para.get("name"),
-                              sort=sort,description=self.para.get("description"),
-                              database_guid=self.para.get("database_guid"),path=path)
+            catalog = Catalog(guid=guid,
+                              pguid=self.para.get("pguid"),name=self.para.get("name"),
+                              sort=sort,
+                              description=self.para.get("description"),
+                              database_guid=self.para.get("database_guid"),
+                              path=path)
             db.session.add(catalog)
             db.session.commit()
 

@@ -120,6 +120,8 @@ class Api(ApiTemplate):
         except Exception as e:
             try:
                 sys_session.query(Task).filter_by(guid=task_guid).update({"state": -1,"update_time":datetime.datetime.now()})
+                sys_session.query(Table).filter_by(guid=table.guid).update(
+                    {"is_vacuate": 0, "update_time": datetime.datetime.now()})
 
                 message = "{} {}".format(datetime.datetime.now().strftime('%Y-%m-%d %H:%M:%S'), e.__str__())
                 task_process_guid = uuid.uuid1().__str__()
@@ -133,7 +135,8 @@ class Api(ApiTemplate):
             except Exception as ee:
                 print(traceback.format_exc())
         finally:
-            vacuate_process.end()
+            if vacuate_process:
+                vacuate_process.end()
             if sys_session:
                 sys_session.close()
             if pg_session:

@@ -12,5 +12,5 @@ gevent-websocket==0.10.1
 Pillow==8.1.2
 #Rtree==0.9.7
 opencv-python==4.5.1.48
-pstuil==5.8.0
+psutil==5.8.0
 mod_wsgi==4.8.0
\ No newline at end of file

@@ -6,8 +6,3 @@
 from pyDes import des,ECB,PAD_PKCS5
 import base64
 
-
-aa = [1,2,3]
-b =[3]
-aa.extend(b)
-print(aa)
\ No newline at end of file