2022.04.18 修复任务bug

@@ -44,7 +44,6 @@ class Api(ApiTemplate):
                         file_name=None,
                         process="数据下载中",
                         database_guid=self.para.get("database_guid"),
-                        # task_pid=download_process.pid
                         )
 
             db.session.add(task)
@@ -53,9 +52,6 @@ class Api(ApiTemplate):
             download_process = multiprocessing.Process(target=self.download, args=(task_guid,self.para))
             download_process.start()
 
-            Task.query.filter_by(guid=task_guid).update({"task_pid": download_process.pid})
-            db.session.commit()
-
             res["data"] = "下载任务已提交!"
 
             # 提示信息
@@ -84,10 +80,12 @@ class Api(ApiTemplate):
 
         try:
 
+            task_writer = TaskWriter(task_guid)
+            pid = multiprocessing.current_process().pid
+            task_writer.update_task({"task_pid":pid})
             #任务控制,等待执行
 
             TaskController.wait(task_guid)
-            task_writer = TaskWriter(task_guid)
 
             task_writer.update_task({"state":2,"update_time":datetime.datetime.now(),"process" : "下载中"})
             task_writer.update_process("开始下载...")

@@ -101,9 +101,6 @@ class Api(ApiTemplate):
             entry_thread = multiprocessing.Process(target=self.entry,args=(self.para.get("task_guid"),))
             entry_thread.start()
 
-            Task.query.filter_by(guid=task_guid).update({"task_pid": entry_thread.pid})
-            db.session.commit()
-
             res["result"] = True
             res["msg"] = "数据录入提交成功！"
             res["data"] = self.para["task_guid"]
@@ -116,11 +113,13 @@ class Api(ApiTemplate):
         task_writer = None
         this_task_layer = []
         try:
+            task_writer = TaskWriter(task_guid)
+            pid = multiprocessing.current_process().pid
+            task_writer.update_task({"task_pid": pid})
 
             #任务控制,等待执行
-            TaskController.wait(task_guid)
 
-            task_writer = TaskWriter(task_guid)
+            TaskController.wait(task_guid)
 
             task:Task = task_writer.session.query(Task).filter_by(guid=task_guid).one_or_none()
             parameter = json.loads(task.parameter)

@@ -43,8 +43,7 @@ class Api(ApiTemplate):
                         creator=self.para.get("creator"),
                         file_name=None,
                         database_guid=database.guid,
-                        process="数据库更新中",
-                        # task_pid=refresh_process.pid
+                        process="数据库更新中"
                         )
 
             db.session.add(task)
@@ -53,13 +52,12 @@ class Api(ApiTemplate):
             refresh_process = multiprocessing.Process(target=self.table_refresh,args=(database,task_guid,self.para.get("creator")))
             refresh_process.start()
 
-            Task.query.filter_by(guid=task_guid).update({"task_pid":refresh_process.pid})
-            db.session.commit()
 
             res["msg"] = "数据库更新已提交！"
             res["data"] = task_guid
             res["result"] = True
 
+
         except Exception as e:
             print(traceback.format_exc())
             raise e
@@ -69,24 +67,24 @@ class Api(ApiTemplate):
     def table_refresh(self,database,task_guid,creator):
 
         pg_ds =None
-        sys_ds =None
+        # sys_ds =None
         data_session=None
         result = {}
         sys_session = None
         task_writer = None
 
-
         db_tuple = PGUtil.get_info_from_sqlachemy_uri(DES.decode(database.sqlalchemy_uri))
 
         try:
-
-            #任务控制,等待执行
-            TaskController.wait(task_guid)
             task_writer = TaskWriter(task_guid)
+            pid = multiprocessing.current_process().pid
+            task_writer.update_task({"task_pid":pid})
 
+            # 任务控制,等待执行
+            TaskController.wait(task_guid)
 
             sys_session = PGUtil.get_db_session(configure.SQLALCHEMY_DATABASE_URI)
-            sys_ds = PGUtil.open_pg_data_source(0,configure.SQLALCHEMY_DATABASE_URI)
+            # sys_ds = PGUtil.open_pg_data_source(0,configure.SQLALCHEMY_DATABASE_URI)
             # 实体库连接
             data_session: Session = PGUtil.get_db_session(DES.decode(database.sqlalchemy_uri))
 
@@ -113,7 +111,6 @@ class Api(ApiTemplate):
             # 空间表处理完毕
             sys_session.commit()
 
-
             # 注册普通表
 
 
@@ -173,8 +170,8 @@ class Api(ApiTemplate):
                 data_session.close()
             if sys_session:
                 sys_session.close()
-            if sys_ds:
-                sys_ds.Destroy()
+            # if sys_ds:
+            #     sys_ds.Destroy()
         return result
 
     def add_spatail_table(self,database,pg_ds,data_session,sys_session,spatial_tables_names,this_time,db_tuple,creator):

@@ -92,9 +92,6 @@ class Api(ApiTemplate):
             vacuate_process = multiprocessing.Process(target=self.task,args=(table,task_guid))
             vacuate_process.start()
 
-            Task.query.filter_by(guid=task_guid).update({"task_pid": vacuate_process.pid})
-            db.session.commit()
-
             res["msg"] = "矢量金字塔构建已提交！"
             res["data"] = task_guid
             res["result"] = True
@@ -114,11 +111,13 @@ class Api(ApiTemplate):
         vacuate_process = None
         try:
 
+            task_writer = TaskWriter(task_guid)
+            pid = multiprocessing.current_process().pid
+            task_writer.update_task({"task_pid":pid})
+
             #任务控制,等待执行
             TaskController.wait(task_guid)
 
-            task_writer = TaskWriter(task_guid)
-
             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("开始构建...")

@@ -98,9 +98,6 @@ class Api(ApiTemplate):
             vacuate_process = multiprocessing.Process(target=self.task,args=(table,task_guid,grids))
             vacuate_process.start()
 
-            Task.query.filter_by(guid=task_guid).update({"task_pid": vacuate_process.pid})
-            db.session.commit()
-
             res["msg"] = "矢量金字塔构建已提交！"
             res["data"] = task_guid
             res["result"] = True
@@ -122,9 +119,13 @@ class Api(ApiTemplate):
 
         try:
 
+
+            task_writer = TaskWriter(task_guid)
+            pid = multiprocessing.current_process().pid
+            task_writer.update_task({"task_pid":pid})
+
             #任务控制,等待执行
             TaskController.wait(task_guid)
-            task_writer =  TaskWriter(task_guid)
 
             task_writer.update_table(table.guid,{"is_vacuate": 2, "update_time": datetime.datetime.now()})
             task_writer.update_task({"state":2,"process":"构建中"})