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/business/RoomsController.java | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
index 0160517..f9f6949 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java
@@ -3,7 +3,6 @@
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
-import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -88,7 +87,7 @@
@PostMapping("/updateStatusById")
@RequiresPermissions("business:rooms:update")
public ApiResponse updateStatusById(@RequestBody Rooms rooms) {
- roomsService.updateStatusById(rooms);
+ roomsService.updateStatusById(rooms,this.getLoginUser(null));
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@@ -144,7 +143,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
})
public ApiResponse<String> getQrCode(@RequestParam Integer id) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,user.getId()));
}
@@ -155,7 +154,7 @@
@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();
+ LoginUserInfo user = getLoginUser(null);
response.setHeader("Cache-Control", "no-store, no-cache");
response.setContentType("image/jpeg");
String content =roomsService.getQrCode(id,user.getId());
@@ -177,7 +176,7 @@
@ApiOperation("鎴戠殑浼氳瀹ゅ垪琛�")
@PostMapping("/myRoomsPage")
public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap) {
- LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ LoginUserInfo user = getLoginUser(null);
pageWrap.getModel().setUserId(user.getId());
IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap);
return ApiResponse.success("鏌ヨ鎴愬姛",page);
--
Gitblit v1.9.3