fix20230406

apps/view_atlas/view.py

@@ -654,13 +654,15 @@ def industry_policy():
     try:
         indu_policy = ''
         size = ''
-        name = IndustryChain.query.filter_by(id=inid).first().industry_name  # 获取导航对应的真名
+        name = ''
+        if inid:
+            name = IndustryChain.query.filter_by(id=inid).first().industry_name  # 获取导航对应的真名
         # name = '煤层气'
         # print(name)
         if industry_level == 1:
             if policy_level == 1:  # 国家级
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "国家级",
 
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
@@ -672,7 +674,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 2:  # 省级
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "省级",
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -682,7 +684,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 3:  # 市级
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "市级",
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -692,7 +694,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 4:  # 区县
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "区县",
                     InduPolicy.district == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -702,7 +704,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 5:  # 开发区
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "开发区",
                     InduPolicy.district == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -712,7 +714,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             else:
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     # InduPolicy.level == "国家级",
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
                     # InduPolicy.district == policy_type if policy_type != '全部' else text(''),
@@ -726,7 +728,7 @@ def industry_policy():
         if industry_level == 2:
             if policy_level == 1:  # 国家级
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "国家级",
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -736,7 +738,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 2:  # 省级
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "省级",
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -746,7 +748,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 3:  # 市级
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "市级",
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -756,7 +758,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 4:  # 区县
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "区县",
                     InduPolicy.district == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -766,7 +768,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             elif policy_level == 5:  # 开发区
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     InduPolicy.level == "开发区",
                     InduPolicy.district == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),
@@ -776,7 +778,7 @@ def industry_policy():
                 indu_policy = indu_policy.order_by(InduPolicy.pubdate.desc()).paginate(page, perpage).items
             else:
                 indu_policy = InduPolicy.query.filter(
-                    InduPolicy.navigat.like("%{}%".format(name)),
+                    InduPolicy.navigat.like("%{}%".format(name)) if name else text(''),
                     # InduPolicy.level == "国家级",
                     InduPolicy.org == policy_type if policy_type != '全部' else text(''),
                     InduPolicy.year == policy_year if policy_year else text(''),

apps/view_choose/choose_view.py

@@ -81,6 +81,7 @@ def global_region(industry_id, preference, key_words, district_name, page, per_p
                 "detail_address": region_obj.address,  # 审核信息
                 "industry_name": region_obj.navigat,
                 "district_name": region_obj.region,
+                "price_url": region_obj.image,
                 "lng": region_obj.lng,
                 "lat": region_obj.lat
             } for region_obj in region_obj_list]
@@ -130,10 +131,8 @@ def global_land(key_words, district_name, land_name, land_nature, industry_name,
                 "land_name": land_obj.land_name,
                 "land_nature": land_obj.land_nature,
                 "total_area": land_obj.total_area,
-                # "jing_area": land_obj.jing_area,  # 审核信息
                 "district_name": land_obj.district_name,
-                # "industry_name": land_obj.industry_name,
-                # "attract_status": land_obj.attract_status,
+                "price_url": land_obj.price_url,
                 "lng": land_obj.lng,
                 "lat": land_obj.lat
             } for land_obj in land_obj_list]
@@ -185,6 +184,7 @@ def global_factory(key_words, district_name, factory_name, industry_name, page,
                 "industry_name": factory_obj.attract_status,
                 "is_standard": factory_obj.is_standard,
                 "attract_status": factory_obj.attract_status,
+                "price_url": factory_obj.price_url,
                 "lng": factory_obj.lng,
                 "lat": factory_obj.lat
             } for factory_obj in factory_obj_list]
@@ -240,6 +240,7 @@ def global_build(key_words, district_name, build_name, industry_name, build_type
                 "build_type": build_obj.build_type,
                 "attract_status": build_obj.attract_status,
                 "rent_money": build_obj.rent_money,
+                "price_url": build_obj.price_url,
                 "lng": build_obj.lng,
                 "lat": build_obj.lat
             } for build_obj in build_obj_list]

apps/view_index/view.py

@@ -91,7 +91,7 @@ def data_notification():
                 data_dic = {
                     "content_name": content_name,
                     "content_url": content_url_list[i].replace('./', 'http://zsj.jcgov.gov.cn/sjtb/sjtb/'),
-                    "time": time_list[i]
+                    "time": time_list[i][1:-1]
                 }
                 data_list.append(data_dic)
                 i += 1
@@ -101,16 +101,23 @@ def data_notification():
             current_app.logger.error(e)
             return jsonify(code=RET.DBERR, msg="数据库错误")
 
-    # # 存入数据库
-    # inform_obj = InvestmentInformation()
-    # for data in data_list:
-    #     inform_obj.name = data['content_name']
-    #     inform_obj.flag = 1
-    #     inform_obj.time = data['time']
-    #     inform_obj.source = data['']
-    #     inform_obj.info = data['']
-    #     db.session.add(inform_obj)
-    #     db.session.commit()
+    # 存入数据库
+    for data in data_list:
+        content_name = data['content_name']
+        inform_obj = InvestmentInformation.query.filter_by(flag=2, name=content_name).first()
+        if inform_obj:
+            inform_obj.time = data['time']
+            inform_obj.source = '晋城市投资促进中心'
+            db.session.commit()
+            continue
+        inform_obj = InvestmentInformation()
+        inform_obj.name = data['content_name']
+        inform_obj.flag = 2
+        inform_obj.time = data['time']
+        inform_obj.source = '晋城市投资促进中心'
+        inform_obj.info = ''
+        db.session.add(inform_obj)
+        db.session.commit()
     return jsonify(code=RET.OK, msg="获取成功", data=data_list)
 
 
@@ -169,9 +176,13 @@ def work_trend():
 
     # # 存入数据库
     for data in data_list:
+        content_name = data['content_name']
+        inform_obj = InvestmentInformation.query.filter_by(flag=1, name=content_name).first()
+        if inform_obj:
+            continue
         inform_obj = InvestmentInformation()
         inform_obj.name = data['content_name']
-        inform_obj.flag = 2
+        inform_obj.flag = 1
         inform_obj.time = data['time']
         inform_obj.source = '晋城市投资促进中心'
         inform_obj.content = data['content_info']

apps/view_xiaocx/view.py

@@ -122,6 +122,7 @@ def index_search():
                 "district": land_obj.district_name,
                 "nature": land_obj.land_nature,
                 "area": land_obj.total_area,
+                "price_url": land_obj.price_url,
                 "lng": land_obj.lng,
                 "lat": land_obj.lat,
             } for land_obj in land_obj_list]
@@ -165,6 +166,7 @@ def index_search():
                 "rent": build_obj.rent_money,
                 "area": build_obj.build_area,
                 "attract_status": build_obj.attract_status,
+                "price_url": build_obj.price_url,
                 "lng": build_obj.lng,
                 "lat": build_obj.lat,
             } for build_obj in build_obj_list]
@@ -201,6 +203,7 @@ def index_search():
                 "district": factory_obj.district_name,
                 "attract_industry": factory_obj.attract_status,
                 "area": factory_obj.factory_area,
+                "price_url": factory_obj.price_url,
                 "lng": factory_obj.lng,
                 "lat": factory_obj.lat,
             } for factory_obj in factory_obj_list]
@@ -237,6 +240,7 @@ def index_search():
                 "phone": zone_obj.phone,
                 "industry_position": zone_obj.industry_position,
                 "district": zone_obj.district,
+                "price_url": zone_obj.image,
                 "lng": zone_obj.lng,
                 "lat": zone_obj.lat,
             } for zone_obj in zone_obj_list]
@@ -435,6 +439,7 @@ def company_detail():
     try:
         company_obj = Company.query.get(_id)
         data = {
+            "id": company_obj.id,
             "company_name": company_obj.company_name,
             "chain_master": '链主' if company_obj.chain_master == '1' else '',
             "district": company_obj.district,
@@ -859,8 +864,9 @@ def collection_list():
                 "district": obj.district_name,
                 "nature": obj.land_nature,
                 "area": obj.total_area,
+                "price_url": obj.price_url,
                 "lng": obj.lng,
-                "lat": obj.lat
+                "lat": obj.lat,
             } for obj in obj_list]
         elif name == 'build':
             obj_list = user_obj.carrier_build
@@ -870,6 +876,7 @@ def collection_list():
                 "district": obj.district_name,
                 "rent": obj.rent_money,
                 "area": obj.build_area,
+                "price_url": obj.price_url,
                 "lng": obj.lng,
                 "lat": obj.lat,
             } for obj in obj_list]
@@ -881,6 +888,7 @@ def collection_list():
                 "district": obj.district_name,
                 "attract_industry": obj.attract_status,
                 "area": obj.factory_area,
+                "price_url": obj.price_url,
                 "lng": obj.lng,
                 "lat": obj.lat,
             } for obj in obj_list]
@@ -892,6 +900,7 @@ def collection_list():
                 "phone": obj.phone,
                 "industry_position": obj.industry_position,
                 "district": obj.district,
+                "price_url": obj.image,
                 "lng": obj.lng,
                 "lat": obj.lat,
             } for obj in obj_list]
@@ -923,7 +932,8 @@ def collection_list():
                 "name": obj.name,
                 "post_num": obj.post_num,
                 "industry": obj.industry,
-                "pubdate": obj.pubdate.strftime("%Y-%m-%d")
+                "pubdate": obj.pubdate.strftime("%Y-%m-%d"),
+                "file": obj.file
             } for obj in obj_list]
         else:
             pass