|
@@ -157,6 +157,7 @@ class EquipmentManagerV3(View):
|
|
us_qs = UidSetModel.objects.filter(uid=UID)
|
|
us_qs = UidSetModel.objects.filter(uid=UID)
|
|
if us_qs.exists():
|
|
if us_qs.exists():
|
|
us_qs.update(nickname=NickName)
|
|
us_qs.update(nickname=NickName)
|
|
|
|
+ UidSet_id = us_qs[0]['id']
|
|
else:
|
|
else:
|
|
uid_set_create_dict = {
|
|
uid_set_create_dict = {
|
|
'uid': UID,
|
|
'uid': UID,
|
|
@@ -168,14 +169,18 @@ class EquipmentManagerV3(View):
|
|
'version': version,
|
|
'version': version,
|
|
}
|
|
}
|
|
UidSet = UidSetModel.objects.create(**uid_set_create_dict)
|
|
UidSet = UidSetModel.objects.create(**uid_set_create_dict)
|
|
- # UidSet_id = UidSet.id
|
|
|
|
|
|
+ UidSet_id = UidSet.id
|
|
|
|
+
|
|
|
|
+ # 查询uid_channel表有无该uid的数据
|
|
|
|
+ uid_channel_set = UidChannelSetModel.objects.filter(uid_id=UidSet_id)
|
|
|
|
+ if not uid_channel_set.exists():
|
|
# 多通道设备设置通道名
|
|
# 多通道设备设置通道名
|
|
multi_channel_list = [1, 2, 3, 4, 10001]
|
|
multi_channel_list = [1, 2, 3, 4, 10001]
|
|
if Type in multi_channel_list:
|
|
if Type in multi_channel_list:
|
|
UidChannelSet_bulk = []
|
|
UidChannelSet_bulk = []
|
|
for i in range(1, ChannelIndex+1):
|
|
for i in range(1, ChannelIndex+1):
|
|
channel_name = 'channel'+str(i) # channel1,channel2...
|
|
channel_name = 'channel'+str(i) # channel1,channel2...
|
|
- UidChannelSet = UidChannelSetModel(uid=UidSet, channel=i, channel_name=channel_name)
|
|
|
|
|
|
+ UidChannelSet = UidChannelSetModel(uid=UidSet_id, channel=i, channel_name=channel_name)
|
|
UidChannelSet_bulk.append(UidChannelSet)
|
|
UidChannelSet_bulk.append(UidChannelSet)
|
|
UidChannelSetModel.objects.bulk_create(UidChannelSet_bulk)
|
|
UidChannelSetModel.objects.bulk_create(UidChannelSet_bulk)
|
|
|
|
|