From 207395ec593b3f731dc50460d59a458be67ef8df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= Date: Mon, 13 Dec 2021 18:07:33 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E5=AD=98=E5=82=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- company/CompanyIndex.py | 2 -- company/routes.py | 5 ++--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/company/CompanyIndex.py b/company/CompanyIndex.py index 3d23a27..8462b31 100644 --- a/company/CompanyIndex.py +++ b/company/CompanyIndex.py @@ -12,5 +12,3 @@ class CompanyIndex: return "查询成功", result[0] else: return "无数据", {} - - diff --git a/company/routes.py b/company/routes.py index 5988eda..f02c6f8 100644 --- a/company/routes.py +++ b/company/routes.py @@ -10,9 +10,9 @@ company_route = Blueprint('company', __name__) @verify_token def basic_info_route(**kwargs): """ - Notes + 企业基本信息 Parameters: - param: desc + param desc Returns: res: desc """ @@ -20,4 +20,3 @@ def basic_info_route(**kwargs): company_index.cid = kwargs['cid'] info, result = company_index.basic_info_obj() return {"info": info, "result": result} - From 9bf437d66629439bbeffd5587806f8f415d8a8e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= Date: Wed, 15 Dec 2021 10:55:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=A1=AB=E6=8A=A5?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E8=BF=9B=E8=A1=8C=E7=BB=BC=E5=90=88?= =?UTF-8?q?=E4=BF=A1=E7=94=A8=E6=89=93=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- input/InputForm.py | 7 +++++-- input/db.py | 22 ++++++++++++++++++++++ input/routes.py | 19 ++++++++++++++----- input/scripts.py | 40 +++++++++++++++++++++++++++++++++++++++- 4 files changed, 80 insertions(+), 8 deletions(-) diff --git a/input/InputForm.py b/input/InputForm.py index c49ba96..160c9c3 100644 --- a/input/InputForm.py +++ b/input/InputForm.py @@ -43,13 +43,16 @@ class InputForm: def exec_general_rating(self): """ - Notes + 提交数据，执行综合信用评价 Parameters: param: desc Returns: res: desc """ - pass + if exec_general_rating_scripts(self.cid): + return "评分成功，请前往主页查看", 200 + else: + return "评分失败，请检查数据，或联系管理员", 210 @staticmethod def choose_industry_obj(): diff --git a/input/db.py b/input/db.py index 927412f..7fe4a7a 100644 --- a/input/db.py +++ b/input/db.py @@ -66,3 +66,25 @@ def update_general_input(rid, data): """ collection = client['评价']['综合评价填报'] collection.update_one({"评价ID": rid}, {"$set": data}) + + +def find_risk_data(rid): + """ + 查找评价所需的风险数据 + """ + collection = client['评价']['风险数据'] + data = collection.find({"评价ID": rid}, {'_id': False}) + record = list(data) + return record + + +def update_rating_records(rid, data): + """ + 更新评价记录 + Parameters: + - + Returns: + - + """ + collection = client['评价']['评价记录'] + collection.update_one({"评价ID": rid}, {"$set": data}) diff --git a/input/routes.py b/input/routes.py index e8074bb..45d3623 100644 --- a/input/routes.py +++ b/input/routes.py @@ -67,19 +67,21 @@ def submit_general_rating_input(**kwargs): Returns: res: desc """ - info = "提交成功" - return {"info": info} + input_form = InputForm() + input_form.cid = kwargs['cid'] + info, status = input_form.exec_general_rating() + return {"info": info}, status @input_route.route('choose_industry', methods=['GET']) @verify_token -def choose_industry_route(**kwargs): +def choose_industry_route(): """ - Notes + 行业选择接口 Parameters: - Returns: - res: desc + - """ input_form = InputForm() result = input_form.choose_industry_obj() @@ -89,6 +91,13 @@ def choose_industry_route(**kwargs): @input_route.route('questionnaire', methods=['GET']) @verify_token def questionnaire(**kwargs): + """ + 问卷接口 + Parameters: + - + Returns: + - + """ input_form = InputForm() input_form.cid = kwargs['cid'] result = input_form.questionnaire_obj() diff --git a/input/scripts.py b/input/scripts.py index 3bf3abb..061e0fe 100644 --- a/input/scripts.py +++ b/input/scripts.py @@ -1,5 +1,7 @@ import copy +import json import time +import requests from common.scripts import read_json_file, file_path, make_id from input.db import * @@ -164,7 +166,7 @@ def choose_industry_script(): Parameters: - Returns: - res: desc + - """ data = read_json_file(file_path('/input/static/template/industry.json')) return data @@ -180,3 +182,39 @@ def questionnaire_script(industry): """ data = read_json_file(file_path('/input/static/questionnaire/{}.json'.format(industry))) return data + + +def exec_general_rating_scripts(cid): + """ + Notes + Parameters: + - + Returns: + - + """ + # pre + record = find_rating_records({"企业ID": cid, "进行状态": "进行"}) + + if not record: + info = "没有正在进行的评价" + return info + + # Parameters + rid = record[0]["评价ID"] + inputs = find_rating_inputs({"评价ID": rid})[0] + risks = {"风险数据": find_risk_data(rid)[0]} + risks["风险数据"].pop('企业ID') + risks["风险数据"].pop('评价ID') + rating_inputs = {**inputs, **risks} + + # main + url = "http://139.9.249.34:51012/tfse_rating/rating/general_model" + token = "X0gSlC!YE8jmr2jJr&ilcjS83j!tsoh5" + headers = {'token': token, "Content-Type": "application/json;charset=UTF-8"} + data = json.dumps({"input_data": rating_inputs}) + res = requests.post(url, headers=headers, data=data) + if res.status_code == 200: + update_rating_records({"评价ID": rid}, {"进行状态": "完成"}) + return True + else: + return False