优化pdf生成

app/celery.py

@@ -9,6 +9,8 @@ from app.api.engine import TAMP_SQL, tamp_diagnose_app_engine, template_folder,
     redis_host, redis_port, redis_db, redis_password, pdf_save_folder
 from app.model.tamp_diagnose_app import HoldReport, HoldDiagnoseReport, PeriodicReport, Customer, ReportView
 from app.utils.jinjia2html_v2 import DataIntegrate
+from jinja2 import PackageLoader, Environment
+from app.utils.html_to_pdf import html_to_pdf
 
 celery_app = Celery(__name__)
 
@@ -25,8 +27,11 @@ def save_pdf(id, ifa_id, customer_id, pdf_name, type, report_data):
     :return:
     """
     try:
-        dt = DataIntegrate(ifa_id=ifa_id, customer_id=customer_id, pdf_name=pdf_name, type=type)
-        dt.render_data(data=report_data)
+        env = Environment(loader=PackageLoader('app', 'templates'))  # 创建一个包加载器对象
+        template = env.get_template('/v2/monthReportV2.1.html')  # 获取一个模板文件
+        monthReport_html = template.render(report_data).replace('None', 'none')  # 渲染
+        # 生成pdf
+        html_to_pdf(monthReport_html, pdf_save_folder + pdf_name)
     except:
         pass
     with TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app: