From c5a0ff2661fe362dddbe88c6a28d19c48c24c39b Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 21 十月 2024 20:39:32 +0800 Subject: [PATCH] 最新版本541200007 --- server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 68 ++++++++++++++++++++++++++------- 1 files changed, 53 insertions(+), 15 deletions(-) diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java index 6fbef3f..3fd87ff 100644 --- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java +++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java @@ -2,20 +2,23 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import com.doumee.api.BaseController; -import com.doumee.config.Jwt.JwtTokenUtil; +import com.doumee.config.annotation.LoginNoRequired; 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.DateUtil; -import com.doumee.core.utils.QrCodeUtils; +import com.doumee.dao.admin.request.BusinessOverDTO; import com.doumee.dao.business.model.Bookings; +import com.doumee.dao.system.vo.UserResponse; 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.RoomDetailResponse; import com.doumee.service.business.BookingsService; import com.doumee.service.system.SystemUserService; import io.swagger.annotations.Api; @@ -26,7 +29,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -50,6 +52,7 @@ @Autowired private SystemUserService systemUserService; + @ApiOperation(value = "褰撴湀浼氳琛�", notes = "褰撴湀浼氳琛�") @@ -90,8 +93,8 @@ @ApiImplicitParams({ @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true), }) - public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) { - return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id)); + public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id,getLoginUser(token).getId())); } @@ -120,18 +123,16 @@ QrCodeUtils.encode(content,null, response.getOutputStream(), true); }*/ -/* - @LoginRequired + @ApiOperation("鍙備細浜哄憳鍒嗛〉") @PostMapping("/userPage") @ApiImplicitParams({ @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true), }) public ApiResponse<IPage<UserResponse>> userPage(@RequestBody PageWrap<UserPageRequest> pageWrap) { - IPage<UserResponse> page = systemUserService.getUserPage(pageWrap); + IPage<UserResponse> page = bookingsService.getUserPage(pageWrap); return ApiResponse.success("鏌ヨ鎴愬姛", page); } -*/ @ApiOperation("浼氳棰勭害") @@ -140,20 +141,57 @@ LoginUserInfo user = getLoginUser(token); bookingsRequest.setCreator(user.getId()); bookingsRequest.setEditor(user.getId()); + bookingsRequest.setLoginUserInfo(user); return ApiResponse.success("鎿嶄綔鎴愬姛",bookingsService.reservationMeeting(bookingsRequest)); } @ApiOperation("鍙栨秷浼氳棰勭害") - @GetMapping("/reservationCancel") - @ApiImplicitParams({ - @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true), - }) - public ApiResponse reservationCancel(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + @PostMapping("/reservationCancel") + public ApiResponse reservationCancel(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { LoginUserInfo user = getLoginUser(token); - bookingsService.reservationCancel(id,user.getId()); + businessOverDTO.setUserId(user.getId()); + bookingsService.reservationCancel(businessOverDTO); return ApiResponse.success("鎿嶄綔鎴愬姛"); } + @ApiOperation("鎻愬墠缁撴潫浼氳") + @PostMapping("/reservationOver") + public ApiResponse reservationOver(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo user = getLoginUser(token); + businessOverDTO.setUserId(user.getId()); + bookingsService.reservationOver(businessOverDTO); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + + @ApiOperation("鎻愬墠寮�濮嬩細璁�") + @PostMapping("/startEarly") + public ApiResponse startEarly(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo user = getLoginUser(token); + businessOverDTO.setUserId(user.getId()); + businessOverDTO.setStartType(Constants.ZERO); + bookingsService.startEarly(businessOverDTO); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + + @ApiOperation("寮�濮嬩細璁�") + @PostMapping("/start") + public ApiResponse start(@RequestBody BusinessOverDTO businessOverDTO,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) { + LoginUserInfo user = getLoginUser(token); + businessOverDTO.setUserId(user.getId()); + businessOverDTO.setStartType(Constants.ONE); + bookingsService.start(businessOverDTO); + return ApiResponse.success("鎿嶄綔鎴愬姛"); + } + + @LoginNoRequired + @ApiOperation("浼氳灞忎俊鎭�") + @GetMapping("/meetScreenData") + @ApiImplicitParams({ + @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "roomId", value = "浼氳瀹や富閿�", required = true), + }) + public ApiResponse<RoomDetailResponse> meetScreenData(@RequestParam Integer roomId) { + return ApiResponse.success("鏌ヨ鎴愬姛",bookingsService.getRoomDetail(roomId)); + } } -- Gitblit v1.9.3