Commit 869e1980 by dong

fix202302016

parent 941b3ef2
......@@ -123,6 +123,12 @@ def attract_cnums():
district = req_dict.get("district")
product = req_dict.get("product") # 产业产品选择
# name_query = "EnterpriseTop5" + 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:
enterprise = Enterprise.query.filter(or_(
Enterprise.c_type == inid,
......@@ -166,8 +172,14 @@ def attract_cnums():
num = enterprise.filter_by(province=province, city=city, district=district).count()
df.append({"name": district, "value": num})
df = sorted(df, key=lambda x: x["value"], reverse=True)
return jsonify(code=RET.OK, msg="获取成功", data=df[:5])
# 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])
return jsonify(code=RET.DATAERR, msg="地区参数错误")
except Exception as e:
current_app.logger.error(e)
......@@ -246,6 +258,11 @@ def attract_sdmap():
district = req_dict.get("district")
product = req_dict.get("product") # 产业产品选择
name_query = "AttractSdmap" + 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)
# 校验参数完整性
# if not all([district]):
# return jsonify(code=RET.PARAMERR, msg="参数不完整")
......@@ -284,6 +301,11 @@ def attract_sdmap():
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据库查询错误")
# redis缓存
# try:
# redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data)
# except:
# return jsonify(code=RET.DBERR, msg="redis保存失败!")
return jsonify(code=RET.OK, msg="获取成功", data=data)
......
......@@ -178,8 +178,7 @@ def tendency():
# redis缓存
try:
redis_store.setex("tendency" + str(inid) + str(select_time) + str(select_method),
30 * 24 * 3600, json.dumps(data_dic))
redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data_dic))
except:
return jsonify(code=RET.DBERR, msg="redis保存失败!", data=data_dic)
return jsonify(code=RET.OK, msg="获取成功", data=data_dic)
......@@ -1086,10 +1085,10 @@ def radar_enums():
return jsonify(code=RET.PARAMERR, msg="参数不完整")
try:
# name_query = "radar" + str(inid) + str("".join(area)) + str(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)
name_query = "enums" + str(inid) + str("".join(area)) + str(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)
if inid:
enterprise = Enterprise.query.filter(or_(
......@@ -1138,10 +1137,10 @@ def radar_enums():
"nums_financ": float(nums_financ), "nums_unicorn": float(nums_unicorn), # "info": info
}
# redis缓存
# redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
# redis_store.set(name_query, json.dumps(data))
# redis_store.expire(name_query, 30 * 24 * 3600)
# print("redis")
print("redis")
return jsonify(code=RET.OK, msg="获取成功", data=data)
except Exception as e:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment