fix20230223

apps/models.py

@@ -1066,7 +1066,9 @@ class User(BaseModel, db.Model):
     # 用户收藏厂房
     carrier_factory = db.relationship("CarrierFactory", secondary="user_factory", backref=db.backref("bfactory"))
     # 用户收藏园区
-    # industry_zone = db.relationship("Induzone", secondary="user_zone", backref=db.backref("bzone"))
+    industry_zone = db.relationship("Induzone", secondary="user_zone", backref=db.backref("bzone"))
+    # 用户收藏重点项目
+    project = db.relationship("Project", secondary="user_project", backref=db.backref("bproject"))
 
     @property
     def password(self):
@@ -1566,6 +1568,20 @@ class UserFactory(BaseModel, db.Model):
     factory_id = db.Column(db.Integer, db.ForeignKey("carrier_factory.id"), primary_key=True)
 
 
+# 小程序用户收藏园区，多-多
+class UserZone(BaseModel, db.Model):
+    __tablename__ = "user_zone"
+    user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
+    factory_id = db.Column(db.Integer, db.ForeignKey("induzone.id"), primary_key=True)
+
+
+# 小程序用户收藏重点项目，多-多
+class UserProject(BaseModel, db.Model):
+    __tablename__ = "user_project"
+    user_id = db.Column(db.Integer, db.ForeignKey("user.id"), primary_key=True)
+    factory_id = db.Column(db.Integer, db.ForeignKey("project.id"), primary_key=True)
+
+
 # 产业载体-土地数据
 class CarrierLand(db.Model):
     __tablename_ = "carrier_land"

apps/view_radar/view.py

@@ -1166,6 +1166,11 @@ def newList1():
     perpage = req_dict.get("perpage")
     name = req_dict.get("name")
 
+    name_query = "enterList" + str(inid) + str("".join(area)) + str(product) + str(select) + name
+    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 not all([inid, select, page, perpage]):
         return jsonify(code=RET.PARAMERR, msg="参数错误")
 
@@ -1226,6 +1231,8 @@ def newList1():
 
         data = {"remind": remind, "enter": enter, "size": size}
 
+        # redis缓存
+        redis_store.setex(name_query, 30 * 24 * 3600, json.dumps(data))
         return jsonify(code=RET.OK, msg="查找成功", data=data)
     except Exception as e:
         current_app.logger.error(e)

apps/view_xiaocx/view.py

@@ -490,28 +490,109 @@ def reply_consultation():
 # @login_required
 def collection_carrier():
     req_dict = request.get_json()
-    _id = req_dict.get("id")
+    id_list = req_dict.get("id_list")
     flag = req_dict.get("flag")  # 1地块，2楼宇，3厂房，4园区，5项目，6企业
     token = request.headers["token"]
-
     user_obj = verify_token(token)
-    if flag == 1:
-        user_obj.carrier_land.append(_id)
-    elif flag == 2:
-        user_obj.carrier_build.append(_id)
-    elif flag == 3:
-        user_obj.carrier_factory.append(_id)
-    elif flag == 4:
-        user_obj.carrier_factory.append(_id)
-    elif flag == 5:
-        user_obj.carrier_build.append(_id)
-    elif flag == 6:
-        user_obj.carrier_build.append(_id)
-    else:
-        pass
+
+    try:
+        for _id in id_list:
+            if flag == 1:
+                user_obj.user_land.append(_id)
+            elif flag == 2:
+                user_obj.user_build.append(_id)
+            elif flag == 3:
+                user_obj.user_factory.append(_id)
+            elif flag == 4:
+                user_obj.user_zone.append(_id)
+            elif flag == 5:
+                user_obj.user_project.append(_id)
+            elif flag == 6:
+                user_obj.user_company.append(_id)
+            else:
+                pass
+        user_obj.commit()
+        return jsonify(code=RET.OK, msg='收藏成功。')
+    except Exception as e:
+        return jsonify(code=RET.DBERR, msg='收藏失败。')
 
 
+# 收藏列表
+@api_xiaocx.route('/CollectionList', methods=['POST'])
+# @login_required
+def collection_list():
+    req_dict = request.get_json()
+    flag = req_dict.get("flag")  # 1地块，2楼宇，3厂房，4园区，5项目，6企业
+    token = request.headers["token"]
 
+    try:
+        user_obj = verify_token(token)
+
+        if flag == 1:
+            obj_list = user_obj.user_land
+            data = [{
+                "id": obj.id,
+                "name": obj.land_name,
+                "district": obj.district_name,
+                "nature": obj.land_nature,
+                "area": obj.total_area,
+                "lng": obj.lng,
+                "lat": obj.lat,
+            } for obj in obj_list]
+        elif flag == 2:
+            obj_list = user_obj.user_build
+            data = [{
+                "id": obj.id,
+                "name": obj.build_name,
+                "district": obj.district_name,
+                "rent": obj.rent_money,
+                "area": obj.build_area,
+                "lng": obj.lng,
+                "lat": obj.lat,
+            } for obj in obj_list]
+        elif flag == 3:
+            obj_list = user_obj.user_factory
+            data = [{
+                "id": obj.id,
+                "name": obj.factory_name,
+                "district": obj.district_name,
+                "attract_industry": obj.attract_status,
+                "area": obj.factory_area,
+                "lng": obj.lng,
+                "lat": obj.lat,
+            } for obj in obj_list]
+        elif flag == 4:
+            obj_list = user_obj.user_zone
+            data = [{
+                "id": obj.id,
+                "name": obj.name,
+                "phone": obj.phone,
+                "industry_position": obj.industry_position,
+                "district": obj.district,
+                "lng": obj.lng,
+                "lat": obj.lat,
+            } for obj in obj_list]
+        elif flag == 5:
+            obj_list = user_obj.user_project
+            data = [{
+                "id": obj.id,
+                "name": obj.name,
+                "district": obj.district,
+                "money": obj.money,
+                "attract_industry": obj.attract_industry,
+                # "lng": obj.lng,
+                # "lat": obj.lat,
+            } for obj in obj_list]
+        elif flag == 6:
+            obj_list = user_obj.user_company
+            data = [{
+
+            } for obj in obj_list]
+        else:
+            pass
+        return jsonify(code=RET.OK, data=data, msg='查询成功。')
+    except Exception as e:
+        return jsonify(code=RET.DBERR, msg='查询失败。')
 
 
 
@@ -530,8 +611,8 @@ def wechat_login():
     if not all([code]):
         return jsonify(code=RET.PARAMERR, msg="参数不完整")
 
-    app_id = 'wx1c081c352a9de7d9'
-    app_secret = '5d0976f00a0f068deffa40d6a9383655'
+    app_id = 'wx67c0a99d684274f8'
+    app_secret = 'd89755bb5d2d3f85e97d0f08c30dbebc'
 
     # url = u'https://api.weixin.qq.com/sns/oauth2/access_token'
     url = u'https://api.weixin.qq.com/sns/jscode2session'