瀏覽代碼

修改表名自定义sql更新语句,新增返回家庭成员名称与头像

zhangdongming 3 年之前
父節點
當前提交
7efcac23d3
共有 1 個文件被更改,包括 4 次插入2 次删除
  1. 4 2
      SensorGateway/EquipmentFamilyController.py

+ 4 - 2
SensorGateway/EquipmentFamilyController.py

@@ -272,7 +272,7 @@ class EquipmentFamilyView(View):
         sql = 'SELECT d.id,d.userID_id as userID,d.NickName,d.UID,d.View_Account,d.View_Password,d.ChannelIndex,' \
               'd.Type,d.isShare,d.primaryUserID,d.primaryMaster,d.data_joined,d.vodPrimaryUserID,d.vodPrimaryMaster, ' \
               'd.version,d.isVod,d.isExist,d.NotificationMode,d.isCameraOpenCloud,d.serial_number '
-        sql += 'FROM device_info d INNER JOIN loocam_family_room_device l ON d.id = l.device_id '
+        sql += 'FROM device_info d INNER JOIN family_room_device l ON d.id = l.device_id '
         sql += 'WHERE d.userID_id = %s AND d.isExist != %s '
         if family_id:
             sql += ' AND l.family_id = %s '
@@ -517,7 +517,7 @@ class EquipmentFamilyView(View):
 
                 family_member_qs = FamilyMember.objects.filter(user_id=user_id) \
                     .order_by('sort').values('identity', 'family_id', 'family__name', 'permission_id', 'permission__no',
-                                             'family__location')
+                                             'family__location', 'user__username', 'user__userIconUrl')
                 items = []
                 data = {}
                 for item in family_member_qs:
@@ -527,6 +527,8 @@ class EquipmentFamilyView(View):
                     data['permissionId'] = item['permission_id']
                     data['permissionNo'] = item['permission__no']
                     data['familyLocation'] = item['family__location']
+                    data['userName'] = item['user__username']
+                    data['userIconUrl'] = item['user__userIconUrl']
                     items.append(data)
                 return response.json(0, items)
         return response.json(309)