Merge remote-tracking branch 'origin/test'

AdminController/UserManageController.py

@@ -311,6 +311,8 @@ class UserManagement(View):
             return self.getAppDataList(request_dict, response)
         elif operation == 'replyFeedBack':
             return self.replyFeedBack(request_dict, response)
+        elif operation == 'sendSysMsgToUser':
+            return self.sendSysMsgToUser(request_dict, response)
         else:
             tko = TokenObject(request.META.get('HTTP_AUTHORIZATION'), returntpye='pc')
             if tko.code != 0:
@@ -558,6 +560,21 @@ class UserManagement(View):
             print(e)
             return response.json(500, repr(e))
 
+    def sendSysMsgToUser(self, request_dict, response):
+        userID = request_dict.get('userID', None)
+        msg = request_dict.get('msg', None)
+
+        if not all([userID, msg]):
+            return response.json(444)
+
+        try:
+            nowTime = int(time.time())
+            SysMsgModel.objects.create(userID_id=userID, msg=msg, addTime=nowTime, updTime=nowTime)
+            return response.json(0)
+        except Exception as e:
+            print(e)
+            return response.json(500, repr(e))
+
     def deleteFeedBack(self, request_dict, response):
         feedBackID = request_dict.get('feedBackID', None)
         if not feedBackID:

Controller/VPGController.py

@@ -219,10 +219,10 @@ def do_upload_uid(request):
 
     bulk = []
     add_time = update_time = int(time.time())
-    # MAC = MacModel.objects.filter().values('id', 'value', 'is_active')[0]   # 获取最新可用的mac
-    # current_mac = MAC['value']
-    # if (not MAC['is_active']) or (current_mac[-8:] == 'FF.FF.FF'):
-    #     return response.json(175)
+    MAC = MacModel.objects.filter().values('id', 'value', 'is_active')[0]   # 获取最新可用的mac
+    current_mac = MAC['value']
+    if (not MAC['is_active']) or (current_mac[-8:] == 'FF.FF.FF'):
+        return response.json(175)
 
     area = 1 if vpg_id != '1' else 0
     # path = '/'.join((BASE_DIR, 'static/uid')).replace('\\', '/') + '/'
@@ -240,7 +240,7 @@ def do_upload_uid(request):
             uid_list = re.findall("b\'(.*)\'", str(chunk))[0].split('\\r\\n')
             for uid in uid_list:
                 UID = UIDModel(
-                    mac='',
+                    mac=current_mac,
                     uid_extra='',
                     status=0,
                     add_time=add_time,
@@ -264,12 +264,12 @@ def do_upload_uid(request):
                     UID.uid = new_uid
                     UID.full_uid_code = uid
                 bulk.append(UID)
-                # temp_mac = CommonService.updateMac(current_mac)    # mac地址值+1;后3个字节为FF时返回None
-                # if temp_mac:
-                #     current_mac = temp_mac  # 更新赋值写入uid表
-                # else:
-                #     temp_mac = current_mac  # 赋值为FF写入mac表
-                #     break
+                temp_mac = CommonService.updateMac(current_mac)    # mac地址值+1;后3个字节为FF时返回None
+                if temp_mac:
+                    current_mac = temp_mac  # 更新赋值写入uid表
+                else:
+                    temp_mac = current_mac  # 赋值为FF写入mac表
+                    break
 
         ip = CommonService.get_ip_address(request)
         content = json.loads(json.dumps(request_dict))
@@ -288,7 +288,7 @@ def do_upload_uid(request):
             UIDModel.objects.bulk_create(bulk)  # 批量写入uid数据
             uid_count = UIDModel.objects.filter(vpg_id=vpg_id).count()  # 获取族群下uid的数量
             VPGModel.objects.filter(id=vpg_id).update(uid_count=uid_count)   # 更新vgp表的uid_count
-            # MacModel.objects.filter().update(value=temp_mac)  # 更新mac表的mac地址值
+            MacModel.objects.filter().update(value=temp_mac)  # 更新mac表的mac地址值
         return response.json(0)
     except Exception as e:
         print(e)

Model/models.py

@@ -1606,11 +1606,14 @@ class iotdeviceInfoModel(models.Model):
     thing_name = models.CharField(blank=True, max_length=256, default='', verbose_name=u'IoT Thing Name')
     thing_groups = models.CharField(blank=True, max_length=256, default='', verbose_name=u'IoT Thing Groups')
     endpoint = models.CharField(blank=True, max_length=256, db_index=True, default='', verbose_name=u'iot端点')
-    token_iot_number = models.CharField(blank=True,  db_index=True ,default='', max_length=50, verbose_name='连接iot令牌')
+    token_iot_number = models.CharField(blank=True,  db_index=True, default='', max_length=50, verbose_name='连接iot令牌')
+    add_time = models.DateTimeField(blank=True, auto_now_add=True, verbose_name=u'添加时间')
+    update_time = models.DateTimeField(blank=True, auto_now=True, verbose_name=u'更新时间')
     class Meta:
         db_table = 'iot_deviceInfo'
         verbose_name = 'iot设备信息表'
         verbose_name_plural = verbose_name
+        ordering = ('-add_time',)
 
 
 class UIDMainUser(models.Model):