feat:规范传入租户id字段统一为tenantId+新增第二个取消会议的接口

yj_room_agent/LLM/ai_service.py

@@ -135,12 +135,6 @@ def book_room(data: dict, params: dict) -> str:
 '''
 查询租户下预定信息
 '''
-def query_booking_info(params: dict) ->str:
-    tenant_id = params.get('tenantId', None)
-    if not tenant_id:
-        raise Exception("tenantId 不能为空")
-
-
 def query_booking_info(params: dict) -> str:
     tenant_id = params.get('ytenantId', None)
     access_token = getinfo.get_access_token(tenant_id)

yj_room_agent/tools/getinfo.py

@@ -23,7 +23,7 @@ CANCEL_MEETING = config('CANCEL_MEETING', default="")
 CANCEL_MEETING2 = config('CANCEL_MEETING2', default="")
 EDIT_MEETING = config('EDIT_MEETING', default="")
 DEFAULT_HEADER = {'Content-Type': 'application/json'}
-
+page_size = config('DEFAULT_PAGESIZE', 800)
 def check_required_params(required_fields, params):
     """
     检查提供的数据字典是否包含所有必需的字段，并且这些字段的值非空。
@@ -130,7 +130,10 @@ def query_meetingroom(params:dict):
     gateway_url, token_url = get_domain({"tenantId": tenant_id})
     request_url = gateway_url + QUERY_MEETING_ROOM
     print("request url ", request_url)
+    # params['pageNum'] = page_num
+    params['pageSize'] = page_size
     print("paramas ", params)
+
     print("head is {0} type is {1}".format(DEFAULT_HEADER,type(DEFAULT_HEADER)))
     respones = requests.get(url=request_url, params=params,
                             headers=DEFAULT_HEADER)
@@ -143,6 +146,7 @@ def query_meetingroom(params:dict):
 '''
 def query_meetingbooking_info(params:dict):
     # ytenantId
+    params = params.copy()
     params['ytenantId'] = params.pop('tenantId')
     print("now params ", params)
     tenant_id = params.get("ytenantId", None)
@@ -162,7 +166,7 @@ def query_meetingbooking_info(params:dict):
 def book_meeting_room(params:dict, data:dict):
     # tenantId
     print("now params ", params)
-    tenant_id = params.get("ytenantId", None)
+    tenant_id = params.get("tenantId", None)
     print("tenant_id : ", tenant_id)
     gateway_url, token_url = get_domain({"tenantId": tenant_id})
     request_url = gateway_url + BOOK_MEETING_ROOM