设备列表获取IOT 内容

Controller/EquipmentManager.py

@@ -849,7 +849,7 @@ def queryInterface(request):
             else:
                 dvl['isPrimaryUser'] = 0
             uid_list.append(dvl['UID'])
-            serial_number_list.append(dvl['serial_number'])
+            serial_number_list.append(dvl['serial_number'][0:6])
 
 
         #新增获取IOT证书内容
@@ -875,7 +875,7 @@ def queryInterface(request):
             #新增IOT
             p['iot'] = []
             for iot in iotqs:
-                if p['serial_number'][0:6] == iot.serial_number:
+                if p['serial_number'][0:6] == iot.serial_number.serial_number:
                         p['iot'].append(
                             {
                                 'endpoint':iot.endpoint,

Controller/EquipmentManagerV2.py

@@ -160,7 +160,7 @@ class EquipmentManagerV2(View):
                 else:
                     dvl['isPrimaryUser'] = 0
                 uid_list.append(dvl['UID'])
-                serial_number_list.append(dvl['serial_number'])
+                serial_number_list.append(dvl['serial_number'][0:6])
 
             # 新增获取IOT证书内容
             iotqs = iotdeviceInfoModel.objects.filter(serial_number__serial_number__in=serial_number_list)
@@ -188,7 +188,7 @@ class EquipmentManagerV2(View):
                 # 新增云分配UID
                 p['iot'] = []
                 for iot in iotqs:
-                    if p['serial_number'][0:6] == iot.serial_number:
+                    if p['serial_number'][0:6] == iot.serial_number.serial_number:
                         p['iot'].append(
                             {
                                 'endpoint': iot.endpoint,

Controller/EquipmentManagerV3.py

@@ -335,7 +335,7 @@ class EquipmentManagerV3(View):
                 else:
                     dvl['isPrimaryUser'] = 0
                 uid_list.append(dvl['UID'])
-                serial_number_list.append(dvl['serial_number'])
+                serial_number_list.append(dvl['serial_number'][0:6])
 
             # 新增获取IOT证书内容
             iotqs = iotdeviceInfoModel.objects.filter(serial_number__serial_number__in=serial_number_list)
@@ -416,7 +416,7 @@ class EquipmentManagerV3(View):
                 # 新增IOT
                 p['iot'] = []
                 for iot in iotqs:
-                    if p['serial_number'][0:6] == iot.serial_number:
+                    if p['serial_number'][0:6] == iot.serial_number.serial_number:
                         p['iot'].append(
                             {
                                 'endpoint': iot.endpoint,
@@ -527,7 +527,7 @@ class EquipmentManagerV3(View):
                 serial_number_list = []
                 for dvl in dvls:
                     uid_list.append(dvl['UID'])
-                    serial_number_list.append(dvl['serial_number'])
+                    serial_number_list.append(dvl['serial_number'][0:6])
 
                 # 新增获取IOT证书内容
                 iotqs = iotdeviceInfoModel.objects.filter(serial_number__serial_number__in=serial_number_list)
@@ -597,7 +597,7 @@ class EquipmentManagerV3(View):
                     # 新增IOT
                     p['iot'] = []
                     for iot in iotqs:
-                        if p['serial_number'][0:6] == iot.serial_number:
+                        if p['serial_number'][0:6] == iot.serial_number.serial_number:
                             p['iot'].append(
                                 {
                                     'endpoint': iot.endpoint,

Model/models.py

@@ -1495,7 +1495,7 @@ class CountryLanguageModel(models.Model):
 
 class SerialNumberModel(models.Model):
     id = models.AutoField(primary_key=True)
-    serial_number = models.CharField(max_length=9, db_index=True, verbose_name='序列号')
+    serial_number = models.CharField(max_length=9, db_index=True, unique=True, verbose_name='序列号')
     status = models.SmallIntegerField(default=1, verbose_name='可用状态。0：不可用，1：可用')
     add_time = models.IntegerField(default=0, verbose_name='添加时间')