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/admin/MeetingCloudController.java | 50 ++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 40 insertions(+), 10 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
index 847ee4c..f4c09b9 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/MeetingCloudController.java
@@ -8,12 +8,14 @@
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.web.request.BookingsRequest;
import com.doumee.dao.web.request.MeetingPageRequest;
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 io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
@@ -87,7 +89,7 @@
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
})
public ApiResponse<MeetingDetailResponse> meetingDetail( @RequestHeader(Constants.HEADER_USER_TOKEN) String token,@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
+ return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id,getLoginUser(token).getId()));
}
@ApiOperation("鑾峰彇浼氳寮�闂ㄤ簩缁寸爜")
@@ -124,24 +126,52 @@
})
public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
LoginUserInfo user = getLoginUser(token);
-// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
bookingsRequest.setCreator(user.getId());
bookingsRequest.setEditor(user.getId());
+ bookingsRequest.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success("鎿嶄綔鎴愬姛",bookingsService.reservationMeeting(bookingsRequest));
}
+
@ApiOperation("鍙栨秷浼氳棰勭害")
- @GetMapping("/reservationCancel")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
- })
- public ApiResponse reservationCancel(@RequestParam Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-// LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ @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("/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("鎿嶄綔鎴愬姛");
+ }
+
+ @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("鎿嶄綔鎴愬姛");
+ }
+
+
+
}
--
Gitblit v1.9.3