Skip to content

M
mancheng
Commit 28d84269 by dong
Options

fix20230302

parent b5a22cbb
Showing with 310 additions and 317 deletions
apps/models.py
......@@ -653,7 +653,7 @@ class Induzone(db.Model):
__tablename_ = "induzone"
__table_args__ = ({'comment': '产业现状图谱-产业载体园区信息表'}) # 添加表注释
id = db.Column(db.Integer, primary_key=True, autoincrement=True, doc='园区主键id', comment='园区主键id')
id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='园区主键id')
name = db.Column(db.String(255), doc='园区名称', comment='园区名称') # 园区姓名
image = db.Column(db.String(255), doc='园区图片',
comment='园区图片') # 园区单图链接http://192.168.132.165:5000/static/images/garden.jpg
......@@ -670,61 +670,23 @@ class Induzone(db.Model):
site = db.Column(db.String(255), doc='园区所在地', comment='园区所在地') # 园区所在地
industry_type = db.Column(db.String(255), doc='产业类型', comment='产业类型') # 产业类型
area = db.Column(db.Float, doc='占地面积(平方公里)', comment='占地面积(平方公里)') # 占地面积(平方公里)
# subzone = db.Column(db.String(255), doc='上级园区', comment='上级园区') # 上级园区
# mainzone = db.Column(db.Text, doc='主要产业园区', comment='主要产业园区') # 主要产业园区
# zpolicy = db.Column(db.Text, doc='产业政策', comment='产业政策') # 产业政策
lng = db.Column(db.String(255), doc='经度', comment='经度') # 经度
lat = db.Column(db.String(255), doc='纬度', comment='纬度') # 纬度
cluster = db.Column(db.String(255), doc='产业集群', comment='产业集群') # 产业集群
cate = db.Column(db.String(255), doc='园区类型', comment='园区类型') # 园区类型
# 园区信息
# acreage = db.Column(db.Float, doc='规划面积（平方公里）', comment='规划面积（平方公里）') # 规划面积（平方公里）
# actarea = db.Column(db.Float, doc='建成面积（平方公里）', comment='建成面积（平方公里）') # 建成面积（平方公里）
# tax = db.Column(db.Float, doc='税收要求（万元/亩）', comment='税收要求（万元/亩）') # 税收要求（万元/亩）
out_power = db.Column(db.Float, doc='产出强度（万元/亩）', comment='产出强度（万元/亩）') # 产出强度（万元/亩）
# indu_need = db.Column(db.String(255), doc='行业要求', comment='行业要求') # 行业要求
# fiscal = db.Column(db.Float, doc='财政收入（亿元）', comment='财政收入（亿元）') # 财政收入（亿元）
invest_power = db.Column(db.Float, doc='亩均投资强度（万元/亩）', comment='亩均投资强度（万元/亩）') # 投资强度（万元/亩）
value_product = db.Column(db.Float, doc='亩均年产值（万元/亩）', comment='亩均年产值（万元/亩）') # 亩均年产值（万元/亩）
tax = db.Column(db.Float, doc='亩均年税收（万元/亩）', comment='亩均年税收（万元/亩）') # 亩均年税收（万元/亩）
# 投资成本
indu_land = db.Column(db.String(255), doc='工业土地均价（万元/亩）', comment='工业土地均价（万元/亩）') # 工业土地均价（万元/亩）
# indu_sup = db.Column(db.String(255), doc='工业土地供应量', comment='工业土地供应量') # 工业土地供应量
comm_land = db.Column(db.String(255), doc='商办土地均价（万元/亩）', comment='商办土地均价（万元/亩）') # 商办土地均价（万元/亩）
# comm_sup = db.Column(db.String(255), doc='商办土地供应量', comment='商办土地供应量') # 商办土地供应量
# resident_ele_one = db.Column(db.String(255), doc='居民用电（一档）（元/度）', comment='居民用电（一档）（元/度）') # 居民用电（一档）（元/度）
# resident_ele_two = db.Column(db.String(255), doc='居民用电（二档）（元/度）', comment='居民用电（二档）（元/度）') # 居民用电（二档）（元/度）
# resident_ele_thr = db.Column(db.String(255), doc='居民用电（三档）（元/度）', comment='居民用电（三档）（元/度）') # 居民用电（三档）（元/度）
# comm_ele_one = db.Column(db.String(255), doc='商业用电（峰段）（元/度）', comment='商业用电（峰段）（元/度）') # 商业用电（峰段）（元/度）
# comm_ele_two = db.Column(db.String(255), doc='商业用电（平段）（元/度）', comment='商业用电（平段）（元/度）') # 商业用电（平段）（元/度）
# comm_ele_thr = db.Column(db.String(255), doc='商业用电（谷段）（元/度）', comment='商业用电（谷段）（元/度）') # 商业用电（谷段）（元/度）
# indu_ele_one = db.Column(db.String(255), doc='工业用电（峰段）（元/度）', comment='工业用电（峰段）（元/度）') # 工业用电（峰段）（元/度）
# indu_ele_two = db.Column(db.String(255), doc='工业用电（平段）（元/度）', comment='工业用电（平段）（元/度）') # 工业用电（平段）（元/度）
# indu_ele_thr = db.Column(db.String(255), doc='工业用电（谷段）（元/度）', comment='工业用电（谷段）（元/度）') # 工业用电（谷段）（元/度）
# resident_water_one = db.Column(db.String(255), doc='居民用水（一档）（元/吨）', comment='居民用水（一档）（元/吨）') # 居民用水（一档）（元/吨）
# resident_water_two = db.Column(db.String(255), doc='居民用水（二档）（元/吨）', comment='居民用水（二档）（元/吨）') # 居民用水（二档）（元/吨）
# resident_water_thr = db.Column(db.String(255), doc='居民用水（三档）（元/吨）', comment='居民用水（三档）（元/吨）') # 居民用水（三档）（元/吨）
# comm_water = db.Column(db.String(255), doc='商业用水（元/吨）', comment='商业用水（元/吨）') # 商业用水（元/吨）
# indu_water = db.Column(db.String(255), doc='工业用水（元/吨）', comment='工业用水（元/吨）') # 工业用水（元/吨）
# special_water = db.Column(db.String(255), doc='特种用水（元/吨）', comment='特种用水（元/吨）') # 特种用水（元/吨）
# resident_natgas_one = db.Column(db.String(255), doc='居民用气（一档）（元/m³）', comment='居民用气（一档）（元/m³）') # 居民用气（一档）（元/m³）
# resident_natgas_two = db.Column(db.String(255), doc='居民用气（二档）（元/m³）', comment='居民用气（二档）（元/m³）') # 居民用气（二档）（元/m³）
# resident_natgas_thr = db.Column(db.String(255), doc='居民用气（三档）（元/m³）', comment='居民用气（三档）（元/m³）') # 居民用气（三档）（元/m³）
# sewage = db.Column(db.String(255), doc='污水处理（元/吨）', comment='污水处理（元/吨）') # 污水处理（元/吨）
# wagelevel = db.Column(db.String(255), doc='最低工资标准（元/月）', comment='最低工资标准（元/月）') # 最低工资标准（元/月）
highmag = db.Column(db.String(255), doc='高层管理人员（元/月）', comment='高层管理人员（元/月）') # 高层管理人员（元/月）
middlemag = db.Column(db.String(255), doc='中级管理人员（元/月）', comment='中级管理人员（元/月）') # 中级管理人员（元/月）
worker = db.Column(db.String(255), doc='普通员工（元/月）', comment='普通员工（元/月）') # 普通员工（元/月）
# 环境配套
# dis_freight = db.Column(db.Text, doc='距离货运站距离', comment='距离货运站距离') # 距离货运站距离
# dis_rail = db.Column(db.Text, doc='距离高铁站', comment='距离高铁站') # 距离高铁站
# dis_port = db.Column(db.Text, doc='距离港口距离', comment='距离港口距离') # 距离港口距离
# dis_air = db.Column(db.Text, doc='距离机场距离', comment='距离机场距离') # 距离机场距离
# road_trans = db.Column(db.Text, doc='公路运输', comment='公路运输') # 公路运输
# rail_trans = db.Column(db.Text, doc='铁路运输', comment='铁路运输') # 铁路运输
trans_facility = db.Column(db.Text, doc='交通配套', comment='交通配套') # 交通配套
goods_trans = db.Column(db.Text, doc='货物运输', comment='货物运输') # 货物运输
live_facility = db.Column(db.Text, doc='园区生活配套', comment='园区生活配套') # 园区生活配套
......@@ -744,9 +706,6 @@ class Induzone(db.Model):
# 用于园区
gdp_point = db.Column(db.Float, doc='GDP的评分', comment='GDP的评分') # GDP的评分
# company_industry_point = db.Column(db.Float, doc='园区控制大小', comment='园区控制大小') # 园区控制大小
# warter_point = db.Column(db.Float, doc='水费的评分', comment='水费的评分') # 水费的评分
# electricity_point = db.Column(db.Float, doc='电费的评分', comment='电费的评分') # 电费的评分（）
school_point = db.Column(db.Float, doc='高校院所的评分', comment='高校院所的评分') # 高校院所的评分
policy_point = db.Column(db.Float, doc='政策数的评分', comment='政策数的评分') # 政策数的评分
live_point = db.Column(db.Float, doc='生活配套的评分', comment='生活配套的评分') # 高校院所的评分
......@@ -919,61 +878,6 @@ class Lab(db.Model):
developarea = db.Column(db.String(255)) # 所在开发区
# # 产业载体-土地数据
# class ZaitiLand(db.Model):
# __tablename_ = "zaiti_land"
# __table_args__ = ({'comment': '产业载体-土地数据表'}) # 添加表注释
# id = db.Column(db.Integer, primary_key=True, autoincrement=True)
# num = db.Column(db.String(20))
# name = db.Column(db.String(20))
# addr = db.Column(db.String(50))
# nature = db.Column(db.String(20))
# acreage = db.Column(db.String(50))
# target = db.Column(db.String(255))
# age_limit = db.Column(db.String(20))
# industry_type = db.Column(db.String(255))
# telephone = db.Column(db.String(20))
# navigator = db.Column(db.String(10))
# navigat = db.Column(db.String(20))
#
#
# # 产业载体-楼宇数据
# class ZaitiBuild(db.Model):
# __tablename_ = "zaiti_build"
# __table_args__ = ({'comment': '产业载体-楼宇数据表'}) # 添加表注释
# id = db.Column(db.Integer, primary_key=True, autoincrement=True)
# name = db.Column(db.String(20))
# addr = db.Column(db.String(50))
# acreage = db.Column(db.String(50))
# buide_type = db.Column(db.String(20))
# industry_type = db.Column(db.String(255))
# rate = db.Column(db.String(20))
# telephone = db.Column(db.String(20))
# navigator = db.Column(db.String(10))
# navigat = db.Column(db.String(20))
#
#
# # 产业载体-厂房数据
# class ZaitiFactory(db.Model):
# __tablename_ = "zaiti_factory"
# __table_args__ = ({'comment': '产业载体-厂房数据表'}) # 添加表注释
# id = db.Column(db.Integer, primary_key=True, autoincrement=True)
# name = db.Column(db.String(20))
# addr = db.Column(db.String(50))
# acreage = db.Column(db.String(50))
# structure = db.Column(db.String(20))
# height = db.Column(db.String(20))
# bearing = db.Column(db.String(50))
# new_level = db.Column(db.String(20))
# other = db.Column(db.String(255))
# industry_type = db.Column(db.String(20))
# factory_type = db.Column(db.String(20))
# telephone = db.Column(db.String(20))
# navigator = db.Column(db.String(10))
# navigat = db.Column(db.String(20))
""""""
# 雷达评估页行业在不同地区的测评分数
class EvaluationNodeData(db.Model):
__tablename_ = "evaluation_data"
......@@ -1070,6 +974,8 @@ class User(BaseModel, db.Model):
industry_zone = db.relationship("Induzone", secondary="user_zone", backref=db.backref("bzone"))
# 用户收藏重点项目
project = db.relationship("Project", secondary="user_project", backref=db.backref("bproject"))
# 用户收藏政策
industry_policy = db.relationship("InduPolicy", secondary="user_policy", backref=db.backref("bpolicy"))
@property
def password(self):
......@@ -1101,6 +1007,75 @@ class User(BaseModel, db.Model):
return token
# 用户关注行业，多-多
class UserIndustry(BaseModel, db.Model):
__tablename__ = "user_industry"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
industry_id = db.Column(db.Integer, db.ForeignKey("industry.id"), primary_key=True)
# #用户关注公司，多-多
class UserCompany(BaseModel, db.Model):
__tablename__ = "user_company"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
company_id = db.Column(db.Integer, db.ForeignKey("company.id"), primary_key=True)
# #用户关注公司，多-多
class UserEnterprise(BaseModel, db.Model):
__tablename__ = "user_enterprise"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
enterprise_id = db.Column(db.Integer, db.ForeignKey("enterprise.id"), primary_key=True)
# 小程序用户收藏地块，多-多
class UserLand(BaseModel, db.Model):
__tablename__ = "user_land"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
land_id = db.Column(db.Integer, db.ForeignKey("carrier_land.id"), primary_key=True)
# 小程序用户收藏楼宇，多-多
class UserBuild(BaseModel, db.Model):
__tablename__ = "user_build"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
build_id = db.Column(db.Integer, db.ForeignKey("carrier_build.id"), primary_key=True)
# 小程序用户收藏厂房，多-多
class UserFactory(BaseModel, db.Model):
__tablename__ = "user_factory"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
factory_id = db.Column(db.Integer, db.ForeignKey("carrier_factory.id"), primary_key=True)
# 小程序用户收藏园区，多-多
class UserZone(BaseModel, db.Model):
__tablename__ = "user_zone"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
zone_id = db.Column(db.Integer, db.ForeignKey("induzone.id"), primary_key=True)
# 小程序用户收藏重点项目，多-多
class UserProject(BaseModel, db.Model):
__tablename__ = "user_project"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
project_id = db.Column(db.Integer, db.ForeignKey("project.id"), primary_key=True)
# 小程序用户收藏政策，多-多
class UserPolicy(BaseModel, db.Model):
__tablename__ = "user_policy"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
policy_id = db.Column(db.Integer, db.ForeignKey("indu_policy.id"), primary_key=True)
# 后台管理用户
class Bstage(BaseModel, db.Model):
__tablename__ = "bstage"
......@@ -1509,80 +1484,6 @@ class MoneyArrive(db.Model):
arrive_money = db.Column(db.Float, comment='固定资产投资项目资金到位额')
"""以下为202212月改版后需求"""
# 招商图谱-产业链收藏
# class IndustryCollect(db.Model):
# __tablename_ = "industry_collect"
# __table_args__ = ({'comment': '招商图谱-产业链收藏'}) # 添加表注释
# id = db.Column(db.Integer, primary_key=True, autoincrement=True, comment='主键id')
# industry_id = db.Column(db.Integer, comment='产业id')
# user_id = db.Column(db.Integer, comment='用户id')
# collect_time = db.Column(db.String(30), comment='收藏时间')
# industry_name = db.Column(db.String(30), comment='收藏的产业名称')
""""""
# 用户关注行业，多-多
class UserIndustry(BaseModel, db.Model):
__tablename__ = "user_industry"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
industry_id = db.Column(db.Integer, db.ForeignKey("industry.id"), primary_key=True)
# #用户关注公司，多-多
class UserCompany(BaseModel, db.Model):
__tablename__ = "user_company"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
company_id = db.Column(db.Integer, db.ForeignKey("company.id"), primary_key=True)
# #用户关注公司，多-多
class UserEnterprise(BaseModel, db.Model):
__tablename__ = "user_enterprise"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
enterprise_id = db.Column(db.Integer, db.ForeignKey("enterprise.id"), primary_key=True)
# 小程序用户收藏地块，多-多
class UserLand(BaseModel, db.Model):
__tablename__ = "user_land"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
land_id = db.Column(db.Integer, db.ForeignKey("carrier_land.id"), primary_key=True)
# 小程序用户收藏楼宇，多-多
class UserBuild(BaseModel, db.Model):
__tablename__ = "user_build"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
build_id = db.Column(db.Integer, db.ForeignKey("carrier_build.id"), primary_key=True)
# 小程序用户收藏厂房，多-多
class UserFactory(BaseModel, db.Model):
__tablename__ = "user_factory"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
factory_id = db.Column(db.Integer, db.ForeignKey("carrier_factory.id"), primary_key=True)
# 小程序用户收藏园区，多-多
class UserZone(BaseModel, db.Model):
__tablename__ = "user_zone"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
factory_id = db.Column(db.Integer, db.ForeignKey("induzone.id"), primary_key=True)
# 小程序用户收藏重点项目，多-多
class UserProject(BaseModel, db.Model):
__tablename__ = "user_project"
user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
factory_id = db.Column(db.Integer, db.ForeignKey("project.id"), primary_key=True)
# 产业载体-土地数据
class CarrierLand(db.Model):
__tablename_ = "carrier_land"
......
apps/view_atlas/view.py
......@@ -628,7 +628,10 @@ def industry_policy():
policy_type = req_dict.get("policy_type") # 政策类型，全国、国务院
policy_year = req_dict.get("policy_year") # 政策年份
policy_name = req_dict.get("policy_name") # 政策名称
token = request.headers["token"]
user_obj = verify_token(token)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
# 校验参数完整性
if not all([page, perpage]):
return jsonify(code=RET.PARAMERR, msg="参数不完整")
......@@ -771,17 +774,25 @@ def industry_policy():
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg="数据库查询错误")
# 封装政策数据
policy_data = {
"policy_data": [{
policy_data = []
data = {}
for i in indu_policy:
if i in user_obj.industry_policy:
is_collect = 'True'
else:
is_collect = 'False'
policy_data.append({
"id": i.id,
"name": i.name,
"org": i.org,
"file": i.file,
"is_collect": is_collect,
"pubdate": (i.pubdate).strftime("%Y-%m-%d"),
} for i in indu_policy],
"size": size
}
return jsonify(code=RET.OK, msg="政策数据查询成功", data=policy_data)
})
data.update({"size": size})
data.update({"policy_data": policy_data})
return jsonify(code=RET.OK, msg="政策数据查询成功", data=data)
# 产业政策详情信息-复用招商驾驶舱政策详情接口
......@@ -921,6 +932,7 @@ def get_zaiti_detail_data():
else:
pass
data = {
"id": induzone.id,
"district": induzone.district,
"cate": induzone.cate,
"area": induzone.area,
......
apps/view_index/view.py
......@@ -523,7 +523,6 @@ def attract_video():
return jsonify(code=RET.OK, msg="查询成功", data={"video_url": video_url, "image_url": image_url})
else:
return jsonify(code=RET.DATAERR, msg="区县名称有误，没有相关视频")
return jsonify(code=RET.NODATA, msg="暂无视频", data={"url": ""})
......@@ -538,6 +537,7 @@ def keyproject():
try:
project = Project.query.get(id)
data = {
"id": project.id, # 工程名
"name": project.name, # 工程名
"district": project.district, # 区县名称
"type": project.type, # 工程类型
......
apps/view_xiaocx/view.py
......@@ -242,6 +242,7 @@ def meet_detail():
try:
meet_obj = IntroductionMeet.query.get(_id)
data = {
"id": meet_obj.id,
"name": meet_obj.name,
"time": meet_obj.time,
"organizer": meet_obj.organizer,
......@@ -311,8 +312,8 @@ def information_detail():
}
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="查询出错！")
return jsonify(code=RET.OK, data=data, msg='数据查询成功！')
return jsonify(code=RET.SESSIONERR, msg="Query error！")
return jsonify(code=RET.OK, data=data, msg='Data query success！')
# 重点企业列表
......@@ -339,8 +340,8 @@ def company_list():
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="查询出错！")
return jsonify(code=RET.OK, data={"data": data, "size": company_count}, msg='数据查询成功！')
return jsonify(code=RET.SESSIONERR, msg="Query error！")
return jsonify(code=RET.OK, data={"data": data, "size": company_count}, msg='Data query success！')
# 重点企业详情
......@@ -384,74 +385,8 @@ def company_detail():
except Exception as e:
current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="查询出错！")
return jsonify(code=RET.OK, data=data, msg='数据查询成功！')
# 详情
# @api_xiaocx.route('/ZaitiDetail', methods=['POST'])
# # @login_required
# def zaiti_detail():
# req_dict = request.get_json()
# flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区， 5项目
# _id = req_dict.get("id")
#
# try:
# if flag == 1:
# land_obj = CarrierLand.query.get(_id)
# data = {
# "name": land_obj.name,
# "lng": land_obj.lng,
# "lat": land_obj.lat,
# "district": land_obj.district,
# "location": land_obj.location,
# "nature": land_obj.nature,
# "plot_ratio": land_obj.plot_ratio,
# "develop_degree": land_obj.develop_degree,
# "linkman": land_obj.linkman,
# "telephone": land_obj.telephone
# }
#
# if flag == 2:
# build_obj = ZaitiBuild.query.get(_id)
# data = {
# "name": build_obj.name,
# "lng": build_obj.lng,
# "lat": build_obj.lat,
# "district": build_obj.district,
# "address": build_obj.address,
# "build_area": build_obj.build_area,
# "attract_industry": build_obj.attract_industry,
# "rent": build_obj.rent,
# "linkman": build_obj.linkman,
# "telephone": build_obj.telephone
# }
#
# if flag == 3:
# factory_obj = ZaitiFactory.query.get(_id)
# data = {
# "name": factory_obj.name,
# "lng": factory_obj.lng,
# "lat": factory_obj.lat,
# "district": factory_obj.district,
# "address": factory_obj.address,
# "land_area": factory_obj.land_area,
# "build_area": factory_obj.build_area,
# "empty_area": factory_obj.empty_area,
# "factory_structure": factory_obj.factory_structure,
# "width": factory_obj.width,
# "high": factory_obj.high,
# "attract_industry": factory_obj.attract_industry,
# "rent": factory_obj.rent,
# "linkman": factory_obj.linkman,
# "telephone": factory_obj.telephone
# }
# except Exception as e:
# current_app.logger.error(e)
# return jsonify(code=RET.SESSIONERR, msg="查询出错！")
# return jsonify(code=RET.OK, data=data, msg='数据查询成功！')
""""""
return jsonify(code=RET.SESSIONERR, msg="Query error！")
return jsonify(code=RET.OK, data=data, msg='Data query success！')
# 投资咨询
......@@ -485,8 +420,8 @@ def consultation():
db.session.commit()
except Enterprise as e:
current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="查询出错！")
return jsonify(code=RET.OK, msg='保存成功！')
return jsonify(code=RET.SESSIONERR, msg="Query error！")
return jsonify(code=RET.OK, msg='save successfully！')
# 投资咨询信息列表
......@@ -518,8 +453,8 @@ def consultation_list():
except Enterprise as e:
current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="查询出错！")
return jsonify(code=RET.OK, data={"data": data, "size": cons_count}, msg='查询成功！')
return jsonify(code=RET.SESSIONERR, msg="Query error！")
return jsonify(code=RET.OK, data={"data": data, "size": cons_count}, msg='Data query success！')
# 投资咨询详情
......@@ -547,8 +482,8 @@ def consultation_detail():
}
except Enterprise as e:
current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="查询出错！")
return jsonify(code=RET.OK, data=data, msg='查询成功！')
return jsonify(code=RET.SESSIONERR, msg="Query error！")
return jsonify(code=RET.OK, data=data, msg='Data query success！')
# 回复投资咨询
......@@ -641,16 +576,8 @@ def reply_consultation():
except Enterprise as e:
current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="回复信息保存出错！")
return jsonify(code=RET.OK, msg='回复信息保存成功。')
def get_user(mobile):
try:
user_obj = User.query.filter_by(mobile=mobile).first()
return user_obj
except Exception as e:
return None
return jsonify(code=RET.SESSIONERR, msg="Error saving reply message！")
return jsonify(code=RET.OK, msg='The reply message is saved successfully.')
# 收藏载体
......@@ -659,32 +586,75 @@ def get_user(mobile):
def collection_carrier():
req_dict = request.get_json()
id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业
name = req_dict.get("name")
token = request.headers["token"]
user_obj = verify_token(token)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
try:
if name == 'land':
for _id in id_list:
land_obj = CarrierLand.query.get(_id)
if not land_obj or land_obj in user_obj.carrier_land:
continue
user_obj.carrier_land.append(land_obj)
db.session.commit()
elif name == 'build':
for _id in id_list:
build_obj = CarrierBuild.query.get(_id)
if build_obj and build_obj in user_obj.carrier_build:
continue
user_obj.carrier_build.append(build_obj)
db.session.commit()
elif name == 'factory':
for _id in id_list:
factory_obj = CarrierFactory.query.get(_id)
if not factory_obj or factory_obj in user_obj.carrier_factory:
continue
user_obj.carrier_factory.append(factory_obj)
db.session.commit()
elif name == 'zone':
for _id in id_list:
zone_obj = Induzone.query.get(_id)
if not zone_obj or zone_obj in user_obj.industry_zone:
continue
user_obj.industry_zone.append(zone_obj)
db.session.commit()
elif name == 'project':
for _id in id_list:
project_obj = Project.query.get(_id)
if not project_obj or project_obj in user_obj.project:
continue
user_obj.project.append(project_obj)
db.session.commit()
elif name == 'company':
for _id in id_list:
company_obj = Company.query.get(_id)
if not company_obj or company_obj in user_obj.company:
continue
user_obj.company.append(company_obj)
db.session.commit()
elif name == 'policy':
for _id in id_list:
if flag == 1:
user_obj.carrier_land.append(_id)
elif flag == 2:
user_obj.carrier_build.append(_id)
elif flag == 3:
user_obj.carrier_factory.append(_id)
elif flag == 4:
user_obj.industry_zone.append(_id)
elif flag == 5:
user_obj.project.append(_id)
elif flag == 6:
user_obj.company.append(_id)
policy_obj = InduPolicy.query.get(_id)
if not policy_obj or policy_obj in user_obj.industry_policy:
continue
user_obj.industry_policy.append(policy_obj)
db.session.commit()
else:
pass
user_obj.commit()
return jsonify(code=RET.OK, msg='收藏成功。')
return jsonify(code=RET.OK, msg='Successful collection')
except Exception as e:
return jsonify(code=RET.DBERR, msg='收藏失败。')
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg='Collection failure')
# 取消收藏
......@@ -693,49 +663,88 @@ def collection_carrier():
def cancel_collection():
req_dict = request.get_json()
id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业
name = req_dict.get("name")
token = request.headers["token"]
user_obj = verify_token(token)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
return jsonify(code=RET.SESSIONERR, msg='User not logged in.')
try:
if name == 'land':
for _id in id_list:
land_obj = CarrierLand.query.get(_id)
if not land_obj or land_obj not in user_obj.carrier_land:
continue
user_obj.carrier_land.remove(land_obj)
db.session.commit()
elif name == 'build':
for _id in id_list:
if flag == 1:
user_obj.carrier_land.pop(_id)
elif flag == 2:
user_obj.carrier_build.pop(_id)
elif flag == 3:
user_obj.carrier_factory.pop(_id)
elif flag == 4:
user_obj.industry_zone.pop(_id)
elif flag == 5:
user_obj.project.pop(_id)
elif flag == 6:
user_obj.company.pop(_id)
build_obj = CarrierBuild.query.get(_id)
if not build_obj or build_obj not in user_obj.carrier_build:
continue
user_obj.carrier_build.remove(build_obj)
db.session.commit()
elif name == 'factory':
for _id in id_list:
factory_obj = CarrierFactory.query.get(_id)
if not factory_obj or factory_obj not in user_obj.carrier_factory:
continue
user_obj.carrier_factory.remove(factory_obj)
db.session.commit()
elif name == 'zone':
for _id in id_list:
zone_obj = Induzone.query.get(_id)
if not zone_obj or zone_obj not in user_obj.industry_zone:
continue
user_obj.industry_zone.remove(zone_obj)
db.session.commit()
elif name == 'project':
for _id in id_list:
project_obj = Project.query.get(_id)
if not project_obj or project_obj not in user_obj.project:
continue
user_obj.project.remove(project_obj)
db.session.commit()
elif name == 'company':
for _id in id_list:
company_obj = Company.query.get(_id)
if not company_obj or company_obj not in user_obj.company:
continue
user_obj.company.remove(company_obj)
db.session.commit()
elif name == 'policy':
for _id in id_list:
policy_obj = InduPolicy.query.get(_id)
if not policy_obj or policy_obj not in user_obj.industry_policy:
continue
user_obj.industry_policy.remove(policy_obj)
db.session.commit()
else:
pass
user_obj.commit()
return jsonify(code=RET.OK, msg='取消收藏成功。')
return jsonify(code=RET.OK, msg='Unbookmark success')
except Exception as e:
return jsonify(code=RET.DBERR, msg='取消收藏失败。')
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg='Unbookmark failure')
# 获取收藏列表
@api_xiaocx.route('/CollectionList', methods=['POST'])
# @login_required
def collection_list():
req_dict = request.get_json()
# id_list = req_dict.get("id_list")
flag = req_dict.get("flag") # 1地块，2楼宇，3厂房，4园区，5项目，6企业
name = req_dict.get("name")
# key_word = req_dict.get("key_word")
token = request.headers["token"]
user_obj = verify_token(token)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
return jsonify(code=RET.SESSIONERR, msg='User not logged in')
try:
# user_obj = verify_token(token)
if flag == 1:
if name == 'land':
obj_list = user_obj.carrier_land
data = [{
"id": obj.id,
......@@ -744,9 +753,9 @@ def collection_list():
"nature": obj.land_nature,
"area": obj.total_area,
"lng": obj.lng,
"lat": obj.lat,
"lat": obj.lat
} for obj in obj_list]
elif flag == 2:
elif name == 'build':
obj_list = user_obj.carrier_build
data = [{
"id": obj.id,
......@@ -757,7 +766,7 @@ def collection_list():
"lng": obj.lng,
"lat": obj.lat,
} for obj in obj_list]
elif flag == 3:
elif name == 'factory':
obj_list = user_obj.carrier_factory
data = [{
"id": obj.id,
......@@ -768,7 +777,7 @@ def collection_list():
"lng": obj.lng,
"lat": obj.lat,
} for obj in obj_list]
elif flag == 4:
elif name == 'zone':
obj_list = user_obj.industry_zone
data = [{
"id": obj.id,
......@@ -779,7 +788,7 @@ def collection_list():
"lng": obj.lng,
"lat": obj.lat,
} for obj in obj_list]
elif flag == 5:
elif name == 'project':
obj_list = user_obj.project
data = [{
"id": obj.id,
......@@ -790,16 +799,31 @@ def collection_list():
# "lng": obj.lng,
# "lat": obj.lat,
} for obj in obj_list]
elif flag == 6:
elif name == 'company':
obj_list = user_obj.company
data = [{
"id": obj.id,
"company_name": obj.company_name,
"district": obj.district,
"company_industry": obj.company_industry,
"lng": obj.lng,
"lat": obj.lat,
} for obj in obj_list]
elif name == 'policy':
obj_list = user_obj.industry_policy
data = [{
"id": obj.id,
"name": obj.name,
"post_num": obj.post_num,
"industry": obj.industry,
"pubdate": obj.pubdate.strftime("%Y-%m-%d")
} for obj in obj_list]
else:
pass
return jsonify(code=RET.OK, data=data, msg='查询成功。')
return jsonify(code=RET.OK, data=data, msg='Query success')
except Exception as e:
return jsonify(code=RET.DBERR, msg='查询失败。')
current_app.logger.error(e)
return jsonify(code=RET.DBERR, msg='Query failure')
# 微信授权
......@@ -814,7 +838,7 @@ def wechat_login():
code = req_dict.get('code') # 微信登录code
# 校验参数完整性
if not all([code]):
return jsonify(code=RET.PARAMERR, msg="参数不完整")
return jsonify(code=RET.PARAMERR, msg="Parameter incompleteness!")
app_id = 'wx67c0a99d684274f8'
app_secret = 'd89755bb5d2d3f85e97d0f08c30dbebc'
......@@ -858,5 +882,61 @@ def wechat_login():
"token": token
}
except Enterprise as e:
current_app.logger.error(e)
return jsonify(code=RET.DATAERR, msg="数据异常！")
return jsonify(code=RET.OK, data=user_info, msg="微信登录成功。")
# 返回收藏状态
@api_xiaocx.route("/IsCollection", methods=["POST"])
def is_collection():
req_dic = request.get_json()
type = req_dic["type"]
_id = req_dic["id"]
token = request.headers["token"]
user_obj = verify_token(token)
if not user_obj:
return jsonify(code=RET.SESSIONERR, msg='用户未登录。')
if type == "land":
land_obj = CarrierLand.query.get(_id)
if land_obj in user_obj.carrier_land:
return jsonify(code=RET.OK, data="True", msg="此地块为已收藏状态。")
return jsonify(code=RET.OK, data="False", msg="此地块为未收藏状态。")
if type == "build":
build_obj = CarrierBuild.query.get(_id)
if build_obj in user_obj.carrier_build:
return jsonify(code=RET.OK, data="True", msg="此楼宇为已收藏状态。")
return jsonify(code=RET.OK, data="False", msg="此楼宇为未收藏状态。")
if type == "factory":
factory_obj = CarrierFactory.query.get(_id)
if factory_obj in user_obj.carrier_factory:
return jsonify(code=RET.OK, data="True", msg="此厂房为已收藏状态。")
return jsonify(code=RET.OK, data="False", msg="此厂房为未收藏状态。")
if type == "zone":
zone_obj = Induzone.query.get(_id)
if zone_obj in user_obj.industry_zone:
return jsonify(code=RET.OK, data="True", msg="此园区为已收藏状态。")
return jsonify(code=RET.OK, data="False", msg="此园区为未收藏状态。")
if type == "project":
project_obj = Project.query.get(_id)
if project_obj in user_obj.project:
return jsonify(code=RET.OK, data="True", msg="此项目为已收藏状态。")
return jsonify(code=RET.OK, data="False", msg="此项目为未收藏状态。")
if type == "company":
company_obj = Company.query.get(_id)
if company_obj in user_obj.company:
return jsonify(code=RET.OK, data="True", msg="此企业为已收藏状态。")
return jsonify(code=RET.OK, data="False", msg="此企业为未收藏状态。")
if type == "policy":
policy_obj = InduPolicy.query.get(_id)
if policy_obj in user_obj.industry_policy:
return jsonify(code=RET.OK, data="True", msg="此楼宇为已收藏状态。")
return jsonify(code=RET.OK, data="False", 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