fix20221210

apps/view_choose/view.py

@@ -8,7 +8,7 @@ from apps.view_choose import api_address
 from apps.util import verify_token
 from apps.util import verify_token
 
 
 
 
-#  获取某个行政区的全部园区信息
+#  获取晋城市全部园区信息
 @api_address.route("/DefaultAddress", methods=["POST"])
 @api_address.route("/DefaultAddress", methods=["POST"])
 def default_address():
 def default_address():
     req_dict = request.get_json()
     req_dict = request.get_json()
@@ -46,14 +46,14 @@ def default_address():
                           "jwd": {"lng": i.lng, "lat": i.lat}} for i in result], "all_jwd": all_jwd, "size": size}
                           "jwd": {"lng": i.lng, "lat": i.lat}} for i in result], "all_jwd": all_jwd, "size": size}
         if not result:
         if not result:
             # 在第一条建议显示
             # 在第一条建议显示
-            data = [{"name": "没有找到合适的园区！"}]
+            data = [{"name": "没有找到合适的载体！"}]
         return jsonify(code=RET.OK, msg="选址成功", data=data)
         return jsonify(code=RET.OK, msg="选址成功", data=data)
     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="数据库错误")
 
 
 
 
-# 选址评估，选择建议
+# 选址评估条件筛选
 @api_address.route("/ChooseAddress", methods=["POST"])
 @api_address.route("/ChooseAddress", methods=["POST"])
 def advice():
 def advice():
     req_dict = request.get_json()
     req_dict = request.get_json()
@@ -71,21 +71,25 @@ def advice():
     # if not all([industry_id, product, budget, preference]):
     # if not all([industry_id, product, budget, preference]):
     #     return jsonify(code=RET.DATAERR, msg="数据不全")
     #     return jsonify(code=RET.DATAERR, msg="数据不全")
     try:
     try:
-        indu = Industry.query.filter_by(nid=industry_id).first()
-        if not indu:
-            return jsonify(code=RET.DATAERR, msg="参数错误")
-        # 获取产业名称
-        industry_name = indu.oname
+        # indu = Industry.query.filter_by(nid=industry_id).first()
+        # if not indu:
+        #     return jsonify(code=RET.DATAERR, msg="参数错误")
+        # # 获取产业名称
+        # industry_name = indu.oname
         # 根据产业名称查询园区
         # 根据产业名称查询园区
-        zone = Induzone.query.filter(or_(Induzone.navigat.like("%{}%".format(industry_name)),
-                                         Induzone.navigator.like("%{}%".format(industry_name))))
+        # zone = Induzone.query.filter(or_(Induzone.navigat.like("%{}%".format(industry_name)),
+        #                                  Induzone.navigator.like("%{}%".format(industry_name))))
+        zone = Induzone.query.filter(Induzone.district == 'address')
+
         print(zone.all())
         print(zone.all())
         # 根据投资预算过滤
         # 根据投资预算过滤
         if budget:
         if budget:
             zone = zone.filter(Induzone.invest_power < float(budget))
             zone = zone.filter(Induzone.invest_power < float(budget))
         if address and address == '晋城市':  # 如果有选址
         if address and address == '晋城市':  # 如果有选址
             # zone = zone.filter(or_(Induzone.upper_district == address, Induzone.development_zone == address))
             # zone = zone.filter(or_(Induzone.upper_district == address, Induzone.development_zone == address))
-            zone = zone.filter(Induzone.upper_district == address, Induzone.cate == "产业园区")
+            # zone = zone.filter(Induzone.upper_district == address, Induzone.cate == "产业园区")
+            zone = zone.filter(Induzone.cate == "产业园区")
+
         if address and address != '晋城市':  # 如果有选址
         if address and address != '晋城市':  # 如果有选址
             # zone = zone.filter(or_(Induzone.region == address, Induzone.development_zone == address))
             # zone = zone.filter(or_(Induzone.region == address, Induzone.development_zone == address))
             zone = zone.filter(Induzone.region == address, Induzone.cate == "产业园区")
             zone = zone.filter(Induzone.region == address, Induzone.cate == "产业园区")