From 400c712a036e97878fe63944ed2cfba303ab178c Mon Sep 17 00:00:00 2001 From: nidapeng <jp@doumee.com> Date: 星期一, 06 五月 2024 14:23:26 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- server/meeting/meeting_admin/src/main/java/com/doumee/api/business/RoomsController.java | 74 ++++++++++++++++++++++++++++++++++++ 1 files changed, 73 insertions(+), 1 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 af5b02e..0160517 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 @@ -1,18 +1,30 @@ package com.doumee.api.business; 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.core.utils.Constants; +import com.doumee.core.utils.QrCodeUtils; +import com.doumee.dao.business.model.RoomTime; import com.doumee.dao.business.model.Rooms; +import com.doumee.dao.web.request.RoomTimeRequest; +import com.doumee.dao.web.request.RoomsRequest; +import com.doumee.dao.web.response.RoomsResponse; +import com.doumee.service.business.RoomTimeService; import com.doumee.service.business.RoomsService; import io.swagger.annotations.Api; +import io.swagger.annotations.ApiImplicitParam; +import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; -import org.apache.shiro.authz.annotation.RequiresPermissions; +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.*; import javax.servlet.http.HttpServletResponse; @@ -32,6 +44,8 @@ @Autowired private RoomsService roomsService; + @Autowired + private RoomTimeService roomTimeService; @PreventRepeat @ApiOperation("鏂板缓") @PostMapping("/create") @@ -122,4 +136,62 @@ return ApiResponse.success(roomsService.findList(rooms)); } + + + @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜") + @GetMapping("/getQrCode") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳瀹や富閿�", required = true), + }) + public ApiResponse<String> getQrCode(@RequestParam Integer id) { + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + return ApiResponse.success("鏌ヨ鎴愬姛", roomsService.getQrCode(id,user.getId())); + } + + + @ApiOperation("鑾峰彇浼氳瀹ゅ紑闂ㄤ簩缁寸爜-鍥剧墖娴�") + @GetMapping("/getQrCodeImg") + @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(); + response.setHeader("Cache-Control", "no-store, no-cache"); + response.setContentType("image/jpeg"); + String content =roomsService.getQrCode(id,user.getId()); + QrCodeUtils.encode(content,null, response.getOutputStream(), true); + } + + @ApiOperation("浼氳瀹ゅ垪琛�") + @GetMapping("/roomsList") + public ApiResponse<List<RoomsResponse>> roomsList() { + return ApiResponse.success("鏌ヨ鎴愬姛",roomsService.getRoomsList()); + } + + @ApiOperation("浼氳瀹ゆ椂闂村紑鏀惧垪琛�") + @PostMapping("/getRoomUseTime") + public ApiResponse<List<RoomTime>> getRoomUseTime(@RequestBody RoomTimeRequest roomTimeRequest) { + return ApiResponse.success("鏌ヨ鎴愬姛",roomTimeService.getRoomUseTime(roomTimeRequest)); + } + + @ApiOperation("鎴戠殑浼氳瀹ゅ垪琛�") + @PostMapping("/myRoomsPage") + public ApiResponse<IPage<RoomsResponse>> myRoomsPage(@RequestBody PageWrap<RoomsRequest> pageWrap) { + LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + pageWrap.getModel().setUserId(user.getId()); + IPage<RoomsResponse> page = roomsService.getRoomsPage(pageWrap); + return ApiResponse.success("鏌ヨ鎴愬姛",page); + } + + + @ApiOperation("浼氳瀹よ鎯�") + @GetMapping("/getRoomDetail") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "roomId", value = "浼氳瀹や富閿�", required = true), + }) + public ApiResponse<RoomsResponse> getRoomDetail(@RequestParam Integer roomId) { + return ApiResponse.success("鏌ヨ鎴愬姛",roomsService.getRoomDetail(roomId)); + } + + } -- Gitblit v1.9.3