From cb1794d34ab60176dd6e62c451a47774c5d9552f Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 13 一月 2025 13:43:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java | 57 ++++++++++++++++++++++++++-------------------------------
1 files changed, 26 insertions(+), 31 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
index d7ce866..6ff48b5 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/api/business/MeetingController.java
@@ -2,15 +2,15 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.doumee.api.BaseController;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageWrap;
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.service.business.BookingsService;
@@ -18,7 +18,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.SecurityUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -45,7 +44,6 @@
@ApiOperation(value = "褰撴湀浼氳琛�", notes = "褰撴湀浼氳琛�")
@GetMapping("/monthMeeting")
@ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@ApiImplicitParam(paramType = "query", dataType = "String", name = "yearMonth", value = "骞存湀 yyyy-MM", required = true)
})
public ApiResponse<List<MonthDataResponse>> monthDay(@RequestParam String yearMonth) {
@@ -66,9 +64,6 @@
@ApiOperation("鎴戠殑浼氳鍒楄〃")
@PostMapping("/myMeetingPage")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
public ApiResponse<IPage<MeetingListResponse>> myMeetingPage(@RequestBody PageWrap<MeetingPageRequest> pageWrap) {
LoginUserInfo user = getLoginUser(null);
pageWrap.getModel().setUserId(user.getId());
@@ -78,20 +73,18 @@
- @ApiOperation("浼氳璇︽儏")
- @GetMapping("/meetingDetail")
- @ApiImplicitParams({
-// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
- })
- public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
- return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
- }
+// @ApiOperation("浼氳璇︽儏")
+// @GetMapping("/meetingDetail")
+// @ApiImplicitParams({
+// @ApiImplicitParam(paramType = "query", dataType = "Integer", name = "id", value = "浼氳涓婚敭", required = true),
+// })
+// public ApiResponse<MeetingDetailResponse> meetingDetail(@RequestParam Integer id) {
+// return ApiResponse.success("鏌ヨ鎴愬姛", bookingsService.getMeetingDetail(id));
+// }
@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) {
@@ -102,9 +95,7 @@
@ApiOperation("鑾峰彇浼氳寮�闂ㄤ簩缁寸爜-鍥剧墖娴�")
@GetMapping("/getQrCodeImg")
@ApiImplicitParams({
-// @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
@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 {
LoginUserInfo user = getLoginUser(null);
@@ -117,9 +108,6 @@
@ApiOperation("浼氳棰勭害")
@PostMapping("/reservationMeeting")
- @ApiImplicitParams({
- @ApiImplicitParam(paramType = "header", dataType = "String", name = "token", value = "鐢ㄦ埛token鍊�", required = true),
- })
public ApiResponse<Integer> reservationMeeting(@RequestBody BookingsRequest bookingsRequest) {
LoginUserInfo user = getLoginUser(null);
bookingsRequest.setCreator(user.getId());
@@ -128,14 +116,21 @@
}
@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) {
+ @PostMapping("/reservationCancel")
+ public ApiResponse reservationCancel(@RequestBody BusinessOverDTO businessOverDTO) {
LoginUserInfo user = getLoginUser(null);
- bookingsService.reservationCancel(id,user.getId());
+ businessOverDTO.setUserId(user.getId());
+ bookingsService.reservationCancel(businessOverDTO);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+
+ @ApiOperation("鎻愬墠缁撴潫浼氳")
+ @PostMapping("/reservationOver")
+ public ApiResponse reservationOver(@RequestBody BusinessOverDTO businessOverDTO) {
+ LoginUserInfo user = getLoginUser(null);
+ businessOverDTO.setUserId(user.getId());
+ bookingsService.reservationOver(businessOverDTO);
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
--
Gitblit v1.9.3