فهرست منبع

删减多余代码;查询序列号绑定信息功能,新增绑定时间

guanhailong 2 سال پیش
والد
کامیت
ae8cff8725
1فایلهای تغییر یافته به همراه10 افزوده شده و 14 حذف شده
  1. 10 14
      Controller/TestApi.py

+ 10 - 14
Controller/TestApi.py

@@ -939,42 +939,38 @@ class testView(View):
         serial_number = request_dict.get('serialNumber', None)
         if not serial_number:
             return response.json(444)
-        # 返回序列号
-        serialNumber = serial_number[:9]
-        # 查询uid
-        serial_number = serial_number[:6]
         try:
-            company_serial_qs = CompanySerialModel.objects.filter(serial_number=serial_number).values('status')
-            if not company_serial_qs.exists():
-                return response.json(173)
-
             uid_user_message = {
                 "uid": "",
                 "serialNumber": "",
                 "userID": "",
                 "username": "",
-                "primaryUserID": ""
+                "primaryUserID": "",
             }
             data = {
                 "uid": "",
-                "serialNumber": serialNumber,
+                "serialNumber": serial_number[:9],
                 "status": "",
+                "add_time": "",
                 "uid_user_message": uid_user_message
             }
-
+            # 获取序列哈状态
+            company_serial_qs = CompanySerialModel.objects.filter(serial_number=serial_number[:6]).values('status')
+            if not company_serial_qs.exists():
+                return response.json(173)
             company_serial_qs = company_serial_qs.first()
             if company_serial_qs['status'] == 0:
                 return response.json(0, {'contents': '序列号未分配'})
             uid_company_serial_qs = UIDCompanySerialModel.objects.filter(
-                company_serial__serial_number=serial_number).values('uid__uid', 'uid__status',
-                                                                    'company_serial__serial_number')
+                company_serial__serial_number=serial_number[:6]).values('uid__uid', 'uid__status',
+                                                                        'company_serial__serial_number', 'add_time')
             if not uid_company_serial_qs.exists():
                 data['status'] = cls.serial_number_status(company_serial_qs['status'])
                 return response.json(0, data)
             uid_company_serial = uid_company_serial_qs.first()
             data['uid'] = uid_company_serial['uid__uid']
-            data['serialNumber'] = serialNumber
             data['status'] = uid_company_serial['uid__status']
+            data['add_time'] = CommonService.timestamp_to_str(uid_company_serial['add_time'])
             data['status'] = cls.serial_number_status(company_serial_qs['status'])
             device_info_qs = Device_Info.objects.filter(UID=data['uid']).values(
                 'UID',