fix202302016

apps/view_radar/view.py

@@ -49,13 +49,17 @@ def tendency():
     #     return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
     try:
-        # name_query = "tendency" + str(inid) + str("".join(area)) + str(product) + str(sone) + str(select_time) + str(select_method)
-        # 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 = "tendency" + str(inid) + str(select_time) + str(select_method)
+        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:
-            enterprise = Enterprise.query.filter_by(c_type=inid)
+            enterprise = Enterprise.query.filter(or_(
+                Enterprise.c_type == inid,
+                Enterprise.c_type1 == inid,
+                Enterprise.c_type2 == inid
+            ))
         else:
             enterprise = Enterprise.query.filter_by()
 
@@ -159,16 +163,10 @@ def tendency():
                                                       "value": round(cnums, 2) if cnums else 0})
         else:
             return jsonify(code=RET.DATAERR, msg="参数错误")
-        # redis缓存
-        # redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
     except Exception as e:
         current_app.logger.error(e)
         return jsonify(code=RET.DBERR, msg="数据库查询错误")
 
-    # data_dic = {
-    #     "company_num": company_num_data.insert(0, company_num_name),
-    #     "register_capital": register_capital_data.insert(0, register_capital_name),
-    # }
     data_dic = {
         "company_num": company_num_data,
         "company_num_name": company_num_name,
@@ -177,6 +175,13 @@ def tendency():
         "register_capital_name": register_capital_name,
 
     }
+
+    # redis缓存
+    try:
+        redis_store.setex("tendency" + str(inid) + str(select_time) + str(select_method),
+                          30 * 24 * 3600, json.dumps(data_dic))
+    except:
+        return jsonify(code=RET.DBERR, msg="redis保存失败！", data=data_dic)
     return jsonify(code=RET.OK, msg="获取成功", data=data_dic)
 
 
@@ -280,6 +285,10 @@ def prolink():
     page = req_dict.get("page")  # page
     perpage = req_dict.get("perpage")  # perpage
 
+    data = redis_store.get('three_link_{}_{}'.format(inid, link_type))
+    if data:
+        return jsonify(code=RET.OK, msg="获取成功", data=json.loads(data))
+
     # 校验参数完整性
     if not all([inid, page, perpage]):
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
@@ -334,6 +343,14 @@ def prolink():
             df2 = df2[(page - 1) * perpage:page * perpage]
 
             data = {"df": df2, "size": res}
+            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)
+            except Exception as e:
+                current_app.logger.error(e)
+                return jsonify(code=RET.DBERR, msg="保存产业/企业数量信息异常")
             return jsonify(code=RET.OK, msg="获取成功", data=data)
         else:
             data = []