fix

apps/view_map/view.py

@@ -148,7 +148,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()
@@ -488,41 +488,64 @@ def attract_enterprise():
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
 
     try:
     try:
+        if product:
+            enterprise, size = get_enterprise_num(product, inid)
+        else:
             enterprise = Enterprise.query.filter(or_(
             enterprise = Enterprise.query.filter(or_(
                 Enterprise.c_type == inid,
                 Enterprise.c_type == inid,
                 Enterprise.c_type1 == inid,
                 Enterprise.c_type1 == inid,
                 Enterprise.c_type2 == inid
                 Enterprise.c_type2 == inid
-        ))
+            )).all()
 
 
-        enterprise = enterprise.filter(
-            # Enterprise.product_all.like("%{}%".format(product)) if product else text(''),
-            Enterprise.entype.like('%{}%'.format(entype)) if entype else text(''),
-            Enterprise.company_name.like('%{}%'.format(company_name)) if company_name else text(''),
-            # Enterprise.c_type == inid if not product else text(''),
-            Enterprise.public_id == quoted if quoted else text(''),
-            Enterprise.province == province if province else text(''),
-            Enterprise.city == city if city else text(''),
-            Enterprise.district == district if district else text(''),
-            Enterprise.isfive == '1' if qualificat == '中国500强企业' else text(''),
-            Enterprise.quoted_company == '1' if qualificat == '上市企业' else text(''),
-            Enterprise.chain_master == '1' if qualificat == '链主企业' else text(''),
-            Enterprise.high_new == '1' if qualificat == '高新技术企业' else text(''),
-            Enterprise.zjtg == '1' if qualificat == '山西专精特新企业' else text(''),
-            Enterprise.unicorn == '1' if qualificat == '独角兽企业' else text(''),
-            Enterprise.dengl == '1' if qualificat == '瞪羚企业' else text(''),
-            Enterprise.tbe == '1' if qualificat == '科技型中小企业' else text(''),
-            Enterprise.scale == '1' if qualificat == '规模以上企业' else text(''),
-            Enterprise.sxonhun == '1' if qualificat == '山西100强企业' else text(''),
-            Enterprise.serve == '1' if qualificat == '限额以上服务业企业' else text(''),
-            Enterprise.patent == '1' if qualificat == '专利企业' else text('')
-        )
-        if product:
-            company, size = get_enterprise_num(product, inid)
-            company1 = sorted(company, key=lambda x: x.hots, reverse=True)  # 排序
+        if company_name:
+            enterprise = [enter for enter in enterprise if company_name in enter.company_name]
+            # enterprise = enterprise.filter_by(
+            #     Enterprise.company_name.like('%{}%'.format(company_name)) if company_name else text('')
+            # )
+
+        if entype:
+            enterprise = [enter for enter in enterprise if entype in enter.entype]
+
+            # enterprise = enterprise.filter(
+            #     Enterprise.entype.like('%{}%'.format(entype)) if entype else text('')
+            # )
+        if quoted:
+            enterprise = [enter for enter in enterprise if enter.public_id == quoted]
+
+        if province:
+            enterprise = [enter for enter in enterprise if enter.province == province]
+        if city:
+            enterprise = [enter for enter in enterprise if enter.city == city]
+        if district:
+            enterprise = [enter for enter in enterprise if enter.district == district]
+
+        if qualificat == '中国500强企业':
+            enterprise = [enter for enter in enterprise if enter.isfive == '1']
+        if qualificat == '上市企业':
+            enterprise = [enter for enter in enterprise if enter.quoted_company == '1']
+        if qualificat == '链主企业':
+            enterprise = [enter for enter in enterprise if enter.chain_master == '1']
+        if qualificat == '高新技术企业':
+            enterprise = [enter for enter in enterprise if enter.high_new == '1']
+        if qualificat == '山西专精特新企业':
+            enterprise = [enter for enter in enterprise if enter.zjtg == '1']
+        if qualificat == '独角兽企业':
+            enterprise = [enter for enter in enterprise if enter.unicorn == '1']
+        if qualificat == '瞪羚企业':
+            enterprise = [enter for enter in enterprise if enter.dengl == '1']
+        if qualificat == '科技型中小企业':
+            enterprise = [enter for enter in enterprise if enter.tbe == '1']
+        if qualificat == '规模以上企业':
+            enterprise = [enter for enter in enterprise if enter.scale == '1']
+        if qualificat == '山西100强企业':
+            enterprise = [enter for enter in enterprise if enter.sxonhun == '1']
+        if qualificat == '限额以上服务业企业':
+            enterprise = [enter for enter in enterprise if enter.serve == '1']
+        if qualificat == '专利企业':
+            enterprise = [enter for enter in enterprise if enter.patent == '1']
+
+        company1 = sorted(enterprise, key=lambda x: x.hots, reverse=True)  # 排序
         enterprise_obj_list = company1[(page - 1) * perpage:page * perpage]  # 分页
         enterprise_obj_list = company1[(page - 1) * perpage:page * perpage]  # 分页
-        else:
-            size = enterprise.count()
-            enterprise_obj_list = enterprise.order_by(Enterprise.hots.desc()).paginate(page, perpage).items
 
 
         df = [{"id": i.id,
         df = [{"id": i.id,
                "company_name": i.company_name,
                "company_name": i.company_name,
@@ -542,13 +565,15 @@ def attract_enterprise():
                    "专利企业" if i.patent == '1' else ''
                    "专利企业" if i.patent == '1' else ''
                ]))
                ]))
                } for i in enterprise_obj_list]
                } for i in enterprise_obj_list]
+        size = len(enterprise_obj_list)
         data = {"size": size, "df": df}
         data = {"size": size, "df": df}
     except Exception as e:
     except Exception as e:
         current_app.logger.error(e)
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
     # redis缓存
     # redis缓存
     try:
     try:
-        redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
+        pass
+        # redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
     except:
     except:
         return jsonify(code=RET.DBERR, msg="redis保存失败！")
         return jsonify(code=RET.DBERR, msg="redis保存失败！")
     return jsonify(code=RET.OK, msg="获取成功", data=data)
     return jsonify(code=RET.OK, msg="获取成功", data=data)