ts

Ansjer/test/oss.py

@@ -28,10 +28,8 @@ auth = Auth(accessid, accesskey)
 bucket = Bucket(auth, host, bucket_name)
 ######################
 # 生成oss签名url
-# url = bucket.sign_url('GET', 'vod/1543561927/1543561927.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
-
-# url = bucket.sign_url('GET', 'vod/1543561897/1543561897.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
-url = bucket.sign_url('GET', 'vod/1543902118/1543902118.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
+# url = bucket.sign_url('GET', 'vod/1543902118/1543902118.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
+url = bucket.sign_url('GET', 'vod/1543902584/1543902584.m3u8', 60 * 60, params={'x-oss-process': 'hls/sign'})
 
 # url = urllib.parse.unquote(url, encoding='utf-8', errors='replace')
 

Controller/EquipmentInfo.py

@@ -8,8 +8,9 @@ import traceback
 from Object.ResponseObject import ResponseObject
 from Object.TokenObject import TokenObject
 from django.views.generic import TemplateView
-from Ansjer.config import UID_TOKEN_KEY
+from Ansjer.config import UID_TOKEN_KEY,SERVER_DOMAIN
 import jwt
+
 '''
 http://192.168.136.45:8077/equipment/info?token=test&devUid=2N1K3LE78TYJ38CE111A&Channel=0&eventType=1&eventTime=1234567890&operation=add&alarm=21342134&receiveTime=1234567891234567
 http://test.dvema.com/equipment/info?token=test&operation=query&page=1&line=10
@@ -292,6 +293,7 @@ class DetectStatusView(View):
 
     def validation(self, request_dict, *args, **kwargs):
         token = request_dict.get('token', None)
+        id = request_dict.get('id', None)
         status = request_dict.get('status', None)
         response = ResponseObject()
         if token is None:
@@ -302,26 +304,14 @@ class DetectStatusView(View):
         if tko.code != 0:
             return response.json(tko.code)
         userID = tko.userID
-        return self.do_update(userID,status,response)
-
+        return self.do_update(userID,id,status,response)
 
-    def do_update(self, userID,status,response):
-        qs = Device_Info.objects.filter(userID=userID)
 
+    def do_update(self, userID,id,status,response):
+        qs = Device_Info.objects.filter(id=id,userID_id=userID)
         if qs.exists():
-            return
-        own_permission = ModelService.check_permission(userID=userID, permID=230)
-        if own_permission is not True:
-            return response.json(404)
-        ev = Equipment_Version.objects.filter(eid=eid)
-        if not ev.exists():
-            return response.json(10,'ev none')
-        status = request_dict.get('status', None)
-        try:
-            update_time = timezone.localtime(timezone.now())
-            ev.update(status=status, update_time=update_time)
-        except Exception as e:
-            print(repr(e))
-            pass
+            qs.update(status)
+            uid_token = jwt.encode(id,UID_TOKEN_KEY,algorithm='HS256').decode('utf-8')
+            return response.json(0,{'uid_token':uid_token,'push_url':'{SERVER_DOMAIN}detet/add'.format(SERVER_DOMAIN=SERVER_DOMAIN)})
         else:
-            return response.json(0, {'update_time': str(update_time)})
+            return response.json(13)

Controller/EquipmentManager.py

@@ -40,15 +40,15 @@ def addNewUserEquipment(userID, deviceContent, response):
                             if is_bind:
                                 # return response.json(175)
                                 # 判断用户密码是否正确
-                                dev_user = deviceData.get('View_Account', '')
-                                dev_pass = deviceData.get('View_Password', '')
-                                if is_bind[0].View_Account == dev_user and is_bind[0].View_Password == dev_pass:
-                                    deviceData['NickName'] = is_bind[0].NickName
-                                    userDevice = Device_Info(id=CommonService.getUserID(getUser=False), isShare=True,
+                                # dev_user = deviceData.get('View_Account', '')
+                                # dev_pass = deviceData.get('View_Password', '')
+                                # if is_bind[0].View_Account == dev_user and is_bind[0].View_Password == dev_pass:
+                                deviceData['NickName'] = is_bind[0].NickName
+                                userDevice = Device_Info(id=CommonService.getUserID(getUser=False), isShare=True,
                                                              userID_id=userID, **deviceData)
-                                    userDevice.save()
-                                else:
-                                    return response.json(111)
+                                userDevice.save()
+                                # else:
+                                #     return response.json(111)
                             else:
                                 userDevice = Device_Info(id=CommonService.getUserID(getUser=False), userID_id=userID,
                                                          **deviceData)

Model/models.py

@@ -318,23 +318,23 @@ class Device_Info(models.Model):
     primaryUserID = models.CharField(blank=True, verbose_name='主用户',
                                      help_text=u'该设备的主用户', max_length=32, default='')
     data_joined = models.DateTimeField(blank=True, verbose_name=u'设备添加时间', auto_now_add=True)
-    update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True, null=True)
+    update_time = models.DateTimeField(blank=True, verbose_name=u'更新时间', auto_now=True)
 
-    ip = models.CharField(blank=True, max_length=20, null=True, verbose_name=u'设备区域ip')
-    area = models.CharField(blank=True, max_length=100, null=True, verbose_name=u'设备区域area')
+    ip = models.CharField(blank=True, max_length=20, default='', verbose_name=u'设备区域ip')
+    area = models.CharField(blank=True, max_length=100, default='', verbose_name=u'设备区域area')
     # ios要求新增字段
-    version = models.CharField(blank=True, max_length=20, null=True, verbose_name=u'版本号')
-    SpaceUsable = models.CharField(blank=True, max_length=20, null=True, verbose_name=u'可用空间')
-    SpaceSum = models.CharField(blank=True, max_length=20, null=True, verbose_name=u'总空间')
-    WIFIName = models.CharField(blank=True, max_length=50, null=True, verbose_name=u'无线名称')
-    WIFIIP = models.CharField(blank=True, max_length=20, null=True, verbose_name=u'无线ip')
-    WIFIPwd = models.CharField(blank=True, max_length=50, null=True, verbose_name=u'无线密码')
+    version = models.CharField(blank=True, max_length=20, default='', verbose_name=u'版本号')
+    SpaceUsable = models.CharField(blank=True, max_length=20, default='', verbose_name=u'可用空间')
+    SpaceSum = models.CharField(blank=True, max_length=20, default='', verbose_name=u'总空间')
+    WIFIName = models.CharField(blank=True, max_length=50, default='', verbose_name=u'无线名称')
+    WIFIIP = models.CharField(blank=True, max_length=20, default='', verbose_name=u'无线ip')
+    WIFIPwd = models.CharField(blank=True, max_length=50, default='', verbose_name=u'无线密码')
     isDetector = models.BooleanField(blank=True, verbose_name=u'侦测开关0:关闭,1:开启)', default=False)
     DetectorRank = models.IntegerField(blank=True, default=0, verbose_name=u'侦测灵敏度 1:低,2:中,3:高4:最高')
     iSNotification = models.BooleanField(blank=True, verbose_name=u'报警通知 0:关闭,1:开启)', default=False)
     MirrorType = models.IntegerField(blank=True, default=0, verbose_name=u'镜像类型 0:关闭镜像,1：上下镜像，2:左右镜像，3：上下左右镜像')
     RecordType = models.IntegerField(blank=True, default=0, verbose_name=u'录像模式(0:关闭,1:全是录像,3:报警录像)')
-    TimeZone = models.CharField(blank=True, max_length=50, null=True, verbose_name=u'时区')
+    TimeZone = models.CharField(blank=True, max_length=50, default='', verbose_name=u'时区')
     ###
     REQUIRED_FIELDS = []