招商驾驶舱

04d96213 · 赵宇 · 3961e0ad · 04d96213 · 04d96213 · 04d96213
Commit 04d96213 authored Dec 10, 2021 by 赵宇
Show whitespace changes
Inline Side-by-side

Showing with 43 additions and 64 deletions

apps/__init__.py
+2 -2

apps/view_attract/view.py
+38 -54

config.py
+3 -8

No files found.
--- a/apps/__init__.py
+++ b/apps/__init__.py
@@ -88,11 +88,11 @@ def creat_app(config_name):
    app.url_map.converters['re'] = RegexConverter
    # 注册蓝图，推迟导入，防止循环嵌套
+    from apps.view_attract import api_attract  # 招商驾驶舱
    # 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.view_attract import api_attract
    # from apps.view_360 import api_portraits
    # from apps.view_choose_address import api_address
    # from apps.manage import api_power
@@ -104,7 +104,7 @@ def creat_app(config_name):
    # app.register_blueprint(api_atlas, url_prefix='/api/atlas')
    # app.register_blueprint(api_att, url_prefix='/api/att')
    #
-    # app.register_blueprint(api_attract, url_prefix='/api/attract/industry')
+    app.register_blueprint(api_attract, url_prefix='/api/attract/industry')
    # app.register_blueprint(api_portraits, url_prefix="/api/portraits/industry")
    # app.register_blueprint(api_address, url_prefix="/api/address/industry")
    # app.register_blueprint(api_power, url_prefix="/api/power")

--- a/apps/view_attract/view.py
+++ b/apps/view_attract/view.py
@@ -38,9 +38,12 @@ def get_jjzb(district):
        current_app.logger.error(e)
        return jsonify(code=RET.DBERR, msg="数据库错误")
 @api_attract.route("/index", methods=["GET"])
-def menu():
+def index():
-    return 'hello! 你好！'
+    return 'hahah'
 # 左上角企业数量各资质统计、左上角获取经济指标数据、产业机构分布饼状图数据统计
 @api_attract.route("/menu", methods=["POST"])
@@ -51,11 +54,11 @@ def menu():
    # 区县名称转换字典
    district_dict = {
-                     '沁水市': '沁水市',
+                     '沁水县': '沁水县',
                     '高平市': '高平市',
-                     '陵川市': '陵川市',
+                     '陵川县': '陵川县',
-                     '阳城市': '阳城市',
+                     '阳城县': '阳城县',
-                     '泽州市': '泽州市',
+                     '泽州县': '泽州县',
                     '城区': '城区'
                     }
@@ -67,7 +70,8 @@ def menu():
            return jsonify(code=RET.DBERR, msg="数据库错误")
    else:
        try:
-            company = Company.query.filter(Company.induzone == district_dict[district], Company.city == "晋城市")
+            # company = Company.query.filter(Company.induzone == district_dict[district], Company.city == "晋城市")
+            company = Company.query.filter(Company.district == district_dict[district], Company.city == "晋城市")
        except Exception as e:
            current_app.logger.error(e)
            return jsonify(code=RET.DBERR, msg="数据库错误")
@@ -155,7 +159,7 @@ def project():
        project_map = []
        industry_money = []
        industry_nums = []
-        list1 = ["沁水市", "高平市", "陵川市", "阳城市", "泽州市", "城区"]
+        list1 = ["沁水县", "高平市", "陵川县", "阳城县", "泽州县", "城区"]
        # 晋城市，点击区县之前默认数据
        if not district or district == '晋城市':
@@ -213,43 +217,32 @@ def project():
    return jsonify(code=RET.OK, msg="获取成功", data=data)
-# 政策和重点项目 --- 重点项目需要改名称
+# 政策和重点项目
 @api_attract.route("/propol", methods=["POST"])
 def propol():
    req_dict = request.get_json()
    district = req_dict.get("district")  # 县区
-    district_dict = {'沁水市': '沁水市',
-                     '高平市': '高平市',
-                     '陵川市': '陵川市',
-                     '阳城市': '阳城市',
-                     '泽州市': '泽州市',
-                     '城区': '城区'}
-    try:
-        project = Project.query.filter_by()  # 重点项目
-        policy = InduPolicy.query.filter_by()  # 政策
-        if not district and district == "晋城市":
+    try:
+        if not district or district == "晋城市":
            # name_query = "project-propol"
            # 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)
-            project = project.filter_by()
+            project = Project.query.all()
-            policy_province = policy.filter_by(district="山西省").order_by(InduPolicy.pubdate.desc())
+            policy = InduPolicy.query.filter_by(district="晋城市").order_by(InduPolicy.pubdate.desc())
-            policy = policy.filter_by(district="晋城市").order_by(InduPolicy.pubdate.desc())
-            policy_2 = [{"name": i.name, "id": i.id, "distict": "山西省"} for i in policy_province.all()]
            data_policy = [{"name": i.name, "id": i.id, "distict": "太原市"} for i in policy.all()]
-            data_project = [{"name": i.name, "id": i.id} for i in project.all()]
+            data_project = [{"name": i.name, "id": i.id} for i in project]
            data = {
                "project": data_project,
                "policy": data_policy,
-                "policy_province": policy_2
            }
            # redis缓存
            # redis_store.set(name_query, json.dumps(data))
            # redis_store.expire(name_query, 1 * 24 * 3600)
        else:  # 区县、开发区
-            project = project.filter_by(district=district_dict[district])
+            project = Project.query.filter_by(district=district)
-            policy = policy.filter_by(district=district_dict[district]).order_by(InduPolicy.pubdate.desc())
+            policy = InduPolicy.query.filter_by(district=district).order_by(InduPolicy.pubdate.desc())
            data_policy = [{"name": i.name, "id": i.id, "distict": district} for i in policy.all()]
            data_project = [{"name": i.name, "id": i.id} for i in project.all()]
            data = {
@@ -267,15 +260,6 @@ def propol():
 # 获取区县的详情
 @api_attract.route("/getInfo", methods=["POST"])
 def get_info():
-    district_dict = {'晋城市': '晋城市',
-                     '沁水市': '沁水市',
-                     '高平市': '高平市',
-                     '陵川市': '陵川市',
-                     '阳城市': '阳城市',
-                     '泽州市': '泽州市',
-                     '城区': '城区'
-                     }
    req_dic = request.get_json()
    district = req_dic.get("district")  # 地区
@@ -283,7 +267,7 @@ def get_info():
        return jsonify(code=RET.PARAMERR, msg="参数不完整")
    try:
-        city = City.query.filter_by(area=district_dict[district]).first()
+        city = City.query.filter_by(area=district).first()
        info = city.info
        return jsonify(code=RET.OK, msg="查询成功", data=info)
    except Exception as e:
@@ -300,24 +284,24 @@ def attract_video():
    if not district:
        return jsonify(code=RET.PARAMERR, msg="参数不全")
-    district_dict = {'晋城市': '晋城市',
+    # district_dict = {'晋城市': '晋城市',
-                     '沁水市': '沁水市',
+    #                  '沁水市': '沁水市',
-                     '高平市': '高平市',
+    #                  '高平市': '高平市',
-                     '陵川市': '陵川市',
+    #                  '陵川市': '陵川市',
-                     '阳城市': '阳城市',
+    #                  '阳城市': '阳城市',
-                     '泽州市': '泽州市',
+    #                  '泽州市': '泽州市',
-                     '城区': '城区'
+    #                  '城区': '城区'
-                     }
+    #                  }
+    try:
-    if district not in district_dict:
-        return jsonify(code=RET.DATAERR, msg="区县名称有误，没有相关视频")
-    district = district_dict[district]
        video = Video.query.filter_by(district=district).first()
+    except Exception as e:
+        current_app.logger.error(e)
    if video:
        url = video.video_id
        if url:
            return jsonify(code=RET.OK, msg="查询成功", data={"url": url})
+    else:
+        return jsonify(code=RET.DATAERR, msg="区县名称有误，没有相关视频")
    return jsonify(code=RET.NODATA, msg="暂无视频", data={"url": ""})
@@ -378,11 +362,11 @@ def policy_details():
 @api_attract.route("/showListb", methods=["POST"])
 def showListb():
    district_dict = {'晋城市': '晋城市',
-                     '沁水市': '沁水市',
+                     '沁水县': '沁水县',
                     '高平市': '高平市',
-                     '陵川市': '陵川市',
+                     '陵川县': '陵川县',
-                     '阳城市': '阳城市',
+                     '阳城县': '阳城县',
-                     '泽州市': '泽州市',
+                     '泽州县': '泽州县',
                     '城区': '城区'
                     }

--- a/config.py
+++ b/config.py
@@ -4,22 +4,17 @@ import datetime
 from urllib import parse
 # 将开发模式和调试模式的配置信息中相同的部分复用
 class Config:
    # sql数据库
    # 在连接前将特殊的密码转码再链接即可
    passowrd = parse.quote_plus('Root@2020')
-    SQLALCHEMY_DATABASE_URI = "mysql+pymysql://root:{}@rm-8vbn50m65w332c23aso.mysql.zhangbei.rds.aliyuncs.com/jincheng_data?charset=utf8mb4".format(passowrd)  # 晋城 阿里云
+    SQLALCHEMY_DATABASE_URI = "mysql+pymysql://root:{}@rm-8vbn50m65w332c23aso.mysql.zhangbei.rds.aliyuncs.com/" \
+                              "jincheng_data?charset=utf8mb4".format(passowrd)  # 晋城 阿里云
-    # SQLALCHEMY_DATABASE_URI = '{}+{}://{}:{}@{}:{}/{}?charset=utf8'.format(
-    #     'mysql', 'pymysql', 'root', 'Root@2020', 'rm-8vbn50m65w332c23aso.mysql.zhangbei.rds.aliyuncs.com', '3306', 'jincheng_data'
-    # )
    SQLALCHEMY_TRACK_MODIFICATIONS = False
    # redis配置信息
-    # REDIS_HOST = '127.0.0.1'
+    REDIS_HOST = '127.0.0.1'
-    REDIS_HOST = '39.100.39.50'
    REDIS_PORT = 6379
    # REDIS_PASS = "Mypwdty2020!"  # TODO
    REDIS_PASS = None  # TODO