From 13b58d0fc355b6256d165cc2ae6a571ffa8e778d Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 15 五月 2024 17:35:29 +0800
Subject: [PATCH] 代码初始化

---
 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java |   73 ++++++++++++++++--------------------
 1 files changed, 33 insertions(+), 40 deletions(-)

diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
index 841e890..e98eae7 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/RoomsApi.java
@@ -1,10 +1,13 @@
 package com.doumee.cloud.web;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.doumee.api.BaseController;
 import com.doumee.config.Jwt.JwtTokenUtil;
 import com.doumee.core.annotation.trace.Trace;
 import com.doumee.core.model.ApiResponse;
+import com.doumee.core.model.LoginUserInfo;
 import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
 import com.doumee.core.utils.QrCodeUtils;
 import com.doumee.dao.business.model.RoomTime;
 import com.doumee.dao.web.request.RoomTimeRequest;
@@ -33,9 +36,9 @@
 @Api(tags = "3銆佷細璁涓氬姟")
 @Trace(exclude = true)
 @RestController
-@RequestMapping("/web/rooms")
+@RequestMapping(Constants.CLOUD_SERVICE_URL_INDEX+"/web/rooms")
 @Slf4j
-public class RoomsApi extends ApiController{
+public class RoomsApi extends BaseController {
 
     @Autowired
     private RoomsService roomsService;
@@ -43,57 +46,48 @@
     @Autowired
     private RoomTimeService roomTimeService;
 
-    @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜")
-    @GetMapping("/getQrCode")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
-    })
-    public ApiResponse<String> getQrCode(@RequestParam Integer id) {
-        return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,getMemberId()));
-    }
+//    @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜")
+//    @GetMapping("/getQrCode")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
+//    })
+//    public ApiResponse<String> getQrCode(@RequestParam Integer id) {
+//        return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,getMemberId()));
+//    }
 
-    @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜-鍥剧墖娴�")
-    @GetMapping("/getQrCodeImg")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
-            @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws  Exception {
-        Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
-        response.setHeader("Cache-Control", "no-store, no-cache");
-        response.setContentType("image/jpeg");
-        String content =roomsService.getQrCode(id,memberId);
-        QrCodeUtils.encode(content,null, response.getOutputStream(), true);
-    }
+//    @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜-鍥剧墖娴�")
+//    @GetMapping("/getQrCodeImg")
+//    @ApiImplicitParams({
+//            @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true),
+//            @ApiImplicitParam(paramType = "query", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
+//    })
+//    public void getQrCodeImg(@RequestParam Integer id,@RequestParam String token, HttpServletResponse response) throws  Exception {
+//        Integer memberId = JwtTokenUtil.getJwtPayLoad(token).getMemberId();
+//        response.setHeader("Cache-Control", "no-store, no-cache");
+//        response.setContentType("image/jpeg");
+//        String content =roomsService.getQrCode(id,memberId);
+//        QrCodeUtils.encode(content,null, response.getOutputStream(), true);
+//    }
 
 
     @ApiOperation("浼氳瀹ゅ垪琛�")
     @GetMapping("/roomsList")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse<List<RoomsResponse>> roomsList() {
+    public ApiResponse<List<RoomsResponse>> roomsList(@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success("鏌ヨ鎴愬姛",roomsService.getRoomsList());
     }
 
-
     @ApiOperation("浼氳瀹ゆ椂闂村紑鏀惧垪琛�")
     @PostMapping("/getRoomUseTime")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse<List<RoomTime>> getRoomUseTime(@RequestBody RoomTimeRequest roomTimeRequest) {
+    public ApiResponse<List<RoomTime>> getRoomUseTime(@RequestBody RoomTimeRequest roomTimeRequest,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success("鏌ヨ鎴愬姛",roomTimeService.getRoomUseTime(roomTimeRequest));
     }
 
     @ApiOperation("鎴戠殑浼氳瀹ゅ垪琛�")
     @PostMapping("/myRoomsPage")
-    @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
-    })
-    public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap) {
-        pageWrap.getModel().setUserId(getMemberId());
+    public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        LoginUserInfo user = getLoginUser(token);
+        pageWrap.getModel().setUserId(user.getId());
         IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap);
         return ApiResponse.success("鏌ヨ鎴愬姛",page);
     }
@@ -102,10 +96,9 @@
     @ApiOperation("浼氳瀹よ鎯�")
     @GetMapping("/getRoomDetail")
     @ApiImplicitParams({
-            @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
             @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "roomId", value = "浼氳瀹や富閿�", required = true),
     })
-    public ApiResponse<RoomsResponse> getRoomDetail(@RequestParam Integer roomId) {
+    public ApiResponse<RoomsResponse> getRoomDetail(@RequestParam Integer roomId,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
         return ApiResponse.success("鏌ヨ鎴愬姛",roomsService.getRoomDetail(roomId));
     }
 

--
Gitblit v1.9.3