fix20230220

apps/view_map/view.py

@@ -176,14 +176,10 @@ def attract_cnums():
             num = enterprise.filter_by(province=province, city=city, district=district).count()
             num = enterprise.filter_by(province=province, city=city, district=district).count()
             df.append({"name": district, "value": num})
             df.append({"name": district, "value": num})
             df = sorted(df, key=lambda x: x["value"], reverse=True)
             df = sorted(df, key=lambda x: x["value"], reverse=True)
-
+            data = df[:5]
             # redis缓存
             # redis缓存
-            try:
-                redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(df[:5]))
-            except:
-                return jsonify(code=RET.DBERR, msg="redis保存失败！", data=df[:5])
-
-            return jsonify(code=RET.OK, msg="获取成功", data=df[:5])
+            redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
+            return jsonify(code=RET.OK, msg="获取成功", data=data)
         return jsonify(code=RET.DATAERR, msg="地区参数错误")
         return jsonify(code=RET.DATAERR, msg="地区参数错误")
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)
@@ -391,7 +387,7 @@ def attract_enterprise():
     page = req_dict.get("page")  # 分页页码
     page = req_dict.get("page")  # 分页页码
     perpage = req_dict.get("perpage")  # 分页大小
     perpage = req_dict.get("perpage")  # 分页大小
 
 
-    name_query = "AttractEnterprise" + str(inid) + province + city + district + product
+    name_query = "AttractEnterprise" + str(inid) + str(page) + province + city + district + product
     if redis_store.get(name_query) is not None:
     if redis_store.get(name_query) is not None:
         data = json.loads(redis_store.get(name_query))
         data = json.loads(redis_store.get(name_query))
         return jsonify(code=RET.OK, msg="获取成功", data=data)
         return jsonify(code=RET.OK, msg="获取成功", data=data)