From 2c8adba8f259bfc49938609731f71ef8271eecbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E6=80=9D=E5=B7=9D?= <sichanwong0527@gmail.com>
Date: Tue, 21 Dec 2021 09:49:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B4=A2=E5=8A=A1=E6=8C=87?=
 =?UTF-8?q?=E6=A0=87=E5=BE=97=E5=88=86=E8=AE=A1=E7=AE=97=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Rating/RatingModel.py |  8 +++++---
 Rating/routes.py      |  2 +-
 common/scripts.py     | 12 ++++++++++++
 3 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Rating/RatingModel.py b/Rating/RatingModel.py
index 83f52d9..b365544 100644
--- a/Rating/RatingModel.py
+++ b/Rating/RatingModel.py
@@ -6,7 +6,7 @@ from Rating.scripts.financial_score import financial_score
 from Rating.scripts.operating_score.Manufacturing import manufacturing
 from Rating.scripts.risk_score import *
 from Rating.scripts.Indicators import *
-from common.scripts import read_json_file, file_path
+from common.scripts import read_json_file, file_path, sub_dict
 
 
 class RatingModel:
@@ -137,7 +137,8 @@ class RatingModel:
         industry = self.industry[1]
 
         # main
-        elements.pop('年报期')  # 计算指标分数前移除年报期字段
+        elements = sub_dict(elements, ['净资产收益率', '总资产报酬率', '总资产周转率', '存货周转率', '营业增长率', '总资产增长率', '应收账款周转率', '资产负债率', '已获利息倍数', '速动比率', '技术投入比率'])
+        # 计算指标分数前移除年报期字段
         score = financial_score(industry, elements)
 
         return score
@@ -227,5 +228,6 @@ class RatingModel:
 
 if __name__ == '__main__':
     data = read_json_file(file_path('/static/test_data/demo01.json'))
-    model = RatingModel(data)
+    model = RatingModel()
+    model.prepare_params(data)
     # model.save_result()
diff --git a/Rating/routes.py b/Rating/routes.py
index cf1eaf4..00dd135 100644
--- a/Rating/routes.py
+++ b/Rating/routes.py
@@ -23,7 +23,7 @@ def general_model():
 @rating_route.route('/financial_score', methods=['POST'])
 @verify_token
 def financial_score():
-    input_data = request.json['input_data']
+    input_data = request.json
     try:
         model = RatingModel()
         model.industry = input_data['所属行业']
diff --git a/common/scripts.py b/common/scripts.py
index b57a638..cf8ff8d 100644
--- a/common/scripts.py
+++ b/common/scripts.py
@@ -49,3 +49,15 @@ def verify_token(func):
             return {"info": "请求异常"}, 401
         return func(*args, **kwargs)
     return internal
+
+
+def sub_dict(param1, param2):
+    """
+    获取字典的子集
+    Parameters:
+        param1: 原字典
+        param2: 子集字段
+    Returns:
+        子集
+    """
+    return dict((key, value) for key, value in param1.items() if key in param2)
\ No newline at end of file