From a4d4a7c8db6cbd2ca9e395fa2a194631db204a1a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 10 五月 2024 16:12:04 +0800
Subject: [PATCH] 代码初始化
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsController.java | 18 +++++++++---------
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java | 6 ++++++
2 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsController.java
index 68a756e..82ee367 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsController.java
@@ -56,8 +56,7 @@
@PostMapping("/create")
@RequiresPermissions("business:bookings:create")
public ApiResponse create(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- LoginUserInfo user = getLoginUser(token);
- bookings.setCreator(user.getId());
+ bookings.setUserInfo(getLoginUser(token));
return ApiResponse.success(bookingsService.create(bookings));
}
@@ -65,7 +64,7 @@
@GetMapping("/delete/{id}")
@RequiresPermissions("business:bookings:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- bookingsService.deleteById(id);
+ bookingsService.deleteById(id,getLoginUser(token));
return ApiResponse.success(null);
}
@@ -86,8 +85,7 @@
@PostMapping("/updateById")
@RequiresPermissions("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
- LoginUserInfo user = getLoginUser(token);
- bookings.setCreator(user.getId());
+ bookings.setUserInfo(getLoginUser(token));
bookingsService.updateById(bookings);
return ApiResponse.success(null);
}
@@ -117,7 +115,8 @@
@ApiOperation("鍙栨秷")
@PostMapping("/cancelById")
@RequiresPermissions("business:bookings:update")
- public ApiResponse cancelById(@RequestBody Bookings bookings) {
+ public ApiResponse cancelById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ bookings.setUserInfo(getLoginUser(token));
bookingsService.cancelById(bookings);
return ApiResponse.success(null);
}
@@ -140,7 +139,6 @@
@PostMapping("/exportUserStatistics")
@RequiresPermissions("business:bookings:exportExcel")
public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response) {
-
List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords();
if (!CollectionUtils.isEmpty(records)){
JSONArray o = (JSONArray) JSON.toJSON(records);
@@ -188,7 +186,8 @@
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "Integer", name = "type", value = "1 浠婂ぉ 2 鏈懆", required = true),
})
- public ApiResponse<List<Bookings>> getMyJoinBookingMeet(@RequestParam Integer type,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<List<Bookings>> getMyJoinBookingMeet(@RequestParam Integer type
+ ,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
LocalDateTime startTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(00,00,00));
LocalDateTime endTime = LocalDateTime.of(LocalDate.now(), LocalTime.of(23,59,59));
@@ -205,7 +204,8 @@
*/
@ApiOperation("鑾峰彇鐢ㄦ埛褰撳綋鏈堥绾︿細璁儏鍐�")
@PostMapping("/findMothBookingMeet")
- public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId,String dateMonth,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<List<DateTimeResourceDate>> findMothBookingMeet( @RequestParam(required = false) Integer roomId
+ ,String dateMonth,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(bookingsService.findMothBookingMeet(getLoginUser(token).getId(),roomId,dateMonth));
}
}
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
index 5f89c12..bdb8447 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Bookings.java
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.core.model.LoginUserInfo;
import com.doumee.dao.system.model.Multifile;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -161,4 +162,9 @@
@ApiModelProperty(value = "weekday")
@TableField(exist = false)
private String weekday;
+
+
+ @ApiModelProperty(value = "鐢ㄦ埛淇℃伅")
+ @TableField(exist = false)
+ private LoginUserInfo userInfo;
}
--
Gitblit v1.9.3