From ca133ed72b297141f906810f81413e15d3d66333 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 03 七月 2024 18:24:37 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/web/MeetingApi.java | 33 ++++++++++++++++++++-------------
1 files changed, 20 insertions(+), 13 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..c72c15d 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,17 +2,18 @@
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.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;
@@ -26,7 +27,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 +50,7 @@
@Autowired
private SystemUserService systemUserService;
+
@ApiOperation(value = "褰撴湀浼氳琛�", notes = "褰撴湀浼氳琛�")
@@ -120,18 +121,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 +139,28 @@
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("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3