Skip to content

M
mancheng
Commit b5a22cbb by dong
Options

fix20230302

parent 41d356e5
Showing with 38 additions and 33 deletions
apps/view_xiaocx/view.py
...@@ -660,25 +660,25 @@ def collection_carrier(): ...@@ -660,25 +660,25 @@ def collection_carrier():
req_dict = request.get_json() req_dict = request.get_json()
id_list = req_dict.get("id_list") id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业 flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业
mobile = request.headers["mobile"] token = request.headers["token"]
user_obj = get_user(mobile) user_obj = verify_token(token)
if not user_obj: if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。') return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
try: try:
for _id in id_list: for _id in id_list:
if flag == 1: if flag == 1:
user_obj.user_land.append(_id) user_obj.carrier_land.append(_id)
elif flag == 2: elif flag == 2:
user_obj.user_build.append(_id) user_obj.carrier_build.append(_id)
elif flag == 3: elif flag == 3:
user_obj.user_factory.append(_id) user_obj.carrier_factory.append(_id)
elif flag == 4: elif flag == 4:
user_obj.user_zone.append(_id) user_obj.industry_zone.append(_id)
elif flag == 5: elif flag == 5:
user_obj.user_project.append(_id) user_obj.project.append(_id)
elif flag == 6: elif flag == 6:
user_obj.user_company.append(_id) user_obj.company.append(_id)
else: else:
pass pass
user_obj.commit() user_obj.commit()
...@@ -694,25 +694,24 @@ def cancel_collection(): ...@@ -694,25 +694,24 @@ def cancel_collection():
req_dict = request.get_json() req_dict = request.get_json()
id_list = req_dict.get("id_list") id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业 flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业
mobile = request.headers["mobile"] token = request.headers["token"]
user_obj = get_user(mobile) user_obj = verify_token(token)
if not user_obj: if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。') return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
try: try:
for _id in id_list: for _id in id_list:
if flag == 1: if flag == 1:
user_obj.user_land.pop(_id) user_obj.carrier_land.pop(_id)
elif flag == 2: elif flag == 2:
user_obj.user_build.pop(_id) user_obj.carrier_build.pop(_id)
elif flag == 3: elif flag == 3:
user_obj.user_factory.pop(_id) user_obj.carrier_factory.pop(_id)
elif flag == 4: elif flag == 4:
user_obj.user_zone.pop(_id) user_obj.industry_zone.pop(_id)
elif flag == 5: elif flag == 5:
user_obj.user_project.pop(_id) user_obj.project.pop(_id)
elif flag == 6: elif flag == 6:
user_obj.user_company.pop(_id) user_obj.company.pop(_id)
else: else:
pass pass
user_obj.commit() user_obj.commit()
...@@ -728,8 +727,8 @@ def collection_list(): ...@@ -728,8 +727,8 @@ def collection_list():
req_dict = request.get_json() req_dict = request.get_json()
# id_list = req_dict.get("id_list") # id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业 flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业
mobile = request.headers["mobile"] token = request.headers["token"]
user_obj = get_user(mobile) user_obj = verify_token(token)
if not user_obj: if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。') return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
...@@ -737,7 +736,7 @@ def collection_list(): ...@@ -737,7 +736,7 @@ def collection_list():
# user_obj = verify_token(token) # user_obj = verify_token(token)
if flag == 1: if flag == 1:
obj_list = user_obj.user_land obj_list = user_obj.carrier_land
data = [{ data = [{
"id": obj.id, "id": obj.id,
"name": obj.land_name, "name": obj.land_name,
...@@ -748,7 +747,7 @@ def collection_list(): ...@@ -748,7 +747,7 @@ def collection_list():
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] } for obj in obj_list]
elif flag == 2: elif flag == 2:
obj_list = user_obj.user_build obj_list = user_obj.carrier_build
data = [{ data = [{
"id": obj.id, "id": obj.id,
"name": obj.build_name, "name": obj.build_name,
...@@ -759,7 +758,7 @@ def collection_list(): ...@@ -759,7 +758,7 @@ def collection_list():
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] } for obj in obj_list]
elif flag == 3: elif flag == 3:
obj_list = user_obj.user_factory obj_list = user_obj.carrier_factory
data = [{ data = [{
"id": obj.id, "id": obj.id,
"name": obj.factory_name, "name": obj.factory_name,
...@@ -770,7 +769,7 @@ def collection_list(): ...@@ -770,7 +769,7 @@ def collection_list():
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] } for obj in obj_list]
elif flag == 4: elif flag == 4:
obj_list = user_obj.user_zone obj_list = user_obj.industry_zone
data = [{ data = [{
"id": obj.id, "id": obj.id,
"name": obj.name, "name": obj.name,
...@@ -781,7 +780,7 @@ def collection_list(): ...@@ -781,7 +780,7 @@ def collection_list():
"lat": obj.lat, "lat": obj.lat,
} for obj in obj_list] } for obj in obj_list]
elif flag == 5: elif flag == 5:
obj_list = user_obj.user_project obj_list = user_obj.project
data = [{ data = [{
"id": obj.id, "id": obj.id,
"name": obj.name, "name": obj.name,
...@@ -792,7 +791,7 @@ def collection_list(): ...@@ -792,7 +791,7 @@ def collection_list():
# "lat": obj.lat, # "lat": obj.lat,
} for obj in obj_list] } for obj in obj_list]
elif flag == 6: elif flag == 6:
obj_list = user_obj.user_company obj_list = user_obj.company
data = [{ data = [{
} for obj in obj_list] } for obj in obj_list]
...@@ -813,9 +812,6 @@ def wechat_login(): ...@@ -813,9 +812,6 @@ def wechat_login():
# 参数获取与校验 # 参数获取与校验
req_dict = request.get_json() req_dict = request.get_json()
code = req_dict.get('code') # 微信登录code code = req_dict.get('code') # 微信登录code
# access_token = request.headers['access_token'] # 微信登录code
# res = {"access_token": access_token}
print(code)
# 校验参数完整性 # 校验参数完整性
if not all([code]): if not all([code]):
return jsonify(code=RET.PARAMERR, msg="参数不完整") return jsonify(code=RET.PARAMERR, msg="参数不完整")
...@@ -833,25 +829,34 @@ def wechat_login(): ...@@ -833,25 +829,34 @@ def wechat_login():
try: try:
res = requests.get(url, params=params).json() res = requests.get(url, params=params).json()
access_token = res['access_token']
# 获取电话号码 # 获取电话号码
url1 = u"https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token={}".format(res['access_token']) url1 = u"https://api.weixin.qq.com/wxa/business/getuserphonenumber?access_token={}".format(access_token)
res1 = requests.post(url1, json=data).json() res1 = requests.post(url1, json=data).json()
user_info = ''
if res1['errmsg'] == 'ok': if res1['errmsg'] == 'ok':
mobile = res1.phone_info["phoneNumber"] mobile = res1['phone_info']["phoneNumber"]
user_obj = User.query.filter_by(mobile=mobile).first() user_obj = User.query.filter_by(mobile=mobile).first()
if user_obj: if user_obj:
# 若成功保存登录状态
token = create_token(user_obj.id)
user_info = { user_info = {
"flag": user_obj.flag, "flag": user_obj.flag,
"mobile": user_obj.mobile "mobile": user_obj.mobile,
"token": token
} }
else: else:
user_obj = User(mobile=mobile, flag=1) user_obj = User(mobile=mobile, flag=1)
db.session.add(user_obj) db.session.add(user_obj)
db.session.commit() db.session.commit()
# 若成功保存登录状态
token = create_token(user_obj.id)
user_info = { user_info = {
"flag": 1, "flag": 1,
"mobile": mobile "mobile": mobile,
"token": token
} }
except Enterprise as e: except Enterprise as e:
return jsonify(code=RET.DATAERR, msg="数据异常！") return jsonify(code=RET.DATAERR, msg="数据异常！")
return jsonify(code=RET.USERERR, data=user_info, msg="微信登录成功。") return jsonify(code=RET.OK, data=user_info, msg="微信登录成功。")
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