fix:change uid_preview bucket

Controller/DetectController.py

@@ -73,6 +73,7 @@ class DetectControllerView(View):
     def do_query(self, request_dict, response, userID):
         page = int(request_dict.get('page', None))
         line = int(request_dict.get('line', None))
+        nowTime = int(time.time())
         if not page or not line:
             return response.json(444, 'page,line')
         qs = Equipment_Info.objects.filter(userID_id=userID)
@@ -82,7 +83,7 @@ class DetectControllerView(View):
             dvqs = Device_Info.objects.filter(UID=uid).values('Type')
             uid_type_dict = {uid: dvqs[0]['Type']}
         else:
-            dvqs = Device_Info.objects.filter(userID_id=userID).values('UID', 'Type')
+            dvqs = Device_Info.objects.filter(userID_id=userID,eventTime__gte=nowTime-3600*24*27).values('UID', 'Type')
             uid_type_dict = {}
             for dv in dvqs:
                 uid_type_dict[dv['UID']] = dv['Type']

Controller/EquipmentManager.py

@@ -590,8 +590,10 @@ def queryInterface(request):
         ubqs = UID_Bucket.objects.filter(uid__in=uid_list). \
             values('bucket__content', 'status', 'channel', 'endTime', 'uid')
         upqs = UID_Preview.objects.filter(uid__in=uid_list).order_by('channel').values('id', 'uid', 'channel')
+        # auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+        # uidPreview_bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
         auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-        uidPreview_bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
+        bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
         nowTime = int(time.time())
         data = []
         for p in dvls:
@@ -604,7 +606,7 @@ def queryInterface(request):
             for up in upqs:
                 if p['UID'] == up['uid']:
                     obj = 'uid_preview/{uid}/channel_{channel}.png'.format(uid=up['uid'], channel=up['channel'])
-                    img_sign = uidPreview_bucket.sign_url('GET', obj, 300)
+                    img_sign = bucket.sign_url('GET', obj, 300)
                     p['preview'].append(img_sign)
             data.append(p)
         return response.json(0, data)

Controller/UIDPreview.py

@@ -75,8 +75,11 @@ class UIDPreview(View):
         uid = request_dict.get('uid', None)
         channel = request_dict.get('channel', None)
         if all([uid, channel]):
+            # auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
+            # bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
             auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
-            bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
+            bucket = oss2.Bucket(auth, 'oss-cn-hongkong.aliyuncs.com', 'statres')
+
             dvqs = Device_Info.objects.filter(UID=uid, userID_id=userID)
             upqs = UID_Preview.objects.filter(uid=uid, channel=channel)
             if dvqs.exists():

Model/models.py

@@ -381,7 +381,6 @@ class FeedBackModel(models.Model):
         ordering = ('id',)
 
 
-
 class User_Brand(models.Model):
     id = models.AutoField(primary_key=True, verbose_name=u'自增标记ID')
     # 关联用户 
@@ -399,7 +398,7 @@ class User_Brand(models.Model):
 
     longitude = models.CharField(max_length=30, default='', verbose_name='经度')
     latitude = models.CharField(max_length=30, default='', verbose_name='纬度')
-    appId =  models.CharField(max_length=50, default='', verbose_name='appid_值')
+    appId = models.CharField(max_length=50, default='', verbose_name='appid_值')
     status = models.IntegerField(default=0, verbose_name='传国家省市信息过来就为状态：1 ，不传就为状态：0')
     ip = models.CharField(blank=True, max_length=20, default='', verbose_name=u'区域ip')
 
@@ -648,3 +647,14 @@ class UID_Preview(models.Model):
         verbose_name = '设备预览图'
         verbose_name_plural = verbose_name
         ordering = ('id',)
+
+
+class SysMsgModel(models.Model):
+    id =models.AutoField(primary_key=True,verbose_name='自增id')
+    msg = models.TextField(blank=True, default='', verbose_name=u'更新内容')
+
+    class Meta:
+        db_table = 'sys_msg'
+        verbose_name = '系统消息'
+        verbose_name_plural = verbose_name
+        ordering = ('id',)