fix20230223

apps/view_choose/map_view.py

@@ -52,7 +52,7 @@ def show_area():
         # print(gong_total_area)
         # print(gong_total_area)
 
 
         # 获取商业用地面积
         # 获取商业用地面积
-        shang_area_obj_list = com.get_total_land_area('', '', district_name, '商业用地', '')
+        shang_area_obj_list = com.get_total_land_area('', '', district_name, '商服用地', '')
         shang_total_area = round(sum([float(area_obj.total_area if area_obj.total_area else 0) for area_obj in shang_area_obj_list]), 2)
         shang_total_area = round(sum([float(area_obj.total_area if area_obj.total_area else 0) for area_obj in shang_area_obj_list]), 2)
         # print(shang_total_area)
         # print(shang_total_area)
 
 

apps/view_map/view.py

@@ -44,6 +44,11 @@ def attract_map():
     district = req_dict.get("district")
     district = req_dict.get("district")
     product = req_dict.get("product")  # 产业产品选择
     product = req_dict.get("product")  # 产业产品选择
 
 
+    name_query = "AttractMap" + str(inid) + province + city + district + product
+    if redis_store.get(name_query) is not None:
+        data = json.loads(redis_store.get(name_query))
+        return jsonify(code=RET.OK, msg="获取成功", data=data)
+
     try:
     try:
         enterprise = Enterprise.query.filter(or_(
         enterprise = Enterprise.query.filter(or_(
                 Enterprise.c_type == inid,
                 Enterprise.c_type == inid,
@@ -108,6 +113,9 @@ def attract_map():
                            "color": "",
                            "color": "",
                            # "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
                            # "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
                            })
                            })
+
+                # redis缓存
+                redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(df))
                 return jsonify(code=RET.OK, msg="获取成功", data=df)
                 return jsonify(code=RET.OK, msg="获取成功", data=df)
             else:
             else:
                 return jsonify(code=RET.OK, msg="无满足条件数据", data=df)
                 return jsonify(code=RET.OK, msg="无满足条件数据", data=df)