将make_report 改成celery

app/celery.py

@@ -13,7 +13,7 @@ celery_app.conf.update({"broker_url": celery_conf, "result_backend": celery_conf
 
 
 @celery_app.task
-def save_pdf(ifa_id, customer_id, pdf_name, type, report_data):
+def save_pdf(id, ifa_id, customer_id, pdf_name, type, report_data):
     """
     加法
     :param x:

app/service/report_service.py

@@ -143,7 +143,7 @@ def edit_report(args):
             'update_time': datetime.datetime.now()
         })
         
-        save_pdf.delay(ifa_id, res[0].customer_id, pdf_name, type, report_data)
+    save_pdf.delay(id, ifa_id, res[0].customer_id, pdf_name, type, report_data)
         # try:
         #     dt = DataIntegrate(ifa_id=ifa_id, customer_id=res[0].customer_id, pdf_name=pdf_name, type=type)
         #     dt.render_data(data=json.loads(report_data.replace(template_folder, temp_img_save_folder)))
@@ -206,39 +206,42 @@ def make_report(args):
         tamp_diagnose_session.add(report_record)
         tamp_diagnose_session.flush()
         record_id = report_record.id
-    pid = os.fork()
-    if pid == 0:
-        try:
-            dt = DataIntegrate(ifa_id=ifa_id, customer_id=customer_id, pdf_name=pdf_name, type=type)
-            dt.render_data(data=report_data)
-        except:
-            pass
-        with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
-            tamp_diagnose_session = tamp_diagnose_app.session
-            hold_report = tamp_diagnose_session.query(HoldReport).filter(and_(
-                HoldReport.id == record_id,
-                HoldReport.ifa_id == ifa_id,
-            ))
-            hold_diagnose_report = tamp_diagnose_session.query(HoldDiagnoseReport).filter(and_(
-                HoldDiagnoseReport.id == record_id,
-                HoldDiagnoseReport.ifa_id == ifa_id,
-            ))
-            periodic_report = tamp_diagnose_session.query(PeriodicReport).filter(and_(
-                PeriodicReport.id == record_id,
-                PeriodicReport.ifa_id == ifa_id,
-            ))
-            if type == 1:
-                res = hold_report
-            elif type == 2:
-                res = hold_diagnose_report
-            elif type == 3:
-                res = periodic_report
-            if not res:
-                return False
-            res.update({
-                'file': pdf_name,
-                'update_status': 2,
-                'update_time': datetime.datetime.now()
-            })
-    else:
-        return {'record_id': record_id}
+        
+    save_pdf.delay(record_id, ifa_id, customer_id, pdf_name, type, report_data)
+    return True
+    # pid = os.fork()
+    # if pid == 0:
+    #     try:
+    #         dt = DataIntegrate(ifa_id=ifa_id, customer_id=customer_id, pdf_name=pdf_name, type=type)
+    #         dt.render_data(data=report_data)
+    #     except:
+    #         pass
+    #     with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
+    #         tamp_diagnose_session = tamp_diagnose_app.session
+    #         hold_report = tamp_diagnose_session.query(HoldReport).filter(and_(
+    #             HoldReport.id == record_id,
+    #             HoldReport.ifa_id == ifa_id,
+    #         ))
+    #         hold_diagnose_report = tamp_diagnose_session.query(HoldDiagnoseReport).filter(and_(
+    #             HoldDiagnoseReport.id == record_id,
+    #             HoldDiagnoseReport.ifa_id == ifa_id,
+    #         ))
+    #         periodic_report = tamp_diagnose_session.query(PeriodicReport).filter(and_(
+    #             PeriodicReport.id == record_id,
+    #             PeriodicReport.ifa_id == ifa_id,
+    #         ))
+    #         if type == 1:
+    #             res = hold_report
+    #         elif type == 2:
+    #             res = hold_diagnose_report
+    #         elif type == 3:
+    #             res = periodic_report
+    #         if not res:
+    #             return False
+    #         res.update({
+    #             'file': pdf_name,
+    #             'update_status': 2,
+    #             'update_time': datetime.datetime.now()
+    #         })
+    # else:
+    #     return {'record_id': record_id}