Skip to content

M
mancheng
Commit c8e38a7e by 赵宇
Options

fix

parent 5c5ddeab
Showing with 84 additions and 85 deletions
apps/__init__.py
......@@ -91,7 +91,7 @@ def creat_app(config_name):
# from apps.user_pc import api_user
from apps.atlas import api_atlas
from apps.radar import api_radar
# from apps.attract import api_att
from apps.attract import api_att
# from apps.view_360 import api_portraits
# from apps.view_choose_address import api_address
# from apps.manage import api_power
......@@ -101,7 +101,7 @@ def creat_app(config_name):
# app.register_blueprint(api_user, url_prefix='/api/user')
app.register_blueprint(api_radar, url_prefix='/api/radar')
app.register_blueprint(api_atlas, url_prefix='/api/atlas')
# app.register_blueprint(api_att, url_prefix='/api/att')
app.register_blueprint(api_att, url_prefix='/api/att')
#
app.register_blueprint(api_attract, url_prefix='/api/attract/industry')
# app.register_blueprint(api_portraits, url_prefix="/api/portraits/industry")
......
apps/attract/view.py
......@@ -461,58 +461,58 @@ def attract_map():
req_dict = request.get_json()
inid = req_dict.get("inid") # 行业id
entype = req_dict.get("entype") # 企业类型id
qualificat = req_dict.get("qualificat") # 企业资质id
capital = req_dict.get("capital") # 注册资本id
quoted = req_dict.get("quoted") # 上市板块
area = req_dict.get("area") # ["省","市","区"]
province = area[0]
city = area[1]
district = area[2]
yearid = req_dict.get("yearid") # 成立时间年限id
roundid = req_dict.get("roundid") # 融资轮次id(天使/种子，1)（PreA/A+,2）（PreB/B+,3）(C轮以上，4)（收并购，5）（战略投资，6）（其他，7）
product = req_dict.get("product") # 产业产品选择
# entype = req_dict.get("entype") # 企业类型id
# qualificat = req_dict.get("qualificat") # 企业资质id
# capital = req_dict.get("capital") # 注册资本id
# quoted = req_dict.get("quoted") # 上市板块
# area = req_dict.get("area") # ["省","市","区"]
# province = area[0]
# city = area[1]
# district = area[2]
# yearid = req_dict.get("yearid") # 成立时间年限id
# roundid = req_dict.get("roundid") # 融资轮次id(天使/种子，1)（PreA/A+,2）（PreB/B+,3）(C轮以上，4)（收并购，5）（战略投资，6）（其他，7）
# product = req_dict.get("product") # 产业产品选择
try:
if inid:
# if inid:
enterprise = Enterprise.query.filter_by(c_type=inid)
else:
enterprise = Enterprise.query.filter_by()
# else:
# enterprise = Enterprise.query.filter_by()
# 企业类型
if entype:
enterprise = enterprise.filter_by(entypeid=entype)
# 企业资质
if qualificat:
if qualificat == 1:
enterprise = enterprise.filter_by(high_new=1)
if qualificat == 2:
enterprise = enterprise.filter_by(tbe=1)
if qualificat == 3:
enterprise = enterprise.filter_by(quoted_company=1)
if qualificat == 4:
enterprise = enterprise.filter_by(isfive=1)
if qualificat == 5:
enterprise = enterprise.filter_by(unicorn=1)
if qualificat == 6:
enterprise = enterprise.filter_by(dengl=1)
# 注册资本
if capital:
enterprise = enterprise.filter_by(capital_id=capital)
# 上市板块
if quoted:
enterprise = enterprise.filter_by(public_id=quoted)
# 成立时间id
if yearid:
enterprise = enterprise.filter_by(yearid=yearid)
# 融资轮次
if roundid:
enterprise = enterprise.filter_by(roundid=roundid)
if product:
enterprise = enterprise.filter(Enterprise.product_all.like("%{}%".format(product)))
# if entype:
# enterprise = enterprise.filter_by(entypeid=entype)
# # 企业资质
# if qualificat:
# if qualificat == 1:
# enterprise = enterprise.filter_by(high_new=1)
# if qualificat == 2:
# enterprise = enterprise.filter_by(tbe=1)
# if qualificat == 3:
# enterprise = enterprise.filter_by(quoted_company=1)
# if qualificat == 4:
# enterprise = enterprise.filter_by(isfive=1)
# if qualificat == 5:
# enterprise = enterprise.filter_by(unicorn=1)
# if qualificat == 6:
# enterprise = enterprise.filter_by(dengl=1)
#
# # 注册资本
# if capital:
# enterprise = enterprise.filter_by(capital_id=capital)
# # 上市板块
# if quoted:
# enterprise = enterprise.filter_by(public_id=quoted)
# # 成立时间id
# if yearid:
# enterprise = enterprise.filter_by(yearid=yearid)
# # 融资轮次
# if roundid:
# enterprise = enterprise.filter_by(roundid=roundid)
# if product:
# enterprise = enterprise.filter(Enterprise.product_all.like("%{}%".format(product)))
# print(enterprise)
df = list()
if not province: # 全国，省数据
# if not province: # 全国，省数据
provinces = Enterprise.query.with_entities(Enterprise.province).distinct().all()
provinces = [i[0] for i in provinces if i[0]] # 拿到省份的无重复值
for pro in provinces:
......@@ -524,41 +524,40 @@ def attract_map():
"jwd": {"lng": province_data.p_lng, "lat": province_data.p_lat}})
return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and not city: # 省-》市数据
cities = Enterprise.query.filter_by(province=province).with_entities(Enterprise.city).distinct().all()
cities = [i[0] for i in cities if i[0]] # 拿到城市的无重复值
for cit in cities:
num = enterprise.filter_by(province=province, city=cit).count()
city_data = Enterprise.query.filter_by(province=province, city=cit).first()
df.append({"name": cit,
"value": num,
"color": jishu(num),
"jwd": {"lng": city_data.c_lng, "lat": city_data.c_lat}})
return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and city and not district: # 市-》区数据
districts = Enterprise.query.filter_by(province=province, city=city).with_entities(
Enterprise.district).distinct().all()
districts = [i[0] for i in districts if i[0]] # 拿到区县的无重复值
for dis in districts:
num = enterprise.filter_by(province=province, city=city, district=dis).count()
district_data = Enterprise.query.filter_by(province=province, city=city, district=dis).first()
df.append({"name": dis,
"value": num,
"color": jishu(num),
"jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
return jsonify(code=RET.OK, msg="获取成功", data=df)
if province and city and district: # 区数据
num = enterprise.filter_by(province=province, city=city, district=district).count()
district_data = Enterprise.query.filter_by(province=province, city=city, district=district).first()
df.append({"name": district,
"value": num,
"color": "",
"jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
return jsonify(code=RET.OK, msg="获取成功", data=df)
return jsonify(code=RET.DATAERR, msg="地区参数错误")
# if province and not city: # 省-》市数据
# cities = Enterprise.query.filter_by(province=province).with_entities(Enterprise.city).distinct().all()
# cities = [i[0] for i in cities if i[0]] # 拿到城市的无重复值
# for cit in cities:
# num = enterprise.filter_by(province=province, city=cit).count()
# city_data = Enterprise.query.filter_by(province=province, city=cit).first()
# df.append({"name": cit,
# "value": num,
# "color": jishu(num),
# "jwd": {"lng": city_data.c_lng, "lat": city_data.c_lat}})
#
# return jsonify(code=RET.OK, msg="获取成功", data=df)
# if province and city and not district: # 市-》区数据
# districts = Enterprise.query.filter_by(province=province, city=city).with_entities(
# Enterprise.district).distinct().all()
# districts = [i[0] for i in districts if i[0]] # 拿到区县的无重复值
# for dis in districts:
# num = enterprise.filter_by(province=province, city=city, district=dis).count()
# district_data = Enterprise.query.filter_by(province=province, city=city, district=dis).first()
# df.append({"name": dis,
# "value": num,
# "color": jishu(num),
# "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
#
# return jsonify(code=RET.OK, msg="获取成功", data=df)
# if province and city and district: # 区数据
# num = enterprise.filter_by(province=province, city=city, district=district).count()
# district_data = Enterprise.query.filter_by(province=province, city=city, district=district).first()
# df.append({"name": district,
# "value": num,
# "color": "",
# "jwd": {"lng": district_data.d_lng, "lat": district_data.d_lat}})
# return jsonify(code=RET.OK, msg="获取成功", data=df)
# return jsonify(code=RET.DATAERR, msg="地区参数错误")
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据库查询错误")
......
apps/utils/neo4j_conn.py
......@@ -2,8 +2,8 @@ from py2neo import Graph
def conn_neo4j():
graph = Graph("http://localhost:7474", username="neo4j", password="123456") # 本地neo4j
# graph = Graph("http://localhost:7476", username="neo4j", password="123456") # 上传到50服务器前需更改
# graph = Graph("http://localhost:7474", username="neo4j", password="123456") # 本地neo4j
graph = Graph("http://localhost:7476", username="neo4j", password="123456") # 上传到50服务器前需更改
# graph = Graph("http://39.100.39.50:7476/", username="neo4j", password="123456") # 测试50服务器上的neo4j时使用
return graph
......
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