Commit 32248866 authored by pengxiong's avatar pengxiong

路径

parent 351d51e4
......@@ -22,6 +22,8 @@ CFG_FILEPATH = work_dir + '/app/config/config.yaml'
config = yaml.load(open(CFG_FILEPATH, 'r'), Loader=yaml.FullLoader)
temp_img_save_folder = work_dir + '/app/templates/temp_img/productionenv/ReportTempImg/'
pdf_save_folder = work_dir + '/app/pdf/'
template_folder = config[env]['oss']['imgs_url_prefix']
pdf_folder = config[env]['oss']['pdf_url_prefix']
......
......@@ -5,7 +5,7 @@ from sqlalchemy import Column, DECIMAL, Date, DateTime, Index, String, Table, Te
from sqlalchemy.dialects.mysql import BIGINT, INTEGER
from sqlalchemy.ext.declarative import declarative_base
from app.api.engine import TAMP_SQL, tamp_user_engine, tamp_diagnose_app_engine
from app.api.engine import TAMP_SQL, tamp_user_engine, tamp_diagnose_app_engine, pdf_folder
from app.model.base import Base
from app.model.base import BaseModel
......@@ -138,6 +138,7 @@ class HoldDiagnoseReport(Base, BaseModel):
allow_field = set(allow_field) & set(allow_field)
else:
allow_field = all_field
self.file = pdf_folder + self.file
data = {c: int(getattr(self, c).timestamp()) if isinstance(getattr(self, c), datetime.datetime) else getattr(self, c) for c in allow_field}
with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
tamp_user_session = tamp_user.session
......@@ -177,6 +178,7 @@ class HoldReport(Base, BaseModel):
allow_field = set(allow_field) & set(allow_field)
else:
allow_field = all_field
self.file = pdf_folder + self.file
data = {c: int(getattr(self, c).timestamp()) if isinstance(getattr(self, c), datetime.datetime) else getattr(self, c) for c in allow_field}
with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
tamp_user_session = tamp_user.session
......@@ -216,6 +218,7 @@ class PeriodicReport(Base, BaseModel):
allow_field = set(allow_field) & set(allow_field)
else:
allow_field = all_field
self.file = pdf_folder + self.file
data = {c: int(getattr(self, c).timestamp()) if isinstance(getattr(self, c), datetime.datetime) else getattr(self, c) for c in allow_field}
with TAMP_SQL(tamp_user_engine) as tamp_user, TAMP_SQL(tamp_diagnose_app_engine) as tamp_diagnose_app:
tamp_user_session = tamp_user.session
......
......@@ -19,7 +19,7 @@ from matplotlib import ticker
from matplotlib.ticker import FuncFormatter
from matplotlib.font_manager import FontProperties
from app.api.engine import template_folder
from app.api.engine import template_folder, work_dir, temp_img_save_folder
matplotlib.use('Agg')
# 中文字体初始化
......@@ -98,9 +98,9 @@ def draw_month_return_chart(xlabels, product_list, cumulative):
# imgdata.seek(0) # rewind the data
# month_return_img = 'data:image/png;base64,' + base64.b64encode(imgdata.getvalue()).decode('utf-8')
filename = str(uuid.uuid4()) + '.png'
filepath = template_folder + filename
fig.savefig(filepath, format='png', bbox_inches='tight')
return filepath
fig.savefig(temp_img_save_folder + filename, format='png', bbox_inches='tight')
return_path = template_folder + filename
return return_path
def draw_contribution_chart(xlabels, product_list, cumulative):
......@@ -165,9 +165,9 @@ def draw_contribution_chart(xlabels, product_list, cumulative):
# month_return_img = 'data:image/png;base64,' + base64.b64encode(imgdata.getvalue()).decode('utf-8')
# return month_return_img
filename = str(uuid.uuid4()) + '.png'
filepath = template_folder + filename
fig.savefig(filepath, format='png', bbox_inches='tight')
return filepath
fig.savefig(temp_img_save_folder + filename, format='png', bbox_inches='tight')
return_path = template_folder + filename
return return_path
# def draw_contribution_chart(xlabels, product_list, cumulative):
# """贡献分解图"""
......@@ -309,9 +309,9 @@ def draw_old_combination_chart(xlabels, origin_combination, index):
# return_compare_img = 'data:image/png;base64,' + base64.b64encode(imgdata.getvalue()).decode('utf-8')
# return return_compare_img
filename = str(uuid.uuid4()) + '.png'
filepath = template_folder + filename
fig.savefig(filepath, format='png', bbox_inches='tight')
return filepath
fig.savefig(temp_img_save_folder + filename, format='png', bbox_inches='tight')
return_path = template_folder + filename
return return_path
def draw_combination_chart(xlabels, new_combination, origin_combination, index):
......@@ -359,9 +359,9 @@ def draw_combination_chart(xlabels, new_combination, origin_combination, index):
# return_compare_img = 'data:image/png;base64,' + base64.b64encode(imgdata.getvalue()).decode('utf-8')
# return return_compare_img
filename = str(uuid.uuid4()) + '.png'
filepath = template_folder + filename
fig.savefig(filepath, format='png', bbox_inches='tight')
return filepath
fig.savefig(temp_img_save_folder + filename, format='png', bbox_inches='tight')
return_path = template_folder + filename
return return_path
def draw_index_combination_chart(compare_data):
......@@ -415,9 +415,9 @@ def draw_index_combination_chart(compare_data):
# return_compare_img = 'data:image/png;base64,' + base64.b64encode(imgdata.getvalue()).decode('utf-8')
# return return_compare_img
filename = str(uuid.uuid4()) + '.png'
filepath = template_folder + filename
fig.savefig(filepath, format='png', bbox_inches='tight')
return filepath
fig.savefig(temp_img_save_folder + filename, format='png', bbox_inches='tight')
return_path = template_folder + filename
return return_path
if __name__ == '__main__':
# xlabels = ('2020-1', '2020-2', '2020-3', '2020-4', '2020-5', '2020-6', '2020-7', '2020-8', '2020-9', '2020-10', '2020-11', '2020-12')
......
......@@ -4,7 +4,7 @@ import uuid
from jinja2 import PackageLoader, Environment
from app.api.engine import work_dir, pdf_folder, template_folder
from app.api.engine import work_dir, pdf_folder, template_folder, pdf_save_folder
from app.config.default_template_params import hold_default_template, diagnose_default_template
from app.service.portfolio_diagnose import PortfolioDiagnose
from app.service.result_service_v2 import UserCustomerResultAdaptor
......@@ -305,7 +305,7 @@ class DataIntegrate:
# save_file = "app/html/v2/monthReportV2.html"
# with open(save_file, 'w', encoding="utf-8") as f:
# f.write(monthReport_html)
html_to_pdf(monthReport_html, pdf_folder + self.pdf_name)
html_to_pdf(monthReport_html, pdf_save_folder + self.pdf_name)
if __name__ == '__main__':
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment