From 2a0e9e6f92c5f25a53aefa4edb708f42472e8a6e Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 06 五月 2024 16:32:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
index 99dc39d..1f24551 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/cloud/CloudRoomsController.java
@@ -86,8 +86,10 @@
@ApiOperation("淇敼鐘舵��")
@PostMapping("/updateStatusById")
@CloudRequiredPermission("business:rooms:update")
- public ApiResponse updateStatusById(@RequestBody Rooms rooms) {
- roomsService.updateStatusById(rooms);
+ public ApiResponse updateStatusById(@RequestBody Rooms rooms
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
+ roomsService.updateStatusById(rooms,user);
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -142,8 +144,9 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
})
- public ApiResponse<String> getQrCode(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse<String> getQrCode(@RequestParam Integer id
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,user.getId()));
}
@@ -153,8 +156,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true)
})
- public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws Exception {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public void getQrCodeImg(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token, HttpServletResponse response) throws Exception {
+ LoginUserInfo user = this.getLoginUser(token);
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
String content =roomsService.getQrCode(id,user.getId());
@@ -175,8 +178,8 @@
@ApiOperation("鎴戠殑浼氳瀹ゅ垪琛�")
@PostMapping("/myRoomsPage")
- public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ LoginUserInfo user = this.getLoginUser(token);
pageWrap.getModel().setUserId(user.getId());
IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
--
Gitblit v1.9.3