|
@@ -333,7 +333,7 @@ class SmartSceneView(View):
|
|
thing_name = serial_number
|
|
thing_name = serial_number
|
|
topic_name = SMART_SCENE_TOPIC_NAME.format(serial_number)
|
|
topic_name = SMART_SCENE_TOPIC_NAME.format(serial_number)
|
|
|
|
|
|
- success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
|
|
|
|
|
|
+ success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg, 0)
|
|
try:
|
|
try:
|
|
assert success
|
|
assert success
|
|
except AssertionError:
|
|
except AssertionError:
|
|
@@ -460,7 +460,7 @@ class SmartSceneView(View):
|
|
with transaction.atomic():
|
|
with transaction.atomic():
|
|
SmartScene.objects.filter(id=smart_scene_id).update(is_enable=is_enable)
|
|
SmartScene.objects.filter(id=smart_scene_id).update(is_enable=is_enable)
|
|
# 通过mqtt发送设备数据
|
|
# 通过mqtt发送设备数据
|
|
- success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
|
|
|
|
|
|
+ success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
|
|
try:
|
|
try:
|
|
assert success
|
|
assert success
|
|
except AssertionError:
|
|
except AssertionError:
|
|
@@ -664,7 +664,7 @@ class SmartSceneView(View):
|
|
# 通过mqtt发送设备数据
|
|
# 通过mqtt发送设备数据
|
|
thing_name = serial_number
|
|
thing_name = serial_number
|
|
topic_name = SMART_SCENE_TOPIC_NAME.format(serial_number)
|
|
topic_name = SMART_SCENE_TOPIC_NAME.format(serial_number)
|
|
- success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
|
|
|
|
|
|
+ success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg, 0)
|
|
try:
|
|
try:
|
|
assert success
|
|
assert success
|
|
except AssertionError:
|
|
except AssertionError:
|
|
@@ -708,7 +708,7 @@ class SmartSceneView(View):
|
|
msg = {
|
|
msg = {
|
|
'smart_scene_delete': int(smart_scene_id)
|
|
'smart_scene_delete': int(smart_scene_id)
|
|
}
|
|
}
|
|
- success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
|
|
|
|
|
|
+ success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
|
|
try:
|
|
try:
|
|
assert success
|
|
assert success
|
|
except AssertionError:
|
|
except AssertionError:
|