fix20230403

apps/view_radar/view.py

@@ -280,7 +280,7 @@ def prolink():
     page = req_dict.get("page")  # page
     perpage = req_dict.get("perpage")  # perpage
 
-    data = redis_store.get('three_link_{}_{}'.format(inid, link_type))
+    data = redis_store.get('three_link_{}_{}_{}'.format(inid, link_type, page))
     if data:
         return jsonify(code=RET.OK, msg="获取成功", data=json.loads(data))
 
@@ -324,10 +324,7 @@ def prolink():
             df2 = []
 
             # 按照企业数量排序
-            for name in result_bylink:
-                # company_count = Enterprise.query.filter(Enterprise.city != '晋城市',
-                #                                  Enterprise.product_all.like("%{}%".format(name))).count()
-                # for name in result_bylink:
+            for name in result_bylink[0:13]:
                 company_count = Enterprise.query.filter(Enterprise.city != '晋城市').filter(or_(
                     Enterprise.product_all.like("%{}%".format(name)),
                     Enterprise.product_all1.like("%{}%".format(name)),
@@ -339,7 +336,7 @@ def prolink():
             data = {"df": df2, "size": res}
 
             try:
-                redis_store.setex("three_link_%s_%s" % (inid, link_type), 30 * 24 * 3600, json.dumps(data))
+                redis_store.setex("three_link_%s_%s_%s" % (inid, link_type, page), 30 * 24 * 3600, json.dumps(data))
             except Exception as e:
                 current_app.logger.error(e)
                 return jsonify(code=RET.DBERR, msg="保存产业/企业数量信息异常")