Merge remote-tracking branch 'origin/master'

jiangping

2024-08-09 249a271a867df4802a8d59371e0ff10d3eb54298

 server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/BookingTimeCloudController.java

@@ -36,6 +36,7 @@
    @PostMapping("/create")
    @CloudRequiredPermission("business:bookingtime:create")
    public ApiResponse create(@RequestBody BookingTime bookingTime,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        bookingTime.setLoginUserInfo(this.getLoginUser(token));
        return ApiResponse.success(bookingTimeService.create(bookingTime));
    }

@@ -50,7 +51,7 @@
    @ApiOperation("批量删除")
    @GetMapping("/delete/batch")
    @CloudRequiredPermission("business:bookingtime:delete")
    public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
    public ApiResponse deleteByIdInBatch(@RequestParam String ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        String [] idArray = ids.split(",");
        List<Integer> idList = new ArrayList<>();
        for (String id : idArray) {
@@ -63,7 +64,8 @@
    @ApiOperation("根据ID修改")
    @PostMapping("/updateById")
    @CloudRequiredPermission("business:bookingtime:update")
    public ApiResponse updateById(@RequestBody BookingTime bookingTime) {
    public ApiResponse updateById(@RequestBody BookingTime bookingTime, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        bookingTime.setLoginUserInfo(this.getLoginUser(token));
        bookingTimeService.updateById(bookingTime);
        return ApiResponse.success(null);
    }
@@ -71,21 +73,21 @@
    @ApiOperation("分页查询")
    @PostMapping("/page")
    @CloudRequiredPermission("business:bookingtime:query")
    public ApiResponse<PageData<BookingTime>> findPage (@RequestBody PageWrap<BookingTime> pageWrap) {
    public ApiResponse<PageData<BookingTime>> findPage (@RequestBody PageWrap<BookingTime> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(bookingTimeService.findPage(pageWrap));
    }

    @ApiOperation("导出Excel")
    @PostMapping("/exportExcel")
    @CloudRequiredPermission("business:bookingtime:exportExcel")
    public void exportExcel (@RequestBody PageWrap<BookingTime> pageWrap, HttpServletResponse response) {
    public void exportExcel (@RequestBody PageWrap<BookingTime> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        ExcelExporter.build(BookingTime.class).export(bookingTimeService.findPage(pageWrap).getRecords(), "会议室预约时间段关联表", response);
    }

    @ApiOperation("根据ID查询")
    @GetMapping("/{id}")
    @CloudRequiredPermission("business:bookingtime:query")
    public ApiResponse findById(@PathVariable Integer id) {
    public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(bookingTimeService.findById(id));
    }

@@ -94,7 +96,7 @@
    @ApiOperation("根据科室日期查询有效的时间段")
    @PostMapping("/findList")
    @CloudRequiredPermission("business:roomtime:query")
    public ApiResponse<List<BookingTime>> findPage (@RequestBody BookingTime pageWrap) {
    public ApiResponse<List<BookingTime>> findPage (@RequestBody BookingTime pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
        return ApiResponse.success(bookingTimeService.findList(pageWrap));
    }
}