Browse Source

update dict

chenjunkai 6 years ago
parent
commit
66f6a8015c
2 changed files with 10 additions and 1 deletions
  1. 5 0
      Controller/DetectController.py
  2. 5 1
      Controller/EquipmentManager.py

+ 5 - 0
Controller/DetectController.py

@@ -194,6 +194,11 @@ class DetectControllerView(View):
                     var_dump(uid_set_qs)
                     var_dump('==========================')
                 else:
+                    update_dict = {
+                        'updTime': nowTime,
+                        'detect_status': status,
+                    }
+                    uid_set_qs.update(**update_dict)
                     uid_set_id = uid_set_qs[0].id
                 uid_push_create_dict = {
                     'uid_set_id': uid_set_id,

+ 5 - 1
Controller/EquipmentManager.py

@@ -569,7 +569,11 @@ def deleteInterface(request):
                 # a.主用户删除设备
                 dv_qs.delete()
                 # 删除设备影子信息uid_set   外键关联删除设备推送配置信息 uid_push
-                UidSetModel.objects.filter(uid=uid).delete()
+                up_qs = UidPushModel.objects.filter(uid=uid)
+                if up_qs.count > 1:
+                    UidPushModel.objects.filter(uid=uid, userID_id=userID).delete()
+                else:
+                    UidSetModel.objects.filter(uid=uid).delete()
                 # b.分享获得用户假删除
                 ud_dv_qs = Device_Info.objects.filter(UID=uid, isShare=True, primaryUserID=userID)
                 if ud_dv_qs.exists():