添加uidset/updateSet

Controller/EquipmentManagerV3.py

@@ -193,7 +193,7 @@ class EquipmentManagerV3(View):
                 dvql = dvqs.values('id', 'userID', 'NickName', 'UID', 'View_Account',
                            'View_Password', 'ChannelIndex', 'Type', 'isShare',
                            'primaryUserID', 'primaryMaster', 'data_joined',
-                           'version',
+                           'version', 'deviceModel',
                            'isVod', 'isExist', 'NotificationMode', 'OutdoorModel',
                            'WIFIName', 'isDetector', 'DetectorRank', 'MirrorType',
                            'RecordType', 'TimeZone', 'SpaceUsable', 'SpaceSum')

Controller/UidSetController.py

@@ -80,6 +80,8 @@ class UidSetView(View):
             return self.do_admin_update(request_dict, userID, response)
         elif operation == 'update':
             return self.do_update(request_dict, response)
+        elif operation == 'updateSet':
+            return self.do_update_set(request_dict, response)
         else:
             return response.json(444, 'error path')
 
@@ -312,3 +314,26 @@ class UidSetView(View):
         except Exception:
             errorInfo = traceback.format_exc()
             return response.json(500, {'details': errorInfo})
+
+    def do_update_set(self, request_dict, response):
+        uid = request_dict.get('uid', None)
+        deviceContent = request_dict.get('content', None)
+        token = request_dict.get('token', None)
+        print(deviceContent)
+        if not deviceContent or not uid:
+            return response.json(444, 'content,uid')
+        tko = TokenObject(token)
+        response.lang = tko.lang
+        if tko.code != 0:
+            return response.json(tko.code)
+        userID = tko.userID
+        if userID is None:
+            return response.json(309)
+        try:
+            deviceData = json.loads(deviceContent)
+            uid_set_qs = UidSetModel.objects.filter(uid=uid)
+            uid_set_qs.update(**deviceData)
+        except Exception as e:
+            return response.json(177, repr(e))
+        else:
+            return response.json(0)

Model/models.py

@@ -242,6 +242,7 @@ class Device_Info(models.Model):
     RecordType = models.IntegerField(blank=True, default=0, verbose_name=u'录像模式(0:关闭,1:全是录像,3:报警录像)')
     OutdoorModel = models.IntegerField(blank=True, default=0, verbose_name=u'室外模式 0：关闭，1：开启')
     TimeZone = models.CharField(blank=True, max_length=50, default='', verbose_name=u'时区')
+    deviceModel = models.CharField(blank=True, max_length=50, default='', verbose_name=u'设备型号')
     isVod = models.SmallIntegerField(blank=True, default=0, verbose_name='是否支持云存')  # 是否支持云存设备
     isExist = models.SmallIntegerField(blank=True, default=1, verbose_name='是否被删除')  # 是否被删除了(需主用户交互) 1存在，0不存在，2设备被重置
     ###