Quellcode durchsuchen

Merge remote-tracking branch 'remotes/origin/ming' into test

Ansjer vor 2 Jahren
Ursprung
Commit
b93e8cd04f
1 geänderte Dateien mit 22 neuen und 1 gelöschten Zeilen
  1. 22 1
      Controller/EquipmentManagerV3.py

+ 22 - 1
Controller/EquipmentManagerV3.py

@@ -74,9 +74,30 @@ class EquipmentManagerV3(View):
             return self.do_mainUserDevice(request_dict, response)
         elif operation == 'getDeviceFeatures':
             return self.do_get_device_features(request_dict, response)
+        elif operation == 'deviceRouse':
+            return self.device_rouse(request_dict, response)
         else:
             return response.json(414)
 
+    @classmethod
+    def device_rouse(cls, request_dict, response):
+        """
+        设备唤醒
+        """
+        serial_number = request_dict.get('serialNumber', None)
+        if not serial_number:
+            return response.json(444)
+        try:
+            # 主题名称
+            topic_name = f'/wakeup/{serial_number}_0'
+            # 发布消息内容
+            msg = {'payload': 'A'}
+            CommonService.req_publish_mqtt_msg(serial_number, topic_name, msg)
+            return response.json(0)
+        except Exception as e:
+            LOGGER.info('****设备唤醒发布消息异常:{},{}'.format(serial_number, repr(e)))
+            return response.json(500, repr(e))
+
     def do_add(self, userID, request_dict, response, request):
         UID = request_dict.get('UID', None)
         NickName = request_dict.get('NickName', None)
@@ -750,7 +771,7 @@ class EquipmentManagerV3(View):
             p['View_Password'] = self.encrypt_pwd(p['View_Password'])
 
             # 判断设备是否支持4G
-            uid_set_qs =UidSetModel.objects.filter(uid=p['UID']).values('mobile_4g')
+            uid_set_qs = UidSetModel.objects.filter(uid=p['UID']).values('mobile_4g')
             if uid_set_qs.exists():
                 uid_set_qs = uid_set_qs.first()
                 if uid_set_qs['mobile_4g'] == 1: