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

This commit is contained in:
yujj128
2025-06-09 18:33:32 +08:00
parent e22c4c8546
commit 3a33cca3c8
5 changed files with 51 additions and 1 deletions

1
.env
View File

@@ -25,5 +25,6 @@ QUERY_MEETING_ROOM = '/yonbip/uspace/external/access/getMeetingRoom'
QUERY_MEETINGBOOKING_INFO = '/yonbip/uspace/external/access/getDestineInformation' QUERY_MEETINGBOOKING_INFO = '/yonbip/uspace/external/access/getDestineInformation'
BOOK_MEETING_ROOM = '/yonbip/uspace/destine/Meeting' BOOK_MEETING_ROOM = '/yonbip/uspace/destine/Meeting'
CANCEL_MEETING = '/yonbip/uspace/cancel/Meeting' CANCEL_MEETING = '/yonbip/uspace/cancel/Meeting'
CANCEL_MEETING2 = '/yonbip/uspace/external/access/cancel'
BOOKMEETING = '/yonbip/uspace/external/access/book' BOOKMEETING = '/yonbip/uspace/external/access/book'
EDIT_MEETING = '/yonbip/uspace/external/access/edit' EDIT_MEETING = '/yonbip/uspace/external/access/edit'

View File

@@ -216,6 +216,28 @@ def edit_meeting(params: dict, data: dict):
print("content is :", content) print("content is :", content)
return str(content) return str(content)
'''
第二个会议取消接口
'''
def cancel_meeting2(params: dict)->str:
"""
params{
ytenantId
meetingId
}
:return:
"""
print("当前params : {0}".format(params))
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
book_meeting = getinfo.cancel_meeting(params)
content = json.loads(json.dumps(book_meeting))
print("content is :", content)
return str(content)
def check_and_process_think(content: str) -> str: def check_and_process_think(content: str) -> str:
filtered_text = re.sub(r"<think\b[^>]*>.*?</think>", '', content, flags=re.DOTALL) filtered_text = re.sub(r"<think\b[^>]*>.*?</think>", '', content, flags=re.DOTALL)
return filtered_text return filtered_text

View File

@@ -20,6 +20,7 @@ QUERY_MEETINGBOOKING_INFO = config('QUERY_MEETINGBOOKING_INFO', default="")
BOOK_MEETING_ROOM = config('BOOK_MEETING_ROOM', default="") BOOK_MEETING_ROOM = config('BOOK_MEETING_ROOM', default="")
BOOKMEETING = config('BOOKMEETING', default="") BOOKMEETING = config('BOOKMEETING', default="")
CANCEL_MEETING = config('CANCEL_MEETING', default="") CANCEL_MEETING = config('CANCEL_MEETING', default="")
CANCEL_MEETING2 = config('CANCEL_MEETING2', default="")
EDIT_MEETING = config('EDIT_MEETING', default="") EDIT_MEETING = config('EDIT_MEETING', default="")
DEFAULT_HEADER = {'Content-Type': 'application/json'} DEFAULT_HEADER = {'Content-Type': 'application/json'}
@@ -236,7 +237,7 @@ def cancel_meeting(params:dict):
print("now params ", params) print("now params ", params)
print("tenant_id : ", tenant_id) print("tenant_id : ", tenant_id)
gateway_url, token_url = get_domain({"tenantId": tenant_id}) gateway_url, token_url = get_domain({"tenantId": tenant_id})
request_url = gateway_url + CANCEL_MEETING request_url = gateway_url + CANCEL_MEETING2
print("request url ", request_url) print("request url ", request_url)
print("paramas ", params) print("paramas ", params)
respones = requests.get(url=request_url, params=params, respones = requests.get(url=request_url, params=params,

View File

@@ -28,6 +28,7 @@ urlpatterns = [
path('bookMeetingRoom/', views.book_meeting_room), path('bookMeetingRoom/', views.book_meeting_room),
path('bookMeeting/', views.book_meeting), path('bookMeeting/', views.book_meeting),
path('cancelMeeting/', views.cancel_meeting), path('cancelMeeting/', views.cancel_meeting),
path('cancelMeeting2/', views.cancel_meeting),
path('editMeeting/',views.edit_meeting) path('editMeeting/',views.edit_meeting)
] ]

View File

@@ -218,6 +218,31 @@ def cancel_meeting(request):
except Exception as ex: except Exception as ex:
return JsonResponse(str(ex)) return JsonResponse(str(ex))
def cancel_meeting2(request):
"""
params{
tenantId
meetingId
}
:return:
"""
if request.method == 'GET':
params = request.GET.dict()
print("当前params : {0}".format(params))
tenant_id = params.get('tenantId', None)
if not tenant_id:
raise Exception("tenantId 不能为空")
try:
access_token = getinfo.get_access_token(tenant_id)
params['access_token'] = access_token
result = getinfo.cancel_meeting(params)
content = json.loads(json.dumps(result))
print("content :", content)
return JsonResponse(content)
except Exception as ex:
return JsonResponse(str(ex))
@require_POST @require_POST
def room_chat(request): def room_chat(request):