From ef377f10efbf876bd5e8e9ffa65a5818c4969409 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 12 六月 2024 11:07:30 +0800
Subject: [PATCH] 最新版本
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java | 32 +++++++++++++++++++-------------
1 files changed, 19 insertions(+), 13 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
index 5d03593..1c9b466 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingsCloudController.java
@@ -4,6 +4,7 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.doumee.api.BaseController;
+import com.doumee.config.annotation.CloudRequiredPermission;
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.model.ApiResponse;
@@ -23,7 +24,6 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
@@ -54,7 +54,7 @@
@PreventRepeat
@ApiOperation("鏂板缓")
@PostMapping("/create")
- @RequiresPermissions("business:bookings:create")
+ @CloudRequiredPermission("business:bookings:create")
public ApiResponse create(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
LoginUserInfo user = getLoginUser(token);
bookings.setLoginUserInfo(user);
@@ -64,7 +64,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:bookings:delete")
+ @CloudRequiredPermission("business:bookings:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
bookingsService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
@@ -72,7 +72,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:bookings:delete")
+ @CloudRequiredPermission("business:bookings:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -85,7 +85,7 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
- @RequiresPermissions("business:bookings:update")
+ @CloudRequiredPermission("business:bookings:update")
public ApiResponse updateById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
LoginUserInfo user = getLoginUser(token);
bookings.setLoginUserInfo(user);
@@ -96,29 +96,35 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
- @RequiresPermissions("business:bookings:query")
+ @CloudRequiredPermission("business:bookings:query")
public ApiResponse<PageData<Bookings>> findPage (@RequestBody PageWrap<Bookings> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(bookingsService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:bookings:exportExcel")
+ @CloudRequiredPermission("business:bookings:exportExcel")
public void exportExcel (@RequestBody PageWrap<Bookings> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
ExcelExporter.build(Bookings.class).export(bookingsService.findPage(pageWrap).getRecords(), "浼氳瀹ら瀹氫俊鎭〃", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
- @RequiresPermissions("business:bookings:query")
+ @CloudRequiredPermission("business:bookings:query")
public ApiResponse<MeetingDetailResponse> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(bookingsService.getMeetingDetail(id));
}
+ @ApiOperation("鏍规嵁鏃ユ湡鍜屼細璁涓婚敭鏌ヨ鍗犵敤淇℃伅")
+ @PostMapping("/getMeetingDetailByDate")
+ @CloudRequiredPermission("business:bookings:query")
+ public ApiResponse<MeetingDetailResponse> getMeetingDetailByDate(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(bookingsService.getMeetingDetailByDate(bookings));
+ }
@ApiOperation("鍙栨秷")
@PostMapping("/cancelById")
- @RequiresPermissions("business:bookings:update")
+ @CloudRequiredPermission("business:bookings:update")
public ApiResponse cancelById(@RequestBody Bookings bookings,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
bookings.setLoginUserInfo(this.getLoginUser(token));
bookingsService.cancelById(bookings);
@@ -127,21 +133,21 @@
@ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁�")
@GetMapping("/getRoomStatistics")
- @RequiresPermissions("business:bookings:update")
+ @CloudRequiredPermission("business:bookings:update")
public ApiResponse<List<RoomStatisticsVo>> getRoomStatistics(@RequestParam Integer yearNum, @RequestParam Integer roomId){
return ApiResponse.success(bookingsService.getRoomStatistics(yearNum));
}
@ApiOperation("浜哄憳鍙傚姞浼氳鏃跺父")
@PostMapping("/getUserStatistics")
- @RequiresPermissions("business:bookings:update")
+ @CloudRequiredPermission("business:bookings:update")
public ApiResponse<PageData<UserStatisticsVo>> getUserStatistics(@RequestBody PageWrap<UserStatisticsDTO> pageWrap ){
return ApiResponse.success(bookingsService.getUserStatistics(pageWrap));
}
@ApiOperation("浜哄憳鍙備細鏃堕暱缁熻瀵煎嚭Excel")
@PostMapping("/exportUserStatistics")
- @RequiresPermissions("business:bookings:exportExcel")
+ @CloudRequiredPermission("business:bookings:exportExcel")
public void exportUserStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
List<UserStatisticsVo> records = bookingsService.getUserStatistics(pageWrap).getRecords();
@@ -165,7 +171,7 @@
@ApiOperation("浼氳瀹や娇鐢ㄦ椂闀跨粺璁″鍑篍xcel")
@PostMapping("/exportRoomStatistics")
- @RequiresPermissions("business:bookings:exportExcel")
+ @CloudRequiredPermission("business:bookings:exportExcel")
public void exportRoomStatistics (@RequestBody PageWrap<UserStatisticsDTO> pageWrap,HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
List<RoomStatisticsVo> roomStatistics = bookingsService.getRoomStatistics(pageWrap.getModel().getYearNum());
if (!CollectionUtils.isEmpty(roomStatistics)){
--
Gitblit v1.9.3