Merge remote-tracking branch 'origin/master'

nidapeng

2024-05-06 400c712a036e97878fe63944ed2cfba303ab178c

 server/meeting/meeting_web/src/main/java/com/doumee/api/web/MeetingApi.java

@@ -2,7 +2,6 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.config.Jwt.JwtTokenUtil;
import com.doumee.config.annotation.LoginRequired;
import com.doumee.core.annotation.trace.Trace;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.model.PageWrap;
@@ -11,11 +10,9 @@
import com.doumee.dao.business.model.Bookings;
import com.doumee.dao.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
import com.doumee.dao.web.request.UserPageRequest;
import com.doumee.dao.web.response.MeetingDetailResponse;
import com.doumee.dao.web.response.MeetingListResponse;
import com.doumee.dao.web.response.MonthDataResponse;
import com.doumee.dao.web.response.UserResponse;
import com.doumee.service.business.BookingsService;
import com.doumee.service.system.SystemUserService;
import io.swagger.annotations.Api;
@@ -52,7 +49,6 @@
    private SystemUserService systemUserService;


    @LoginRequired
    @ApiOperation(value = "当月会议表", notes = "当月会议表")
    @GetMapping("/monthMeeting")
    @ApiImplicitParams({
@@ -67,13 +63,13 @@
            MonthDataResponse  monthDataResponse = new MonthDataResponse();
            monthDataResponse.setWeekMsg(DateUtil.getWeek(DateUtil.StringToDate(str,"yyyy-MM-dd")).getChineseName());
            monthDataResponse.setMonthDate(str);
            monthDataResponse.setMeetingNum(bookings.stream().filter(b-> DateUtil.dateToString(b.getStartTime(),"yyyy-MM-dd").equals(str)).collect(Collectors.toList()).size());
            monthDataResponse.setMeetingNum(bookings.stream()
                    .filter(b-> DateUtil.dateToString(b.getStartTime(),"yyyy-MM-dd").equals(str)).collect(Collectors.toList()).size());
            monthDataResponseList.add(monthDataResponse);
        }
        return  ApiResponse.success("查询成功",monthDataResponseList);
    }

    @LoginRequired
    @ApiOperation("我的会议列表")
    @PostMapping("/myMeetingPage")
    @ApiImplicitParams({
@@ -97,7 +93,6 @@
    }


    @LoginRequired
    @ApiOperation("获取会议开门二维码")
    @GetMapping("/getQrCode")
    @ApiImplicitParams({
@@ -123,6 +118,7 @@
        QrCodeUtils.encode(content,null, response.getOutputStream(), true);
    }

/*
    @LoginRequired
    @ApiOperation("参会人员分页")
    @PostMapping("/userPage")
@@ -133,9 +129,9 @@
        IPage<UserResponse> page = systemUserService.getUserPage(pageWrap);
        return ApiResponse.success("查询成功", page);
    }
*/


    @LoginRequired
    @ApiOperation("会议预约")
    @PostMapping("/reservationMeeting")
    @ApiImplicitParams({
@@ -147,7 +143,6 @@
        return ApiResponse.success("操作成功",bookingsService.reservationMeeting(bookingsRequest));
    }

    @LoginRequired
    @ApiOperation("取消会议预约")
    @GetMapping("/reservationCancel")
    @ApiImplicitParams({