Merge branch 'dev' into lang

Controller/AiController.py

@@ -206,20 +206,20 @@ class AiView(View):
                 uid_set_qs = UidSetModel.objects.create(**qs_data)
                 uid_set_id = uid_set_qs.id
 
-            topic_name = 'AiServer/{}'.format(uid)
-            if status == 0:
+            topic_name = 'ansjer/generic/{}'.format(uid)
+            if status == 0:     # 关闭
                 hasAiService.update(**qs_data)
                 # UidPushModel.objects.filter(uid_set__uid=uid).delete()
                 # 状态为0的时候删除redis缓存数据
                 # self.do_delete_redis(uid)
 
                 # mqtt通知设备关闭AI识别功能
-                msg = {'AiStatus': 'inactive'},
+                msg = {'commandType': 'AIDisable'},
                 req_success = self.requestPublishMqtt(uid, topic_name, msg)
                 if not req_success:
                     return response.json(10044)
                 return response.json(0)
-            elif status == 1:
+            elif status == 1:       # 开启
                 hasAiService.update(**qs_data)
                 uid_push_qs = UidPushModel.objects.filter(userID_id=userID, m_code=m_code, uid_set__uid=uid)
 
@@ -269,10 +269,12 @@ class AiView(View):
 
                 # mqtt通知设备开启AI识别功能
                 msg = {
-                          'AiStatus': 'active',
-                          'etk': etk,
-                          'endTime': endTime,
-                          'aiIdentificationUrl': aiIdentificationUrl,
+                          'commandType': 'AIEnable',
+                          'payload': {
+                              'etk': etk,
+                              'endTime': endTime,
+                              'aiIdentificationUrl': aiIdentificationUrl,
+                          }
                       },
                 req_success = self.requestPublishMqtt(uid, topic_name, msg)
                 if not req_success: