Merge remote-tracking branch 'origin/master'

jiangping

2024-05-20 dc22358d8624d3f5a2c27ee6c27e0bdbfe705fe9

 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));
    }