evet

Controller/DetectController.py

@@ -30,10 +30,10 @@ from Object.UidTokenObject import UidTokenObject
 from Service.CommonService import CommonService
 
 
-# http://test.dvema.com/notify/push?uidToken=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJQMldOR0pSRDJFSEE1RVU5MTExQSJ9.xOCI5lerk8JOs5OcAzunrKCfCrtuPIZ3AnkMmnd-bPY&n_time=1526845794&channel=1&event_type=51&is_st=0
-# http://test.dvema.com/notify/push?etk=eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ1aWQiOiJQMldOR0pSRDJFSEE1RVU5MTExQSJ9.xOCI5lerk8JOs5OcAzunrKCfCrtuPIZ3AnkMmnd-bPY&n_time=1526845794&channel=1&event_type=51&is_st=0
-
-
+'''
+http://push.dvema.com/notify/push?etk=Y2lTRXhMTjBWS01sWlpURTVJU0ZWTlJ6RXhNVUU9T3o=&n_time=1526845794&channel=1&event_type=704&is_st=0
+http://push.dvema.com/deviceShadow/generateUTK?username=debug_user&password=debug_password&uid=VVDHCVBYDKFMJRWA111A
+'''
 # 移动侦测接口
 class NotificationView(View):
 
@@ -82,8 +82,8 @@ class NotificationView(View):
                 # 从数据库查询出来
                 uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
                     values('token_val', 'app_type', 'appBundleId',
-                           'push_type', 'userID_id', 'userID__NickName',
-                           'lang', 'tz', 'uid_set__nickname')
+                           'push_type', 'userID_id','lang',
+                           'tz', 'uid_set__nickname')
                 # 新建一个list接收数据
                 redis_list = []
                 # 把数据库数据追加进redis_list
@@ -149,9 +149,12 @@ class NotificationView(View):
                 if is_sys_msg:
                     sys_msg_list.append(SysMsgModel(
                         userID_id=userID_id,
-                        msg='{msg_title} {msg_text}'.format(msg_title=msg_title, msg_text=msg_text),
+                        msg=msg_text,
+                        # msg='{msg_title} {msg_text}'.format(msg_title=msg_title, msg_text=msg_text),
                         addTime=now_time,
-                        updTime=now_time
+                        updTime=now_time,
+                        uid=uid,
+                        eventType=event_type
                     ))
             if is_sys_msg:
                 SysMsgModel.objects.bulk_create(sys_msg_list)
@@ -348,16 +351,16 @@ class PushNotificationView(View):
                 # 从数据库查询出来
                 uid_push_qs = UidPushModel.objects.filter(uid_set__uid=uid, uid_set__detect_status=1). \
                     values('token_val', 'app_type', 'appBundleId',
-                           'push_type', 'userID_id', 'userID__NickName',
-                           'lang', 'tz', 'uid_set__nickname')
+                           'push_type', 'userID_id','lang',
+                           'tz', 'uid_set__nickname')
                 # 新建一个list接收数据
                 redis_list = []
                 # 把数据库数据追加进redis_list
                 for qs in uid_push_qs:
                     redis_list.append(qs)
                 # 修改redis数据，并设置过期时间为10分钟
-                redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
             if redis_list:
+                redisObj.set_data(key=ykey, val=str(redis_list), expire=600)
                 auth = oss2.Auth(OSS_STS_ACCESS_KEY, OSS_STS_ACCESS_SECRET)
                 bucket = oss2.Bucket(auth, 'oss-cn-shenzhen.aliyuncs.com', 'apg')
                 self.do_bulk_create_info(redis_list, n_time, channel, event_type, is_st, uid)

Model/models.py

@@ -301,6 +301,8 @@ class SysMsgModel(models.Model):
     status = models.SmallIntegerField(verbose_name='是否已读', default=0)  # 0:否,1:是
     addTime = models.IntegerField(verbose_name='添加时间', default=0)
     updTime = models.IntegerField(verbose_name='更新时间', default=0)
+    eventType = models.IntegerField(verbose_name='消息类型', default=0) # 默认系统消息类型,0系统消息，1 ipcamera消息
+    uid = models.CharField(default='', max_length=20, db_index=True, verbose_name='设备UID')
 
     class Meta:
         db_table = 'sys_msg'

Object/RedisObject.py

@@ -15,7 +15,7 @@ import redis
 
 from AnsjerPush.config import REDIS_ADDRESS
 
-# REDIS_ADDRESS = '192.168.136.45'
+# SERVER_HOST = '192.168.136.45'
 
 '''
 db=3  -> 统计在线人数用