From d8c6b9f7dac473ca1684eff210e29f2c83bff8e7 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期五, 19 九月 2025 09:19:54 +0800
Subject: [PATCH] 最新版本541200007

---
 server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java |   18 ++++++++----------
 1 files changed, 8 insertions(+), 10 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..e706aab 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,13 +3,12 @@
 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;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
-import com.doumee.core.model.PageData;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
 import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.QrCodeUtils;
 import com.doumee.dao.business.model.RoomTime;
@@ -23,7 +22,6 @@
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -88,7 +86,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 +142,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 +153,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 +175,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