Browse Source

记录序列号关联的mac

locky 7 months ago
parent
commit
b24dfb5ce4
2 changed files with 15 additions and 2 deletions
  1. 4 2
      Controller/SerialNumberController.py
  2. 11 0
      Model/models.py

+ 4 - 2
Controller/SerialNumberController.py

@@ -10,7 +10,7 @@ from django.db.models import Count
 from django.views import View
 
 from Model.models import SerialNumberModel, UserModel, UserSerialNumberModel, CompanySerialModel, \
-    MacModel, LogModel, CompanyModel
+    MacModel, LogModel, CompanyModel, SerialMac
 from Object.RedisObject import RedisObject
 from Object.ResponseObject import ResponseObject
 from Object.S3Email import S3Email
@@ -594,9 +594,11 @@ class SerialNumberView(View):
                 SerialNumberModel.objects.filter(serial_number=serial_number).update(use_status=2, add_time=now_time)
                 CompanySerialModel.objects.filter(serial_number=serial_number).update(status=2, update_time=now_time)
                 LogModel.objects.create(**log)
+                serial_number = serial_number + company_mark
+                SerialMac.objects.create(serial_number=serial_number, mac=mac, add_time=now_time)
 
                 redis_obj.del_data(key=serial_operate_lock_key)  # redis解锁
-                return response.json(0, {'serial_number': serial_number + company_mark, 'mac': mac})
+                return response.json(0, {'serial_number': serial_number, 'mac': mac})
         except Exception as e:
             redis_obj.del_data(key=serial_operate_lock_key)  # redis解锁
             return response.json(500, repr(e))

+ 11 - 0
Model/models.py

@@ -202,3 +202,14 @@ class UserSerialNumberModel(models.Model):
         verbose_name = '用户与序列号的关联表'
         verbose_name_plural = verbose_name
         db_table = 'user_serial_number'
+
+
+class SerialMac(models.Model):
+    id = models.AutoField(primary_key=True)
+    serial_number = models.CharField(default='', max_length=9, db_index=True, verbose_name='9位数序列号')
+    mac = models.CharField(default='', max_length=9, verbose_name='mac地址')
+    add_time = models.IntegerField(default=0, verbose_name='添加时间')
+
+    class Meta:
+        db_table = 'serial_mac'
+        verbose_name = '序列号关联mac'