Merge branch 'ps' into 'master'

update 企业信息编辑接口/修改上传宏观报告bug

See merge request root/tfse_admin!13

app.py

@@ -16,7 +16,7 @@ app.register_blueprint(test_route, url_prefix='/admin/test')
 app.register_blueprint(user_route, url_prefix='/admin/user')
 app.register_blueprint(company_route, url_prefix='/admin/company')
 app.register_blueprint(rating_route, url_prefix='/admin/rating')
-app.register_blueprint(macro_route, url_prefix='/admin/marco')
+app.register_blueprint(macro_route, url_prefix='/admin/macro')
 
 if __name__ == '__main__':
     app.run()

company/Company.py

@@ -25,3 +25,12 @@ class Company:
         """
         result = company_index_script(self.cid)
         return result
+
+    def company_edit(self, data):
+        """
+        企业信息编辑
+        Returns:
+            result: 企业信息编辑结果
+        """
+        result = company_edit_script(self.cid, data)
+        return result

company/db.py

@@ -69,3 +69,18 @@ def find_company_evaluate_info(cid):
     data = collection.find({"企业ID": cid}, {'_id': False, '企业ID': False})
     record = list(data)
     return record
+
+
+def update_company_info(cid, data):
+    """
+    编辑企业信息
+    Parameters:
+        cid: 企业ID
+        data: 编辑后数据
+    Returns:
+        record: 编辑结果
+    """
+    collection = client['企业']['公司基本信息']
+    res = collection.update_one({"企业ID": cid}, {"$set": data})
+    info = res.raw_result['updatedExisting']
+    return info

company/routes.py

@@ -41,3 +41,20 @@ def company_index():
     return {"info": '企业信息查询成功', "result": data}, 200
 
 
+@company_route.route('/edit', methods=['POST'])
+@api_secret
+def company_edit():
+    """
+    企业信息编辑
+    Parameters:
+        -
+    Returns:
+        result: 编辑结果
+    """
+    company = Company()
+    company.cid = request.json['cid']
+    data = request.json['data']
+    result = company.company_edit(data)
+    status = 200 if result else 210
+    info = "企业信息编辑成功" if result else "企业信息编辑失败"
+    return {"info": info}, status

company/scripts.py

@@ -40,3 +40,16 @@ def company_index_script(cid):
         result['评价记录'] = list()
         result['评价记录'] = evaluate_info
     return result
+
+
+def company_edit_script(cid, data):
+    """
+    编辑企业信息
+    Parameters:
+        cid: 企业ID
+        data: 编辑后数据
+    Returns:
+        result: 编辑数据
+    """
+    result = update_company_info(cid, data)
+    return result

macro/Macro.py

@@ -30,7 +30,8 @@ class Macro:
         result = search_macroscopic_report_script(self.industry, time, skip, limit)
         return result
 
-    def upload_macroscopic_data(self, req):
+    @staticmethod
+    def upload_macroscopic_data(req):
         """
        宏观数据上传
        Parameters:
@@ -41,7 +42,8 @@ class Macro:
         result = upload_macroscopic_data_script(req)
         return result
 
-    def update_macroscopic_data(self, req):
+    @staticmethod
+    def update_macroscopic_data(req):
         """
        宏观数据编辑
        Parameters:
@@ -50,4 +52,4 @@ class Macro:
            result: 修改结果
        """
         result = update_macroscopic_data_script(req)
-        return result
+        return result

macro/db.py

@@ -46,7 +46,7 @@ def update_macroscopic_report_data(industry, update_time, fid):
         result: 更新结果
     """
     collection = client['宏观']['行业报告']
-    res = collection.update_one({"行业名称": industry, '上传日期': update_time}, {"$set": {"报告fid": fid}})
+    res = collection.update_one({"行业名称": industry}, {"$set": {"报告fid": fid, "上传日期": update_time}})
     info = res.raw_result['updatedExisting']
     return info
 
@@ -156,6 +156,23 @@ def upload_industry_macroscopic_data(req):
         return False
 
 
+def upload_overview_macroscopic_data(req):
+    """
+    上传总规模宏观数据
+    Parameters:
+        req: 上传的数据
+    Returns:
+        record: 上传结果
+    """
+    collection = client['宏观']['总规模数据']
+    find = {"行业名称": req['行业名称'], "统计时间": req['统计时间'], "统计字段名称": req['统计字段名称']}
+    res = collection.update_one(find, {"$set": req}, upsert=True)
+    if res.raw_result['n'] == 1:
+        return True
+    else:
+        return False
+
+
 def update_industry_macroscopic_data(req):
     collection = client['宏观']['行业数据']
     find = {"一级行业": req['一级行业'], "二级行业": req['二级行业'], "统计时间": req['统计时间'], "统计字段名称": req['统计字段名称']}

macro/routes.py

@@ -102,4 +102,4 @@ def edit_data():
     except KeyError:
         return {"info": "键值错误"}, 400
     except TypeError:
-        return {"info": "参数错误"}, 400
+        return {"info": "参数错误"}, 400

macro/scripts.py

@@ -98,16 +98,32 @@ def get_macro_data():
         num = len(row)
         for i in range(num-1):
             req = {
-                "一级行业": "制造业",
-                "二级行业": row[0],
+                "一级行业": "信息技术业",
+                "二级行业": row.keys()[i + 1],
+                "数据": row[i + 1],
+                "统计字段名称": "营业收入",
+                "统计周期": "年度",
+                "统计时间": row[0],
+                "数据单位": "亿元"
+            }
+            upload_overview_macroscopic_data(req)
+
+
+def get_macro_data_over():
+    df = pd.read_excel('./static/C13-02.xlsx')
+    for index, row in df.iterrows():
+        num = len(row)
+        for i in range(num-1):
+            req = {
+                "行业名称": "制造业",
                 "数据": row[i + 1],
                 "统计字段名称": row.keys()[i + 1],
                 "统计周期": "年度",
                 "统计时间": "2020年",
                 "数据单位": "亿元"
             }
-            upload_industry_macroscopic_data(req)
+            upload_overview_macroscopic_data(req)
 
 
 if __name__ == '__main__':
-    get_macro_data()
+    get_macro_data_over()