فهرست منبع

UID管理系统-序列号管理-序列号信息添加p2p类型字段,增改查功能

lhq 4 سال پیش
والد
کامیت
eb42fbd80d
2فایلهای تغییر یافته به همراه7 افزوده شده و 4 حذف شده
  1. 5 3
      Controller/SerialNumberController.py
  2. 2 1
      Model/models.py

+ 5 - 3
Controller/SerialNumberController.py

@@ -59,6 +59,7 @@ class SerialNumberView(View):
 
     def do_create(self, request_dict, response):
         quantity = int(request_dict.get('quantity', None))
+        p2p = int(request_dict.get('p2p', None))
 
         if not quantity:
             return response.json(444)
@@ -85,7 +86,7 @@ class SerialNumberView(View):
         data = []
         now_time = int(time.time())
         for item in tmp:
-            data.append(SerialNumberModel(serial_number=item, add_time=now_time))
+            data.append(SerialNumberModel(serial_number=item, add_time=now_time, p2p=p2p))
 
             if len(data) == 10000:
                 SerialNumberModel.objects.bulk_create(data)
@@ -167,7 +168,7 @@ class SerialNumberView(View):
             page = int(page)
             line = int(line)
 
-            serial_qs = SerialNumberModel.objects.filter()
+            serial_qs = SerialNumberModel.objects.filter().order_by('-id')
 
             if serial_number:
                 serial_qs = serial_qs.filter(serial_number__contains=serial_number)
@@ -387,11 +388,12 @@ class SerialNumberView(View):
 
         id = request_dict.get('id', None)
         status = request_dict.get('status', None)
+        p2p = request_dict.get('p2p', None)
 
         if id and status:
             serial_number_qs = SerialNumberModel.objects.filter(id=id)
             if serial_number_qs.exists():
-                serial_number_qs.update(**{'status': status})
+                serial_number_qs.update(**{'status': status, 'p2p': p2p})
                 return response.json(0)
             else:
                 return response.json(173)

+ 2 - 1
Model/models.py

@@ -1338,7 +1338,7 @@ class VPGModel(models.Model):
 class UIDModel(models.Model):
     id = models.AutoField(primary_key=True)
     uid = models.CharField(max_length=20, null=False, db_index=True, unique=True, verbose_name='设备id')
-    mac = models.CharField(max_length=17, null=False, default='', verbose_name='设备id对应的mac地址')
+    mac = models.CharField(max_length=17, null=False, default='', unique=True, verbose_name='设备id对应的mac地址')
     uid_extra = models.TextField(default='', verbose_name='uid的额外描述')
     status = models.SmallIntegerField(default=0, verbose_name='使用状态')   # 0:未分配,1:已分配,2:已使用
     add_time = models.IntegerField(default=0, verbose_name='添加时间')
@@ -1497,6 +1497,7 @@ class SerialNumberModel(models.Model):
     id = models.AutoField(primary_key=True)
     serial_number = models.CharField(max_length=9, db_index=True, unique=True, verbose_name='序列号')
     status = models.SmallIntegerField(default=1, verbose_name='可用状态。0:不可用,1:可用')
+    p2p = models.SmallIntegerField(default=0, verbose_name='p2p类型。0:无,1:宸云,2:tutk')
     add_time = models.IntegerField(default=0, verbose_name='添加时间')
 
     class Meta: