DigitalMgnt
/
tfse-admin-api-v0.2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'sg' into 'master' 

update 上传宏观报告调整

See merge request root/tfse_admin!10
This commit is contained in:
王思川 2022-01-14 09:29:19 +00:00
parent a107ea975d bbcba70662
commit fa515f3e6d
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rating/db.py
View File

@ -157,8 +157,8 @@ def find_macroscopic_report_data(industry):
Returns:
record: 报告数据
"""
collection = client['宏观']['行业数据']
data = collection.find({"行业分类": industry}, {'_id': False})
collection = client['宏观']['行业报告']
data = collection.find({"行业名称": industry}, {'_id': False})
record = list(data)
return record
@ -171,23 +171,24 @@ def insert_macroscopic_report_data(insert_data):
Returns:
result: 保存结果
"""
collection = client['宏观']['行业数据']
collection = client['宏观']['行业报告']
res = collection.insert_one(insert_data)
info = res.acknowledged
return info
def update_macroscopic_report_data(industry, fid):
def update_macroscopic_report_data(industry, update_time, fid):
"""
更新宏观报告数据id
Parameters:
industry: 行业分类
update_time: 上传日期
fid: 文件id
Returns:
result: 更新结果
"""
collection = client['宏观']['行业数据']
res = collection.update_one({"行业分类": industry}, {"$set": {"报告fid": fid}})
collection = client['宏观']['行业报告']
res = collection.update_one({"行业名称": industry, '上传日期': update_time}, {"$set": {"报告fid": fid}})
info = res.raw_result['updatedExisting']
return info

9
rating/scripts.py
View File

@ -145,7 +145,7 @@ def upload_macroscopic_report_script(industry, file):
Returns:
result: 生成结果
"""
file_name = '{}_{}'.format(industry, datetime.datetime.now().strftime('%Y%m'))
file_name = industry + '宏观报告'
file_id = upload_report(file_name, file)
return file_id
@ -154,8 +154,9 @@ def upload_macroscopic_report_script(industry, file):
# 根据行业名称查询此行业是否存在宏观报告
macrosc = find_macroscopic_report_data(industry)
if macrosc:
update_time = datetime.datetime.now().strftime('%Y-%m-%d')
# 使用新fid更新此条数据
upload_res = update_macroscopic_report_data(industry, new_fid)
upload_res = update_macroscopic_report_data(industry, update_time, new_fid)
if upload_res:
return new_fid
else:
@ -163,8 +164,10 @@ def upload_macroscopic_report_script(industry, file):
else:
# 不存在此条数据，就插入一条新数据
insert_data = dict()
insert_data['行业分类'] = industry
insert_data['行业名称'] = industry
insert_data['报告名称'] = industry + '宏观报告'
insert_data['报告fid'] = new_fid
insert_data['上传日期'] = datetime.datetime.now().strftime('%Y-%m-%d')
save_res = insert_macroscopic_report_data(insert_data)
if save_res:
return new_fid