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

2025-06-09 17:45:07 +08:00
parent 4a49455af8
commit e22c4c8546
3 changed files with 111 additions and 34 deletions
--- a/yj_room_agent/LLM/ai_service.py
+++ b/yj_room_agent/LLM/ai_service.py
@@ -47,9 +47,9 @@ def query_room_type(params: dict) ->str:
        pageSize
    """
    print("当前params : {0}".format(params))
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")
    access_token = getinfo.get_access_token(tenant_id)
    params['access_token'] = access_token

@@ -70,9 +70,9 @@ def query_room_info(params: dict) -> str:
        pageSize
    """
    print("当前params : {0}".format(params))
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")

    access_token = getinfo.get_access_token(tenant_id)
    params['access_token'] = access_token
@@ -112,9 +112,9 @@ def book_room(data: dict, params: dict) -> str:
        "meetingroomId": data["room_id"],
        "personAmount": data["capacity"],
    }
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")
    access_token = getinfo.get_access_token(tenant_id)
    params['access_token'] = access_token
    booking_info = getinfo.book_meeting_room(params, new_data)
@@ -125,7 +125,9 @@ def book_room(data: dict, params: dict) -> str:
 查询租户下预定信息
 '''
 def query_booking_info(params: dict) ->str:
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
+    if not tenant_id:
+        raise Exception("tenantId 不能为空")
    access_token = getinfo.get_access_token(tenant_id)
    params['access_token'] = access_token
    meeting_room = getinfo.query_meetingbooking_info(params)
@@ -156,7 +158,7 @@ def book_meeting(params: dict, data: dict) ->str:
        """
    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")
    access_token = getinfo.get_access_token(tenant_id)
    params['access_token'] = access_token
    book_meeting = getinfo.book_meeting(params, data)
@@ -166,7 +168,7 @@ def book_meeting(params: dict, data: dict) ->str:
 '''
 取消会议
 '''
-def cancel_meeting(params: dict):
+def cancel_meeting(params: dict) ->str:
    """
        params{
        ytenantId
@@ -175,9 +177,9 @@ def cancel_meeting(params: dict):
        :return:
    """
    print("当前params : {0}".format(params))
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")
    access_token = getinfo.get_access_token(tenant_id)
    params['access_token'] = access_token

@@ -186,7 +188,33 @@ def cancel_meeting(params: dict):
    print("content is :", content)
    return str(content)

+'''
+会议编辑
+'''
+def edit_meeting(params: dict, data: dict):
+    """
+          :params: {tenant_id}
+          :data {
+          id              (nor null) string
+          subject         string
+          meetingRoomName string
+          meetingDateTimeStamp (==startDateTime )  number
+          startDateTimeStamp   number
+          endDateTimeStamp     number
+          meetingPersonYhtUserIds  strArray
+          meetingPersonAmount  number
+          remindArray      提醒时间（枚举值仅有：5，15，20，30，60，1440，4320）
+          content
+          }
+          """
+    tenant_id = params.get('tenantId', None)
+    access_token = getinfo.get_access_token(tenant_id)
+    params['access_token'] = access_token

+    result = getinfo.edit_meeting_info(params, data)
+    content = json.loads(json.dumps(result))
+    print("content is :", content)
+    return str(content)

 def check_and_process_think(content: str) -> str:
    filtered_text = re.sub(r"<think\b[^>]*>.*?</think>", '', content, flags=re.DOTALL)
--- a/yj_room_agent/tools/getinfo.py
+++ b/yj_room_agent/tools/getinfo.py
@@ -79,7 +79,9 @@ def get_access_token(tenant_id):
        raise Exception(f"请求失败 状态码: {respones.status_code}")


-# 获取租户所在中心域名
+'''
+获取租户所在中心域名
+'''
 def get_domain(params):
    request_url = DEFAULT_AUTH_URL + GATEWAY_INTF
    print("request_url is {0}".format(request_url))
@@ -99,8 +101,12 @@ def get_domain(params):
    else:
        raise Exception(f"请求失败 状态码: {respones.status_code}")

-#查询会议室类型
+'''
+查询会议室类型
+'''
 def query_meetingroom_type(params:dict):
+    # ytenantId
+    params['ytenantId'] = params.pop('tenantId')
    print("now params ", params)
    tenant_id = params.get("ytenantId", None)
    print("tenant_id : ", tenant_id)
@@ -111,8 +117,12 @@ def query_meetingroom_type(params:dict):
    return respones.json()


-# 查询会议室信息
+'''
+查询会议室信息
+'''
 def query_meetingroom(params:dict):
+    # ytenantId
+    params['ytenantId'] = params.pop('tenantId')
    print("now params ", params)
    tenant_id = params.get("ytenantId", None)
    print("tenant_id : ", tenant_id)
@@ -127,8 +137,12 @@ def query_meetingroom(params:dict):
    return respones.json()


-#查询会议预定信息
+'''
+查询会议预定信息
+'''
 def query_meetingbooking_info(params:dict):
+    # ytenantId
+    params['ytenantId'] = params.pop('tenantId')
    print("now params ", params)
    tenant_id = params.get("ytenantId", None)
    print("tenant_id : ", tenant_id)
@@ -141,7 +155,11 @@ def query_meetingbooking_info(params:dict):
                            headers=DEFAULT_HEADER)
    return respones.json()

+'''
+预定会议室
+'''
 def book_meeting_room(params:dict, data:dict):
+    # tenantId
    print("now params ", params)
    tenant_id = params.get("ytenantId", None)
    print("tenant_id : ", tenant_id)
@@ -155,7 +173,12 @@ def book_meeting_room(params:dict, data:dict):
    print("respone ", respones)
    return respones.json()

+
+'''
+预定会议
+'''
 def book_meeting(params:dict, data:dict):
+    # tenantId
    print("now params ", params)
    tenant_id = params.get("tenantId", None)
    print("tenant_id : ", tenant_id)
@@ -169,7 +192,11 @@ def book_meeting(params:dict, data:dict):
    print("respone ", respones)
    return respones.json()

+'''
+会议编辑
+'''
 def edit_meeting_info(params:dict, data:dict):
+    # tenantId
    print("now params ", params)
    tenant_id = params.get("tenantId", None)
    print("tenant_id : ", tenant_id)
@@ -182,8 +209,13 @@ def edit_meeting_info(params:dict, data:dict):
                             headers=DEFAULT_HEADER, data=json.dumps(data))
    print("respone ", respones)
    return respones.json()
+
+'''
+取消会议1  怀疑是假接口
+'''
 def cancel_meeting_booking(params:dict):
-    tenant_id = params.pop('ytenantId')
+    # tenantId
+    tenant_id = params.pop('tenantId')
    print("now params ", params)
    print("tenant_id : ", tenant_id)
    gateway_url, token_url = get_domain({"tenantId": tenant_id})
@@ -193,4 +225,21 @@ def cancel_meeting_booking(params:dict):
    respones = requests.post(url=request_url, params=params,
                            headers=DEFAULT_HEADER)
    print("respone ", respones)
+    return respones.json()
+
+'''
+取消会议2
+'''
+def cancel_meeting(params:dict):
+    # tenantId
+    tenant_id = params.get('tenantId')
+    print("now params ", params)
+    print("tenant_id : ", tenant_id)
+    gateway_url, token_url = get_domain({"tenantId": tenant_id})
+    request_url = gateway_url + CANCEL_MEETING
+    print("request url ", request_url)
+    print("paramas ", params)
+    respones = requests.get(url=request_url, params=params,
+                            headers=DEFAULT_HEADER)
+    print("respone ", respones)
    return respones.json()
--- a/yj_room_agent/views.py
+++ b/yj_room_agent/views.py
@@ -11,15 +11,15 @@ def hello(request):
 def query_meeting_type(request):
    """
    query_params:
-        ytenantId not null
+        tenantId not null
        pageNum
        pageSize
    """
    params = request.GET.dict()
    print("当前params : {0}".format(params))
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")
    try:
        access_token = getinfo.get_access_token(tenant_id)
        params['access_token'] = access_token
@@ -34,16 +34,16 @@ def query_meeting_type(request):
 def query_meeting(request):
    """
    query_params:
-        ytenantId   not null
+        tenantId   not null
        typeIds
        pageNum
        pageSize
    """
    params = request.GET.dict()
    print("当前params : {0}".format(params))
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")
    try:
        access_token = getinfo.get_access_token(tenant_id)
        params['access_token'] = access_token
@@ -59,7 +59,7 @@ def query_meeting(request):
 def query_meetingooking_info(request):
    """
    query_params:
-        ytenantId       (not null)
+        tenantId       (not null)
        startTimeStamp
        endTimeStamp
        meetingRoomIds
@@ -69,9 +69,9 @@ def query_meetingooking_info(request):
    """
    params = request.GET.dict()
    print("当前params : {0}".format(params))
-    tenant_id = params.get('ytenantId', None)
+    tenant_id = params.get('tenantId', None)
    if not tenant_id:
-        raise Exception("ytenantId 不能为空")
+        raise Exception("tenantId 不能为空")
    try:
        access_token = getinfo.get_access_token(tenant_id)
        params['access_token'] = access_token
@@ -95,7 +95,7 @@ def book_meeting_room(request):
    content         (not null)
    personAmount    (not null)
    }
-    :params: ytenantId       (not null)
+    :params: tenantId       (not null)
    :return:
    """
    if request.method == 'POST':
@@ -103,9 +103,9 @@ def book_meeting_room(request):
        data = request.POST.dict()
        print("data is {0}".format(data))
        print("当前params : {0}".format(params))
-        tenant_id = params.get('ytenantId', None)
+        tenant_id = params.get('tenantId', None)
        if not tenant_id:
-            raise Exception("ytenantId 不能为空")
+            raise Exception("tenantId 不能为空")
        try:
            access_token = getinfo.get_access_token(tenant_id)
            params['access_token'] = access_token
@@ -134,7 +134,7 @@ def book_meeting(request):
     isSendMail bool
     isSendMsg bool
     }
-     :params: ytenantId       (not null)
+     :params: tenantId       (not null)
     :return:
     """
    if request.method == 'POST':
@@ -144,7 +144,7 @@ def book_meeting(request):
        print("当前params : {0}".format(params))
        tenant_id = params.get('tenantId', None)
        if not tenant_id:
-            raise Exception("ytenantId 不能为空")
+            raise Exception("tenantId 不能为空")
        try:
            access_token = getinfo.get_access_token(tenant_id)
            params['access_token'] = access_token
@@ -172,7 +172,7 @@ def edit_meeting(request):
      remindArray      提醒时间（枚举值仅有：5，15，20，30，60，1440，4320）
      content
      }
-      :params: ytenantId       (not null)
+      :params: tenantId       (not null)
      :return:
      """
    if request.method == 'POST':
@@ -196,7 +196,7 @@ def edit_meeting(request):
 def cancel_meeting(request):
    """
    params{
-    ytenantId
+    tenantId
    meetingId
    }
    :return:
@@ -204,9 +204,9 @@ def cancel_meeting(request):
    if request.method == 'POST':
        params = request.GET.dict()
        print("当前params : {0}".format(params))
-        tenant_id = params.get('ytenantId', None)
+        tenant_id = params.get('tenantId', None)
        if not tenant_id:
-            raise Exception("ytenantId 不能为空")
+            raise Exception("tenantId 不能为空")
        try:
            access_token = getinfo.get_access_token(tenant_id)
            params['access_token'] = access_token