update 地图省份接口新增返回字段（cid,city）

Modules/DashBoard/DashBoardImpl.py

@@ -1,3 +1,5 @@
+import time
+
 from DBHelper.MongoHelperInstance import DB_GUA
 from Utils.CommonUtil import trans_fields_name
 
@@ -23,7 +25,7 @@ class DashBoardImpl(object):
     @staticmethod
     def static_by_province(**kwargs):
 
-        province = kwargs["province"] + "省"
+        province = kwargs["province"]
         page_size = kwargs["page_size"]
         page_no = kwargs["page_no"]
 
@@ -37,14 +39,14 @@ class DashBoardImpl(object):
             "评级数据",
             "评级记录",
             {"所在省份": province, "评级状态": "完成"},
-            ["企业名称"],
+            ["企业名称", "企业ID", "所在城市"],
             {"评级时间": -1},
             page_size,
             page_no
         )
 
         for item in items:
-            trans_fields_name(item, ["企业名称"], ["company"])
+            trans_fields_name(item, ["企业ID", "企业名称", "所在城市"], ["cid", "company", "city"])
 
         result = {
             "name": province,
@@ -88,6 +90,31 @@ class DashBoardImpl(object):
 
         return result
 
+    @staticmethod
+    def rating_frequency_statistics(**kwargs):
+        # 默认查询起始日期是30天以前
+        start = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(time.time() - 60 * 60 * 24 * 365))
+
+        records = DB_GUA.find_data_with_aggregate(
+            "评级数据",
+            "评级记录",
+            [
+                {"$match": {"评级状态": "完成", "评级时间": {"$gte": start}}},
+                {"$group": {"_id": "$评级时间", "count": {"$sum": 1}}},
+                {"$sort": {"_id": 1}}
+            ]
+        )
+
+        # 聚类统计用的_id字段更名为date
+        result = dict()
+        result['日期'] = list()
+        result['次数'] = list()
+        for data in records:
+            result['日期'].append(data['_id'])
+            result['次数'].append(data['count'])
+
+        return result
+
     @staticmethod
     def rank_levels_distribute(**kwargs):
         items = DB_GUA.find_data_with_aggregate(

Modules/DashBoard/DashBoardRoutes.py

@@ -29,29 +29,14 @@ def rating_result_route(**kwargs):
 @board_route.route('/statistics')
 @verify_token
 def statistics_route(**kwargs):
-    """"""
+    """评级次数统计（折线图）"""
 
-    demo_data = {
-        "info": "查询成功",
-        "result": {
-            "日期": [
-                "2022-01-26",
-                "2022-02-25",
-                "2022-03-27",
-                "2022-04-15",
-                "2022-05-20"
-            ],
-            "次数": [
-                "4",
-                "6",
-                "3",
-                "3",
-                "6"
-            ]
-        }
-    }
-
-    return demo_data
+    try:
+        impl = DashBoardImpl()
+        result = impl.rating_frequency_statistics()
+        return {"info": "评级次数统计", "result": result}
+    except APIReturnError as e:
+        return {"info": e.__str__()}, e.status_code
 
 
 @board_route.route('/distribute')
@@ -102,7 +87,7 @@ def map_province_route(**kwargs):
 @board_route.route('/map/city', methods=['GET'])
 @verify_token
 def map_city_route(**kwargs):
-    """评级结果地图(省份)"""
+    """评级结果地图(城市)"""
 
     try:
         RouteParamsCheck(req=request.args, params=["city", "page_size", "page_no"]).required()