Commit 27f2a796 authored by litaolemo's avatar litaolemo

update

parent 0d4efe83
...@@ -113,8 +113,8 @@ for tractate_json in tractate_res_scan: ...@@ -113,8 +113,8 @@ for tractate_json in tractate_res_scan:
# print(tractate_json) # print(tractate_json)
tractate_list.append(tractate_json["_source"]) tractate_list.append(tractate_json["_source"])
_id = tractate_json["_id"] _id = tractate_json["_id"]
content_keyword_list = tractate_json["_source"]["content_keyword"] fresh_tractate_tag_list = set(tractate_json["_source"]["fresh_tractate_tag_name"] + tractate_json["_source"]["tags_v3"])
for content_keyword in content_keyword_list: for content_keyword in fresh_tractate_tag_list:
if content_keyword in tractate_dict: if content_keyword in tractate_dict:
tractate_dict[content_keyword] += 1 tractate_dict[content_keyword] += 1
else: else:
...@@ -131,10 +131,10 @@ es_query_answer = {"query": { ...@@ -131,10 +131,10 @@ es_query_answer = {"query": {
} }
} }
} }
res = pd.DataFrame(tractate_list) # res = pd.DataFrame(tractate_list)
res.to_csv("tractate_list.csv",encoding="gb18030") # res.to_csv("tractate_list.csv",encoding="gb18030")
send_file_email("", '', sender="litao@igengmei.com", email_group=["litao@igengmei.com"], email_msg_body_str="test", # send_file_email("", '', sender="litao@igengmei.com", email_group=["litao@igengmei.com"], email_msg_body_str="test",
title_str="test", cc_group=["litao@igengmei.com"], file="/srv/apps/meta_base_code/tractate_list.csv") # title_str="test", cc_group=["litao@igengmei.com"], file="/srv/apps/meta_base_code/tractate_list.csv")
answer_list = [] answer_list = []
answer_res_scan = scan(client=es, query=json.dumps(es_query_answer), index="gm-dbmw-answer-read", doc_type="answer", scroll='3m') answer_res_scan = scan(client=es, query=json.dumps(es_query_answer), index="gm-dbmw-answer-read", doc_type="answer", scroll='3m')
...@@ -142,16 +142,16 @@ answer_dict = {} ...@@ -142,16 +142,16 @@ answer_dict = {}
for answer_json in answer_res_scan: for answer_json in answer_res_scan:
answer_list.append(answer_json["_source"]) answer_list.append(answer_json["_source"])
_id = answer_json["_id"] _id = answer_json["_id"]
content_keyword_list = answer_json["_source"]["content_keyword"] fresh_answer_tag_list = set(answer_json["_source"]["fresh_tractate_tag_name"] + answer_json["_source"]["tags_v3"])
for content_keyword in content_keyword_list: for content_keyword in fresh_answer_tag_list:
if content_keyword in answer_dict: if content_keyword in answer_dict:
answer_dict[content_keyword] += 1 answer_dict[content_keyword] += 1
else: else:
answer_dict[content_keyword] = 1 answer_dict[content_keyword] = 1
res = pd.DataFrame(answer_list) # res = pd.DataFrame(answer_list)
res.to_csv("answer_list.csv",encoding="gb18030") # res.to_csv("answer_list.csv",encoding="gb18030")
send_file_email("", '', sender="litao@igengmei.com", email_group=["litao@igengmei.com"], email_msg_body_str="test", # send_file_email("", '', sender="litao@igengmei.com", email_group=["litao@igengmei.com"], email_msg_body_str="test",
title_str="test", cc_group=["litao@igengmei.com"], file="/srv/apps/meta_base_code/answer_list.csv") # title_str="test", cc_group=["litao@igengmei.com"], file="/srv/apps/meta_base_code/answer_list.csv")
for t in range(2, task_days): for t in range(2, task_days):
day_num = 0 - t day_num = 0 - t
......
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