fix202302017

apps/__init__.py

@@ -34,7 +34,6 @@ logging.getLogger().addHandler(stream_log_handler)
 logging.basicConfig(level=logging.INFO)  # 调试debug级，会受flask的debug=True影响，强制忽略设置的等级
 logging.basicConfig(level=logging.INFO)  # 调试debug级，会受flask的debug=True影响，强制忽略设置的等级
 
 
 
 
-
 # 跨域支持
 # 跨域支持
 def after_request(resp):
 def after_request(resp):
     resp.headers['Access-Control-Allow-Origin'] = '*'
     resp.headers['Access-Control-Allow-Origin'] = '*'

apps/view_map/view.py

@@ -391,7 +391,6 @@ def attract_enterprise():
     page = req_dict.get("page")  # 分页页码
     page = req_dict.get("page")  # 分页页码
     perpage = req_dict.get("perpage")  # 分页大小
     perpage = req_dict.get("perpage")  # 分页大小
 
 
-
     name_query = "AttractEnterprise" + str(inid) + province + city + district + product
     name_query = "AttractEnterprise" + str(inid) + province + city + district + product
     if redis_store.get(name_query) is not None:
     if redis_store.get(name_query) is not None:
         data = json.loads(redis_store.get(name_query))
         data = json.loads(redis_store.get(name_query))

apps/view_radar/view.py

@@ -275,11 +275,6 @@ def prolink():
     '''雷达监测页企业属性分布统计'''
     '''雷达监测页企业属性分布统计'''
     req_dict = request.get_json()
     req_dict = request.get_json()
     inid = req_dict.get("inid")  # 行业id
     inid = req_dict.get("inid")  # 行业id
-    # area = req_dict.get("area")  # [省，市，区]
-    # province = area[0]
-    # city = area[1]
-    # district = area[2]
-
     link_type = req_dict.get("link_type")  # 缺失环节1，薄弱环节2，优势环节3
     link_type = req_dict.get("link_type")  # 缺失环节1，薄弱环节2，优势环节3
     page = req_dict.get("page")  # page
     page = req_dict.get("page")  # page
     perpage = req_dict.get("perpage")  # perpage
     perpage = req_dict.get("perpage")  # perpage
@@ -331,25 +326,23 @@ def prolink():
             for name in result_bylink:
             for name in result_bylink:
                 # company_count = Enterprise.query.filter(Enterprise.city != '晋城市',
                 # company_count = Enterprise.query.filter(Enterprise.city != '晋城市',
                 #                                  Enterprise.product_all.like("%{}%".format(name))).count()
                 #                                  Enterprise.product_all.like("%{}%".format(name))).count()
-                for name in result_bylink:
-                    company_count = Enterprise.query.filter(Enterprise.city != '晋城市').filter(or_(
-                        Enterprise.product_all.like("%{}%".format(name)),
-                        Enterprise.product_all1.like("%{}%".format(name)),
-                        Enterprise.product_all2.like("%{}%".format(name))
-                    )).count()
+                # for name in result_bylink:
+                company_count = Enterprise.query.filter(Enterprise.city != '晋城市').filter(or_(
+                    Enterprise.product_all.like("%{}%".format(name)),
+                    Enterprise.product_all1.like("%{}%".format(name)),
+                    Enterprise.product_all2.like("%{}%".format(name))
+                )).count()
                 df2.append({'name': name, 'company_count': company_count})
                 df2.append({'name': name, 'company_count': company_count})
             df2.sort(key=lambda s: s['company_count'], reverse=True)
             df2.sort(key=lambda s: s['company_count'], reverse=True)
             df2 = df2[(page - 1) * perpage:page * perpage]
             df2 = df2[(page - 1) * perpage:page * perpage]
-
             data = {"df": df2, "size": res}
             data = {"df": df2, "size": res}
+
             try:
             try:
-                redis_store.setex("three_link_%s_%s" % (inid, link_type), 30 * 24 * 3600,
-                                  json.dumps(data))
-                # 保存发送给这个手机号的记录，防止用户在60s内再次出发发送短信的操作
-                # redis_store.setex("send_sms_code_%s" % mobile, constants.SEND_SMS_CODE_INTERVAL, 1)
+                redis_store.setex("three_link_%s_%s" % (inid, link_type), 30 * 24 * 3600, json.dumps(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="保存产业/企业数量信息异常")
+
             return jsonify(code=RET.OK, msg="获取成功", data=data)
             return jsonify(code=RET.OK, msg="获取成功", data=data)
         else:
         else:
             data = []
             data = []