|
@@ -24,7 +24,7 @@ from Controller.SensorGateway.EquipmentFamilyController import EquipmentFamilyVi
|
|
|
from Controller.SensorGateway.SmartSocketController import SmartSocketView
|
|
|
from Model.models import FamilyRoomDevice, FamilyRoom, GatewaySubDevice, Device_Info, UserFamily, FamilyMember, \
|
|
|
UidSetModel, iotdeviceInfoModel, SmartScene, SceneLog, SocketInfo, SocketPowerStatistics, SocketSchedule, \
|
|
|
- CountryModel
|
|
|
+ CountryModel, SensorRecord
|
|
|
from Object.AWS.AWSIoTDataPlaneUtil import AWSIoTDataPlaneService
|
|
|
from Object.RedisObject import RedisObject
|
|
|
from Object.ResponseObject import ResponseObject
|
|
@@ -209,6 +209,8 @@ class GatewayDeviceView(View):
|
|
|
gateway_qs = GatewaySubDevice.objects.filter(device_id=device_id)
|
|
|
if gateway_qs.exists():
|
|
|
sub_id_list = gateway_qs.values_list('id', flat=True)
|
|
|
+ # 删除传感器记录
|
|
|
+ SensorRecord.objects.filter(gateway_sub_device_id__in=sub_id_list).delete()
|
|
|
smart_scene_qs = SmartScene.objects.filter(
|
|
|
Q(device_id=device_id) | Q(sub_device_id__in=sub_id_list))
|
|
|
|
|
@@ -254,7 +256,8 @@ class GatewayDeviceView(View):
|
|
|
elif sub_ids:
|
|
|
sub_id_list = list(map(int, sub_ids.split(',')))
|
|
|
FamilyRoomDevice.objects.filter(sub_device__in=sub_id_list).delete()
|
|
|
-
|
|
|
+ # 删除传感器记录
|
|
|
+ SensorRecord.objects.filter(gateway_sub_device_id__in=sub_id_list).delete()
|
|
|
# 查询网关序列号,确定MQTT主题
|
|
|
sub_device_qs = GatewaySubDevice.objects.filter(id=sub_id_list[0]). \
|
|
|
values('device__serial_number')
|