feature:

1，增加设备分享，查询用户，删除用户设备

Controller/DeviceShare.py

@@ -14,7 +14,7 @@
 
 from django.views.generic.base import View
 
-from Model.models import Device_Info,Device_User
+from Model.models import Device_Info, Device_User
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from Ansjer.config import SERVER_DOMAIN
@@ -44,11 +44,11 @@ class DeviceShareView(View):
                 if operation == 'generateTokenUrl':
                     return self.do_generate_token_url(userID, request_dict, response)
                 elif operation == 'confirm':
-                    return self.do_confirm(userID,request_dict,response)
-                elif operation == 'queryEq':
-                    return self.do_query_eq(userID, request_dict, response)
-                elif operation == 'deleteEq':
-                    return self.do_delete_eq(userID, request_dict, response)
+                    return self.do_confirm(userID, request_dict, response)
+                elif operation == 'queryUser':
+                    return self.do_query_user(userID, request_dict, response)
+                elif operation == 'deleteUser':
+                    return self.do_delete_user(userID, request_dict, response)
 
                 else:
                     return response.json(414)
@@ -69,7 +69,6 @@ class DeviceShareView(View):
         else:
             return response.json(173)
 
-
     def do_confirm(self, userID, request_dict, response):
         shareToken = request_dict.get('shareToken', None)
         if shareToken is not None:
@@ -107,50 +106,43 @@ class DeviceShareView(View):
         else:
             return response.json(444, {'param': 'shareToken'})
 
+    # 1,这个用户的分享出去的设备
+    # 2,获得上面个的设备拥有者
     #  http://192.168.136.39:8000/deviceShare/queryEq?token=XXX&UID=jLBDSU9547NTRSMF111A
-    def do_query_eq(self, userID, request_dict, response):
+    def do_query_user(self, userID, request_dict, response):
         UID = request_dict.get('UID', None)
         if UID is not None:
-            qs = Device_Info.objects.filter(UID=UID, userID_id=userID, isShare=True)
-            if not qs.exists():
-                print ('没有数据')
-                return response.json(0)
-            else:
-                send_json = CommonService.qs_to_dict(qs)
-                print (send_json)
-                return response.json(0, send_json)
-
+            # 查询分享获得的用户
+            qs = Device_Info.objects.filter(UID=UID, isShare=True, primaryUserID=userID). \
+                values('userID__NickName',
+                       'userID__username',
+                       'userID__userEmail',
+                       'userID__phone',
+                       'id')
+            data = []
+            for q in qs:
+                d = {'id': q['id']}
+                if not q['userID_NickName']:
+                    d['user'] = q['userID_NickName']
+                elif not q['userID__username']:
+                    d['user'] = q['userID__username']
+                elif not q['userID__userEmail']:
+                    d['user'] = q['userID__userEmail']
+                elif not q['userID__phone']:
+                    d['user'] = q['userID__phone']
+                data.append(d)
+            return response.json(0, data)
         else:
             return response.json(444, {'param': 'UID'})
 
-    #  http://192.168.136.39:8000/deviceShare/deleteEq?token=eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJ1c2VySUQiOiIxNTQzOTA5MDUwNDEzMTM4MDAxMzgwMDAiLCJsYW5nIjoiY24iLCJ1c2VyIjoiMTM4MDAxMzgwMDEiLCJleHAiOjE1NTIzNzc1NjN9.krA4C-TnTMuFQW1SBCuXQ8ZNLMB3cOD8z2W03agKvRY&id=138001380001546932860064934
-    def do_delete_eq(self, userID, request_dict, response):
+    def do_delete_user(self, userID, request_dict, response):
         id = request_dict.get('id', None)
         if id:
-            qs=Device_Info.objects.filter(id=id, userID_id=userID)
-            print (qs)
-            if qs.exists():
-                send_json = CommonService.qs_to_dict(qs)
-                print (len(send_json.get('datas'))>0)
-                if (len(send_json.get('datas'))>0):
-                    if send_json.get('datas')[0].get('fields').get('isShare') == True:
-                        print ('没有子设备')
-                        # 删除的需要传token值，id,---添加的设备是别人分享的情况可以用下面的删除方法
-                        # Device_Info.objects.filter(id=id,userID_id=userID).delete()
-                        return response.json(0, '本设备已经成功删除')
-                    else:
-                        print ('有子设备需要一个一个的删除掉')
-                        user_equipment_all = Device_Info.objects.filter(UID=send_json.get('datas')[0].get('fields').get('UID'))
-                        send_jsons = CommonService.qs_to_dict(user_equipment_all)
-                        for k, v in enumerate(send_jsons["datas"]):
-                            print (v['pk'])
-                            # 删除的需要传token值，id,---添加的设备是别人分享的情况可以用下面的删除方法
-                            # Device_Info.objects.filter(id=v['pk']).delete()
-                        return response.json(0, '多个已经成功删除')
+            try:
+                Device_Info.objects.filter(id=id, primaryUserID=userID).delete()
+            except Exception as e:
+                return response.json(10, repr(e))
             else:
-                return response.json(0,'该用户没有该设备')
-
-
-            return response.json(0)
+                return response.json(0)
         else:
-            return response.json(444, 'id must list')
+            return response.json(444, 'id')