account/models.py

@@ -5,6 +5,8 @@ from django.utils.translation import ugettext_lazy as _

                 from django_models_ext import BaseModelMixin, SexModelMixin
              

                 from shortuuidfield import ShortUUIDField
              

                 
              

                +from equipment.models import IsolationPointUserInfo
              

                +
              

                 
              

                 class UserInfo(BaseModelMixin):
              

                     UNVERIFIED = 0
              
@@ -49,6 +51,11 @@ class UserInfo(BaseModelMixin):

                 
              

                     @property
              

                     def data(self):
              

                +        try:
              

                +            user = IsolationPointUserInfo.objects.get(user_id=self.user_id, status=True).userdata
              

                +        except:
              

                +            user = {}
              

                +
              

                         return {
              

                             'user_id': self.user_id,
              

                             'unionid': self.unionid,
              
@@ -63,6 +70,7 @@ class UserInfo(BaseModelMixin):

                             'province': self.province,
              

                             'city': self.city,
              

                             'user_status': self.user_status,
              

                +            'point_info': user
              

                         }
              

                 
              

                 
              

equipment/models.py

@@ -186,6 +186,14 @@ class IsolationPointUserInfo(BaseModelMixin):

                             'remark': self.remark or '',
              

                         }
              

                 
              

                +    @property
              

                +    def userdata(self):
              

                +        return {
              

                +           'point_id': self.point_id,
              

                +           'user_id': self.user_id,
              

                +           **{ field.get('key', ''): field.get('value', '') for field in self.fields }
              

                +        }
              

                +
              

                 
              

                 class ThermometerEquipmentInfo(BaseModelMixin):
              

                     ONLINE = 1