Merge branch 'test' of http://192.168.136.99:3000/servers/ASJServer

AdminController/SerialManageController.py

@@ -51,6 +51,13 @@ class SerialView(View):
 
     @classmethod
     def company_page(cls, request_dict, response):
+
+        isSelect = request_dict.get('isSelect', None)
+        if isSelect:
+            # 获取企业名称作为选项
+            company_qs = CompanyModel.objects.all().values('id', 'name')
+            return response.json(0, {'list': list(company_qs)})
+
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
         if not all([pageNo, pageSize]):
@@ -63,7 +70,7 @@ class SerialView(View):
             if not request_qs.exists():
                 return response.json(0, {'list': '', 'total': 0})
             total = request_qs.count()
-            company_page = request_qs.order_by('-add_time')[(page - 1) * line:page * line].values()
+            company_page = request_qs[(page - 1) * line:page * line].values()
             return response.json(0, {'list': list(company_page), 'total': total})
         except Exception as e:
             print(e)
@@ -71,32 +78,32 @@ class SerialView(View):
 
     @classmethod
     def serial_page(cls, request_dict, response):
-        pageNo = request_dict.get('pageNo', None)
-        pageSize = request_dict.get('pageSize', None)
+        company_name = request_dict.get('companyName', None)
         serial_number = request_dict.get('serialNumber', None)
         status = request_dict.get('status', None)
-        use_status = request_dict.get('useStatus', None)
+
+        pageNo = request_dict.get('pageNo', None)
+        pageSize = request_dict.get('pageSize', None)
         if not all([pageNo, pageSize]):
             return response.json(444)
         page = int(pageNo)
         line = int(pageSize)
+
         try:
-            query = SerialNumberModel.objects.filter()
+            company_serial_qs = CompanySerialModel.objects.filter()
+            if company_name:
+                company_serial_qs = company_serial_qs.filter(company__name=company_name)
             if serial_number:
-                query = query.filter(serial_number__contains=serial_number)
+                company_serial_qs = company_serial_qs.filter(serial_number__contains=serial_number)
             if status:
                 status = int(status)
-                query = query.filter(status=status)
-            if use_status:
-                use_status = int(use_status)
-                query = query.filter(use_status=use_status)
-            if not query.exists():
+                company_serial_qs = company_serial_qs.filter(status=status)
+            if not company_serial_qs.exists():
                 return response.json(0, {'list': '', 'total': 0})
-            total = query.count()
-            serial_number_page = query.order_by('-add_time')[(page - 1) * line:page * line].values()
-            if serial_number_page.exists():
-                return response.json(0, {'list': list(serial_number_page), 'total': total})
-            return response.json(173)
+            total = company_serial_qs.count()
+            serial_number_page = company_serial_qs.order_by('-add_time')[(page - 1) * line:page * line].\
+                values('serial_number', 'company__name', 'status', 'add_time', 'update_time')
+            return response.json(0, {'list': list(serial_number_page), 'total': total})
         except Exception as e:
             print(e)
             return response.json(500, repr(e))
@@ -108,8 +115,7 @@ class SerialView(View):
         if isSelect:
             # 获取vpg id作为选项
             vpg_qs = VPGModel.objects.all().values('id')
-            return response.json(
-                0, {'list': CommonService.qs_to_list(vpg_qs)})
+            return response.json(0, {'list': list(vpg_qs)})
 
         pageNo = request_dict.get('pageNo', None)
         pageSize = request_dict.get('pageSize', None)
@@ -122,7 +128,7 @@ class SerialView(View):
             if not query.exists():
                 return response.json(0, {'list': '', 'total': 0})
             total = query.count()
-            vpg_page = query.order_by('-add_time')[(page - 1) * line:page * line] \
+            vpg_page = query[(page - 1) * line:page * line] \
                 .values('id', 'name',
                         'region__name',
                         'region_id',

Controller/Cron/CronTaskController.py

@@ -16,7 +16,7 @@ from Model.models import Device_User, Device_Info, UidSetModel, UID_Bucket, Unus
     VodHlsModel, ExperienceContextModel, AiService
 from Object.ResponseObject import ResponseObject
 from Object.utils import LocalDateTimeUtil
-from Service import CommonService
+from Service.CommonService import CommonService
 
 
 class CronDelDataView(View):

Model/models.py

@@ -1664,7 +1664,7 @@ class CompanySerialModel(models.Model):
     id = models.AutoField(primary_key=True)
     company = models.ForeignKey(CompanyModel, to_field='id', on_delete=models.CASCADE, verbose_name='关联企业表的id')
     serial_number = models.CharField(max_length=11, db_index=True, blank=True, default='', verbose_name=u'6位数序列号')
-    status = models.SmallIntegerField(default=0, verbose_name='序列号的状态。0：未使用，1：已使用，2：已和UID关联,3:已占用')
+    status = models.SmallIntegerField(default=0, verbose_name='使用状态, 0:未使用,1:已分配,2:绑定uid,3:已占用')
     add_time = models.IntegerField(default=0, verbose_name='添加时间')
     update_time = models.IntegerField(default=0, verbose_name='更新时间')