Commit c8302eb1 by dong

fix20230720库账号

parent 0ddca8af
...@@ -1753,10 +1753,10 @@ def batch_export_project1(): ...@@ -1753,10 +1753,10 @@ def batch_export_project1():
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!") return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!")
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
path = './apps/static/project_file/' path = './apps/statics/project_file/'
# pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/' # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
# pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
pro_path = SERVER_NAME + '/static/project_file/' # 项目路径 # pro_path = SERVER_NAME + '/static/project_file/' # 项目路径
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空!") return jsonify(code=RET.PARAMERR, msg="参数不能为空!")
target_data_list = [] target_data_list = []
...@@ -1855,9 +1855,9 @@ def batch_export_project2(): ...@@ -1855,9 +1855,9 @@ def batch_export_project2():
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!") return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!")
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
path = './apps/static/project_file/' path = './apps/statics/project_file/'
# pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/' # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空!") return jsonify(code=RET.PARAMERR, msg="参数不能为空!")
target_data_list = [] target_data_list = []
...@@ -1971,9 +1971,9 @@ def batch_export_project3(): ...@@ -1971,9 +1971,9 @@ def batch_export_project3():
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!") return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!")
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
path = './apps/static/project_file/' path = './apps/statics/project_file/'
# pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/' # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空!") return jsonify(code=RET.PARAMERR, msg="参数不能为空!")
target_data_list = [] target_data_list = []
...@@ -2101,9 +2101,9 @@ def batch_export_project4(): ...@@ -2101,9 +2101,9 @@ def batch_export_project4():
current_app.logger.error(e) current_app.logger.error(e)
return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!") return jsonify(code=RET.SESSIONERR, msg="用户信息校验失败,请重新登陆后尝试!")
select_id_list = req_dic["select_id_list"] select_id_list = req_dic["select_id_list"]
path = './apps/static/project_file/' path = './apps/statics/project_file/'
# pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/' # pro_path = 'D:/中研项目代码/flask_jincheng/apps/statics/project_file/'
pro_path = 'http://39.100.39.50:5050/static/project_file/' # 项目路径 pro_path = 'http://39.100.39.50:5050/statics/project_file/' # 项目路径
if not select_id_list: if not select_id_list:
return jsonify(code=RET.PARAMERR, msg="参数不能为空!") return jsonify(code=RET.PARAMERR, msg="参数不能为空!")
target_data_list = [] target_data_list = []
......
...@@ -98,7 +98,7 @@ def get_all_enterprise(): ...@@ -98,7 +98,7 @@ def get_all_enterprise():
# 360企业画像--筛选条件下拉框 # 360企业画像--筛选条件下拉框
@api_portraits.route('/DropDownBox', methods=['GET']) @api_portraits.route('/DropDownBox', methods=['GET'])
# @login_required @login_required
def field(): def field():
''' '''
全国企业条件选择导航获取: 全国企业条件选择导航获取:
......
...@@ -352,7 +352,7 @@ def find_up_thr1(chain_id, industry_type, industry_id, flag): ...@@ -352,7 +352,7 @@ def find_up_thr1(chain_id, industry_type, industry_id, flag):
# 返回上中下游产业链数据接口 # 返回上中下游产业链数据接口
@api_atlas.route('/industry/chain', methods=['POST']) @api_atlas.route('/industry/chain', methods=['POST'])
# @login_required @login_required
def industry_chain(): def industry_chain():
''' '''
行业id->行业链标题-》上中下游-》查询数值 行业id->行业链标题-》上中下游-》查询数值
...@@ -1049,7 +1049,7 @@ def get_product_li(product, inid): ...@@ -1049,7 +1049,7 @@ def get_product_li(product, inid):
# 点击产业联动显示企业 # 点击产业联动显示企业
@api_atlas.route('/industry/enterprise', methods=['POST']) @api_atlas.route('/industry/enterprise', methods=['POST'])
# @login_required @login_required
def industry_enterprise(): def industry_enterprise():
'''骨干企业数据''' '''骨干企业数据'''
req_dict = request.get_json() req_dict = request.get_json()
...@@ -1072,7 +1072,7 @@ def industry_enterprise(): ...@@ -1072,7 +1072,7 @@ def industry_enterprise():
Company.city == "晋城市", Company.city == "晋城市",
Company.entype.like('%{}%'.format(entype)) if entype else text(''), Company.entype.like('%{}%'.format(entype)) if entype else text(''),
Company.company_name.like('%{}%'.format(company_name)) if company_name else text(''), Company.company_name.like('%{}%'.format(company_name)) if company_name else text(''),
Company.status == status if status else text('') Company.public_sector == status if status else text('')
) )
company = company.filter(Company.c_type == inid) company = company.filter(Company.c_type == inid)
...@@ -1095,7 +1095,6 @@ def industry_enterprise(): ...@@ -1095,7 +1095,6 @@ def industry_enterprise():
product_li = get_product_li(product, inid) product_li = get_product_li(product, inid)
company1 = [] company1 = []
for product in product_li: for product in product_li:
company2 = ''
company2 = company.filter( company2 = company.filter(
Company.c_type == inid, Company.c_type == inid,
Company.product_all.like("%{}%".format(product)) Company.product_all.like("%{}%".format(product))
...@@ -1146,7 +1145,7 @@ def industry_enterprise(): ...@@ -1146,7 +1145,7 @@ def industry_enterprise():
# 二级行业收藏状态获取 # 二级行业收藏状态获取
@api_atlas.route('/industry/Inducollect', methods=['POST']) @api_atlas.route('/industry/Inducollect', methods=['POST'])
# @login_required @login_required
def inducollect(): def inducollect():
'''获取当前用户对二级行业的收藏状态''' '''获取当前用户对二级行业的收藏状态'''
try: try:
...@@ -1216,7 +1215,7 @@ def industry_collect(): ...@@ -1216,7 +1215,7 @@ def industry_collect():
# 企业收藏与取消 # 企业收藏与取消
@api_atlas.route('/EnterpriseCollect', methods=['POST']) @api_atlas.route('/EnterpriseCollect', methods=['POST'])
# @login_required @login_required
def enterprise_collect(): def enterprise_collect():
''' '''
企业收藏与取消 企业收藏与取消
...@@ -1297,7 +1296,7 @@ def jishu(num): ...@@ -1297,7 +1296,7 @@ def jishu(num):
# 招商地图下的色块图(同右侧得数量分布饼图) # 招商地图下的色块图(同右侧得数量分布饼图)
@api_atlas.route('/AttractMap', methods=['POST']) @api_atlas.route('/AttractMap', methods=['POST'])
# @login_required @login_required
def attract_map(): def attract_map():
'''招商地图''' '''招商地图'''
req_dict = request.get_json() req_dict = request.get_json()
...@@ -1374,7 +1373,7 @@ def attract_map(): ...@@ -1374,7 +1373,7 @@ def attract_map():
# 招商地图下的散点图(至区后) # 招商地图下的散点图(至区后)
@api_atlas.route('/AttractSdmap', methods=['POST']) @api_atlas.route('/AttractSdmap', methods=['POST'])
# @login_required @login_required
def attract_sdmap(): def attract_sdmap():
'''招商地图''' '''招商地图'''
req_dict = request.get_json() req_dict = request.get_json()
......
...@@ -35,7 +35,7 @@ def jishu(num): ...@@ -35,7 +35,7 @@ def jishu(num):
# 招商地图下的色块图(同右侧得数量分布饼图) # 招商地图下的色块图(同右侧得数量分布饼图)
@api_map.route('/AttractMap', methods=['POST']) @api_map.route('/AttractMap', methods=['POST'])
# @login_required @login_required
def attract_map(): def attract_map():
'''招商地图''' '''招商地图'''
req_dict = request.get_json() req_dict = request.get_json()
...@@ -146,7 +146,7 @@ def attract_map(): ...@@ -146,7 +146,7 @@ def attract_map():
# 右侧全国地图企业数据 # 右侧全国地图企业数据
@api_map.route('/EnterpriseTop5', methods=['POST']) @api_map.route('/EnterpriseTop5', methods=['POST'])
# @login_required @login_required
def attract_cnums(): def attract_cnums():
'''招商地图''' '''招商地图'''
req_dict = request.get_json() req_dict = request.get_json()
...@@ -300,7 +300,7 @@ def attract_cnums(): ...@@ -300,7 +300,7 @@ def attract_cnums():
"""""" """"""
# 招商地图下的散点图(至区后) # 招商地图下的散点图(至区后)
@api_map.route('/AttractSdmap', methods=['POST']) @api_map.route('/AttractSdmap', methods=['POST'])
# @login_required @login_required
def attract_sdmap(): def attract_sdmap():
'''招商地图''' '''招商地图'''
req_dict = request.get_json() req_dict = request.get_json()
......
...@@ -36,7 +36,7 @@ graph = conn_neo4j() ...@@ -36,7 +36,7 @@ graph = conn_neo4j()
# 产业分析-趋势预判 # 产业分析-趋势预判
@api_radar.route('/IdusTendency', methods=['POST']) @api_radar.route('/IdusTendency', methods=['POST'])
# @login_required @login_required
def tendency(): def tendency():
'''雷达监测页企业数量统计''' '''雷达监测页企业数量统计'''
req_dict = request.get_json() req_dict = request.get_json()
...@@ -187,7 +187,7 @@ def tendency(): ...@@ -187,7 +187,7 @@ def tendency():
# 产业分析-top10榜单数据接口 # 产业分析-top10榜单数据接口
@api_radar.route('/IdusTopTen', methods=['POST']) @api_radar.route('/IdusTopTen', methods=['POST'])
# @login_required @login_required
def topt(): def topt():
'''雷达监测页企业top10''' '''雷达监测页企业top10'''
req_dict = request.get_json() req_dict = request.get_json()
...@@ -271,7 +271,7 @@ def topt(): ...@@ -271,7 +271,7 @@ def topt():
# 产业评估-优势薄弱缺失三环节 # 产业评估-优势薄弱缺失三环节
@api_radar.route('/ThreeLink', methods=['POST']) @api_radar.route('/ThreeLink', methods=['POST'])
# @login_required @login_required
def prolink(): def prolink():
'''雷达监测页企业属性分布统计''' '''雷达监测页企业属性分布统计'''
req_dict = request.get_json() req_dict = request.get_json()
...@@ -423,7 +423,7 @@ def prolink(): ...@@ -423,7 +423,7 @@ def prolink():
# 产业评估-根据具体环节的细分产业获取相关企业 # 产业评估-根据具体环节的细分产业获取相关企业
@api_radar.route('/GetLinkEnterprise', methods=['POST']) @api_radar.route('/GetLinkEnterprise', methods=['POST'])
# @login_required @login_required
def recommond(): def recommond():
''' '''
产品描述及企业推荐 产品描述及企业推荐
...@@ -493,7 +493,7 @@ def recommond(): ...@@ -493,7 +493,7 @@ def recommond():
@api_radar.route('/SaveRedis', methods=['GET']) @api_radar.route('/SaveRedis', methods=['GET'])
# @login_required @login_required
def save_redis(): def save_redis():
'''雷达监测页企业数量统计''' '''雷达监测页企业数量统计'''
name_query = 'value_name_aaa' name_query = 'value_name_aaa'
...@@ -508,7 +508,7 @@ def save_redis(): ...@@ -508,7 +508,7 @@ def save_redis():
# 优质企业-各资质企业数量 # 优质企业-各资质企业数量
@api_radar.route('/GoodEnterpriseNum', methods=['POST']) @api_radar.route('/GoodEnterpriseNum', methods=['POST'])
# @login_required @login_required
def radar_enums1(): def radar_enums1():
'''雷达监测页企业数量统计''' '''雷达监测页企业数量统计'''
req_dict = request.get_json() req_dict = request.get_json()
......
...@@ -16,7 +16,7 @@ from apps.view_choose.choose_view import global_region, global_land, global_fact ...@@ -16,7 +16,7 @@ from apps.view_choose.choose_view import global_region, global_land, global_fact
# 全部搜索功能 # 全部搜索功能
@api_xiaocx.route("/SearchAll", methods=["POST"]) @api_xiaocx.route("/SearchAll", methods=["POST"])
# @login_required @login_required
def search_all(): def search_all():
req_dict = request.get_json() req_dict = request.get_json()
key_words = req_dict['key_words'] # 关键字 key_words = req_dict['key_words'] # 关键字
...@@ -68,7 +68,7 @@ def search_all(): ...@@ -68,7 +68,7 @@ def search_all():
# 首页搜索 # 首页搜索
@api_xiaocx.route('/IndexSearch', methods=['POST']) @api_xiaocx.route('/IndexSearch', methods=['POST'])
# @login_required @login_required
def index_search(): def index_search():
req_dict = request.get_json() req_dict = request.get_json()
carrier_type = req_dict.get("carrier_type") # 载体类型 1地块,2楼宇,3厂房,4园区,5项目 carrier_type = req_dict.get("carrier_type") # 载体类型 1地块,2楼宇,3厂房,4园区,5项目
...@@ -292,7 +292,7 @@ def index_search(): ...@@ -292,7 +292,7 @@ def index_search():
# 推介会列表 # 推介会列表
@api_xiaocx.route('/IntroductionMeet', methods=['POST']) @api_xiaocx.route('/IntroductionMeet', methods=['POST'])
# @login_required @login_required
def introduction_meet(): def introduction_meet():
req_dict = request.get_json() req_dict = request.get_json()
page = req_dict.get("page") page = req_dict.get("page")
...@@ -320,7 +320,7 @@ def introduction_meet(): ...@@ -320,7 +320,7 @@ def introduction_meet():
# 推介会详情 # 推介会详情
@api_xiaocx.route('/MeetDetail', methods=['POST']) @api_xiaocx.route('/MeetDetail', methods=['POST'])
# @login_required @login_required
def meet_detail(): def meet_detail():
req_dict = request.get_json() req_dict = request.get_json()
_id = req_dict.get("id") _id = req_dict.get("id")
...@@ -345,7 +345,7 @@ def meet_detail(): ...@@ -345,7 +345,7 @@ def meet_detail():
# 招商资讯列表 # 招商资讯列表
@api_xiaocx.route('/Information', methods=['POST']) @api_xiaocx.route('/Information', methods=['POST'])
# @login_required @login_required
def information(): def information():
req_dict = request.get_json() req_dict = request.get_json()
page = req_dict.get("page") page = req_dict.get("page")
...@@ -377,7 +377,7 @@ def information(): ...@@ -377,7 +377,7 @@ def information():
# 招商资讯详情/最新一条时id传空 # 招商资讯详情/最新一条时id传空
@api_xiaocx.route('/InformationDetail', methods=['POST']) @api_xiaocx.route('/InformationDetail', methods=['POST'])
# @login_required @login_required
def information_detail(): def information_detail():
req_dict = request.get_json() req_dict = request.get_json()
_id = req_dict.get("id") _id = req_dict.get("id")
...@@ -403,7 +403,7 @@ def information_detail(): ...@@ -403,7 +403,7 @@ def information_detail():
# 重点企业列表 # 重点企业列表
@api_xiaocx.route('/CompanyList', methods=['POST']) @api_xiaocx.route('/CompanyList', methods=['POST'])
# @login_required @login_required
def company_list(): def company_list():
req_dict = request.get_json() req_dict = request.get_json()
page = req_dict.get("page") page = req_dict.get("page")
...@@ -433,7 +433,7 @@ def company_list(): ...@@ -433,7 +433,7 @@ def company_list():
# 重点企业详情 # 重点企业详情
@api_xiaocx.route('/CompanyDetail', methods=['POST']) @api_xiaocx.route('/CompanyDetail', methods=['POST'])
# @login_required @login_required
def company_detail(): def company_detail():
req_dict = request.get_json() req_dict = request.get_json()
_id = req_dict.get("id") _id = req_dict.get("id")
......
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