fix20221209

apps/view_atlas/view.py

@@ -151,6 +151,7 @@ def find_up_thr1(industry_type, industry_id):
 
 
         pname_one = it
         pname_one = it
         chain_name = pname_one["chain_name"]
         chain_name = pname_one["chain_name"]
+        c_type = Industry
         company_count = get_count(chain_name)
         company_count = get_count(chain_name)
         # 一级
         # 一级
         node_one = {
         node_one = {
@@ -895,11 +896,12 @@ def industry_enterprise():
 
 
     try:
     try:
         company = Company.query.filter(
         company = Company.query.filter(
-            Company.c_type == inid,
+            # Company.c_type == inid,
             Company.city == "晋城市",
             Company.city == "晋城市",
             Company.entype == entype if entype else text(''),
             Company.entype == 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.status == status if status else text('')
+        )
         if industry_level == 1 and product:
         if industry_level == 1 and product:
             company = company.filter(Company.c_name.like("%{}%".format(product)))
             company = company.filter(Company.c_name.like("%{}%".format(product)))
 
 

apps/view_radar/view.py

@@ -1052,10 +1052,10 @@ def radar_enums():
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
 
     try:
     try:
-        name_query = "radar" + str(inid) + str("".join(area)) + str(product)
-        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)
+        # name_query = "radar" + str(inid) + str("".join(area)) + str(product)
+        # 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)
 
 
         if inid:
         if inid:
             enterprise = Enterprise.query.filter_by(c_type=inid)
             enterprise = Enterprise.query.filter_by(c_type=inid)
@@ -1095,10 +1095,10 @@ def radar_enums():
                 "nums_financ": float(nums_financ), "nums_unicorn": float(nums_unicorn),  # "info": info
                 "nums_financ": float(nums_financ), "nums_unicorn": float(nums_unicorn),  # "info": info
                 }
                 }
         # redis缓存
         # redis缓存
-        redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
+        # redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
         # redis_store.set(name_query, json.dumps(data))
         # redis_store.set(name_query, json.dumps(data))
         # redis_store.expire(name_query, 30 * 24 * 3600)
         # redis_store.expire(name_query, 30 * 24 * 3600)
-        print("redis")
+        # print("redis")
 
 
         return jsonify(code=RET.OK, msg="获取成功", data=data)
         return jsonify(code=RET.OK, msg="获取成功", data=data)
     except Exception as e:
     except Exception as e: