Эх сурвалжийг харах

修改网关mqtt qos等级为1

locky 2 жил өмнө
parent
commit
5fd68c638e

+ 3 - 3
Controller/SensorGateway/GatewayDeviceController.py

@@ -176,7 +176,7 @@ class GatewayDeviceView(View):
                                 msg = {
                                     'smart_scene_delete': int(smart_scene['id'])
                                 }
-                                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                                 try:
                                     assert success
                                 except AssertionError:
@@ -202,7 +202,7 @@ class GatewayDeviceView(View):
                             msg = {
                                 'sos_delete': int(sub_device_qs[0]['src_addr'], 16)
                             }
-                            success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                            success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                             try:
                                 assert success
                             except AssertionError:
@@ -222,7 +222,7 @@ class GatewayDeviceView(View):
                             msg = {
                                 'smart_scene_delete': int(smart_scene['id'])
                             }
-                            success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                            success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                             try:
                                 assert success
                             except AssertionError:

+ 6 - 6
Controller/SensorGateway/SmartSceneController.py

@@ -338,7 +338,7 @@ class SmartSceneView(View):
                 thing_name = serial_number
                 topic_name = SMART_SCENE_TOPIC.format(serial_number)
 
-                success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg, 0)
+                success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
                 try:
                     assert success
                 except AssertionError:
@@ -486,7 +486,7 @@ class SmartSceneView(View):
             with transaction.atomic():
                 SmartScene.objects.filter(id=smart_scene_id).update(is_enable=is_enable)
                 # 通过mqtt发送设备数据
-                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                 try:
                     assert success
                 except AssertionError:
@@ -695,7 +695,7 @@ class SmartSceneView(View):
             # 通过mqtt发送设备数据
             thing_name = serial_number
             topic_name = SMART_SCENE_TOPIC.format(serial_number)
-            success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg, 0)
+            success = CommonService.req_publish_mqtt_msg(thing_name, topic_name, msg)
             try:
                 assert success
             except AssertionError:
@@ -739,7 +739,7 @@ class SmartSceneView(View):
                     msg = {
                         'smart_scene_delete': int(smart_scene_id)
                     }
-                    success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                    success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                     try:
                         assert success
                     except AssertionError:
@@ -889,7 +889,7 @@ class SmartSceneView(View):
             topic_name = SMART_SCENE_TOPIC.format(serial_number)
             for smart_scene in smart_scene_qs:
                 msg = eval(smart_scene['device_data'])
-                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                 try:
                     assert success
                 except AssertionError:
@@ -909,7 +909,7 @@ class SmartSceneView(View):
                         'sensor_src': int(smart_button['src_addr'], 16),
                         'sos_select': smart_button['is_tampered']
                     }
-                    success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                    success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                     try:
                         assert success
                     except AssertionError:

+ 2 - 2
Controller/SensorGateway/SubDeviceController.py

@@ -501,7 +501,7 @@ class GatewaySubDeviceView(View):
                     'sensor_src': int(sub_device_qs[0]['src_addr'], 16),
                     'sos_select': emergency_status
                 }
-                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                 try:
                     assert success
                 except AssertionError:
@@ -518,7 +518,7 @@ class GatewaySubDeviceView(View):
                             'scene_id': smart_scene.id,
                             'scene_status': 0
                         }
-                        success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg, 0)
+                        success = CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
                         try:
                             assert success
                         except AssertionError: