Bladeren bron

reset time

chenjunkai 5 jaren geleden
bovenliggende
commit
9dd2374ace
4 gewijzigde bestanden met toevoegingen van 12 en 0 verwijderingen
  1. 1 0
      Ansjer/urls.py
  2. 8 0
      Controller/EquipmentManager.py
  3. 2 0
      Model/models.py
  4. 1 0
      Object/ETkObject.py

+ 1 - 0
Ansjer/urls.py

@@ -172,6 +172,7 @@ urlpatterns = [
     # add query update delete
     url(r'^v2/equipment/(?P<operation>.*)$', EquipmentManagerV2.EquipmentManagerV2.as_view()),
 
+    # app 设备消息模板
     # 路由加参数参考
     # url(r'^(?P<path>.*)/(?P<UID>.*)/lls$', Test.Test.as_view(), name=u'gg'),
     re_path('(?P<path>.*)', LogManager.errorPath),

+ 8 - 0
Controller/EquipmentManager.py

@@ -860,10 +860,16 @@ def update_device_shadow(request):
         cloud_vod = request_dict.get('cloud_vod', None)
         push_status = request_dict.get('push_status', None)
         pwd = request_dict.get('pwd', None)
+        resetTime = request_dict.get('resetTime', None)
 
         us_qs = UidSetModel.objects.filter(uid=uid)
         # 更新
         nowTime = int(time.time())
+
+        print('-------')
+        print(resetTime)
+        print('-------')
+
         if us_qs.exists():
             update_dict = {
                 'updTime': nowTime,
@@ -918,6 +924,8 @@ def update_device_shadow(request):
                 create_dict['push_status'] = push_status
             if pwd:
                 create_dict['pwd'] = pwd
+            if resetTime:
+                create_dict['resetTime'] = resetTime
             UidSetModel.objects.create(**create_dict)
             # 如果推送状态开启,返回推送url
             return JsonResponse(status=200, data={'code': 0, 'msg': 'success', 'data': {}})

+ 2 - 0
Model/models.py

@@ -676,6 +676,8 @@ class UidSetModel(models.Model):
     nickname = models.CharField(default='', max_length=64, verbose_name='设备昵称')
     ip = models.CharField(max_length=20, default='', verbose_name=u'设备ip')
     pwd = models.CharField(max_length=32, default='', verbose_name=u'设备密码')
+    # 设备重置后第一次启动时间
+    resetTime = models.IntegerField(default=0,verbose_name='设备重置时间')
 
     class Meta:
         db_table = 'uid_set'

+ 1 - 0
Object/ETkObject.py

@@ -31,6 +31,7 @@ class ETkObject(object):
             uid = c.decode('utf-8')
             if len(uid) == 20:
                 self.uid = uid
+                print(uid)
         except Exception as e:
             print(repr(e))